public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Jan Grulich <jgrulich@redhat.com>
To: git-commits@fedoraproject.org
Subject: [rpms/gnome-kiosk] rawhide: Update to 51.beta
Date: Tue, 04 Aug 2026 15:23:07 GMT [thread overview]
Message-ID: <178585698707.1.5485895843401945291.rpms-gnome-kiosk-fb2c5dcd4f29@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/gnome-kiosk
Branch : rawhide
Commit : fb2c5dcd4f29850e0e4b63e31d4c7516eb9e2ffc
Author : Jan Grulich <jgrulich@redhat.com>
Date : 2026-08-04T17:22:16+02:00
Stats : +28/-177 in 3 file(s)
URL : https://src.fedoraproject.org/rpms/gnome-kiosk/c/fb2c5dcd4f29850e0e4b63e31d4c7516eb9e2ffc?branch=rawhide
Log:
Update to 51.beta
Add sample root menu application for gnome-kiosk
---
diff --git a/gnome-kiosk-screenshot-adapt-to-windowactor-get_image-api_change.patch b/gnome-kiosk-screenshot-adapt-to-windowactor-get_image-api_change.patch
deleted file mode 100644
index ffed606..0000000
--- a/gnome-kiosk-screenshot-adapt-to-windowactor-get_image-api_change.patch
+++ /dev/null
@@ -1,146 +0,0 @@
-From 3cd7127c02acd1423bc790b335b8f0ede526a8c4 Mon Sep 17 00:00:00 2001
-From: Bilal Elmoussaoui <belmouss@redhat.com>
-Date: Wed, 11 Mar 2026 15:41:04 +0100
-Subject: [PATCH 1/2] screenshot: Adapt to WindowActor.get_image API changes
-
-Part-of: <https://gitlab.gnome.org/GNOME/gnome-kiosk/-/merge_requests/136>
----
- compositor/kiosk-screenshot.c | 36 ++++++++++++++++++++++++++++++++---
- meson.build | 1 +
- 2 files changed, 34 insertions(+), 3 deletions(-)
-
-diff --git a/compositor/kiosk-screenshot.c b/compositor/kiosk-screenshot.c
-index 954cfee..00b8815 100644
---- a/compositor/kiosk-screenshot.c
-+++ b/compositor/kiosk-screenshot.c
-@@ -6,6 +6,7 @@
- #include <stdlib.h>
- #include <string.h>
-
-+#include <cairo.h>
- #include <cogl/cogl.h>
-
- #include <meta/display.h>
-@@ -24,6 +25,16 @@
-
- /* This code is a largely based on GNOME Shell implementation of ShellScreenshot */
-
-+static cairo_user_data_key_t data_key;
-+
-+static void
-+bitmap_unmap_and_unref (void *data)
-+{
-+ CoglBitmap *bitmap = data;
-+ cogl_bitmap_unmap (bitmap);
-+ g_object_unref (bitmap);
-+}
-+
- typedef enum _KioskScreenshotFlag
- {
- KIOSK_SCREENSHOT_FLAG_NONE,
-@@ -544,6 +555,9 @@ grab_window_screenshot (KioskScreenshot *screenshot,
- ClutterActor *window_actor;
- gfloat actor_x, actor_y;
- MtkRectangle rect;
-+ g_autoptr (CoglBitmap) bitmap = NULL;
-+ uint8_t *data;
-+ int width, height, stride;
-
- window_actor = CLUTTER_ACTOR (meta_window_get_compositor_private (window));
- clutter_actor_get_position (window_actor, &actor_x, &actor_y);
-@@ -555,16 +569,32 @@ grab_window_screenshot (KioskScreenshot *screenshot,
-
- screenshot->screenshot_area = rect;
-
-- screenshot->image = meta_window_actor_get_image (META_WINDOW_ACTOR (window_actor),
-- NULL);
-+ bitmap = meta_window_actor_paint_to_bitmap (META_WINDOW_ACTOR (window_actor), NULL,
-+ COGL_PIXEL_FORMAT_CAIRO_ARGB32_COMPAT);
-+ if (!bitmap) {
-+ g_task_report_new_error (screenshot, on_screenshot_written, result, NULL,
-+ G_IO_ERROR, G_IO_ERROR_FAILED,
-+ "Capturing window failed");
-+ return;
-+ }
-
-- if (!screenshot->image) {
-+ width = cogl_bitmap_get_width (bitmap);
-+ height = cogl_bitmap_get_height (bitmap);
-+ stride = cogl_bitmap_get_rowstride (bitmap);
-+ data = cogl_bitmap_map (bitmap, COGL_BUFFER_ACCESS_READ, 0, NULL);
-+ if (!data) {
- g_task_report_new_error (screenshot, on_screenshot_written, result, NULL,
- G_IO_ERROR, G_IO_ERROR_FAILED,
- "Capturing window failed");
- return;
- }
-
-+ screenshot->image = cairo_image_surface_create_for_data (data, CAIRO_FORMAT_ARGB32,
-+ width, height, stride);
-+ cairo_surface_set_user_data (screenshot->image, &data_key,
-+ g_steal_pointer (&bitmap),
-+ bitmap_unmap_and_unref);
-+
- screenshot->datetime = g_date_time_new_now_local ();
-
- if (flags & KIOSK_SCREENSHOT_FLAG_INCLUDE_CURSOR) {
-diff --git a/meson.build b/meson.build
-index d286b47..e9df6b7 100644
---- a/meson.build
-+++ b/meson.build
-@@ -193,6 +193,7 @@ compositor_dependencies += dependency('gnome-desktop-4')
- compositor_dependencies += dependency('gobject-2.0')
- compositor_dependencies += dependency('ibus-1.0')
- compositor_dependencies += dependency('gdk-pixbuf-2.0')
-+compositor_dependencies += dependency('cairo')
- compositor_dependencies += dependency(libmutter_cogl_name)
- compositor_dependencies += dependency(libmutter_clutter_name)
- compositor_dependencies += mutter_dependency
---
-GitLab
-
-
-From 3ae9e8331508a8a777d3a8d096ae92d6d76ea69d Mon Sep 17 00:00:00 2001
-From: Bilal Elmoussaoui <belmouss@redhat.com>
-Date: Mon, 16 Mar 2026 00:09:05 +0100
-Subject: [PATCH 2/2] Adapt to renamed pixel format
-
-Part-of: <https://gitlab.gnome.org/GNOME/gnome-kiosk/-/merge_requests/136>
----
- compositor/kiosk-screenshot.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/compositor/kiosk-screenshot.c b/compositor/kiosk-screenshot.c
-index 00b8815..142d6ed 100644
---- a/compositor/kiosk-screenshot.c
-+++ b/compositor/kiosk-screenshot.c
-@@ -436,7 +436,7 @@ do_grab_screenshot (KioskScreenshot *screenshot,
- &screenshot_rect, scale,
- cairo_image_surface_get_data (image),
- cairo_image_surface_get_stride (image),
-- COGL_PIXEL_FORMAT_CAIRO_ARGB32_COMPAT,
-+ COGL_PIXEL_FORMAT_ARGB32_NATIVE,
- NULL,
- paint_flags,
- &error)) {
-@@ -485,7 +485,7 @@ draw_cursor_image (KioskScreenshot *screenshot,
- height = cogl_texture_get_height (texture);
- stride = 4 * width;
- data = g_new (guint8, stride * height);
-- cogl_texture_get_data (texture, COGL_PIXEL_FORMAT_CAIRO_ARGB32_COMPAT, stride, data);
-+ cogl_texture_get_data (texture, COGL_PIXEL_FORMAT_ARGB32_NATIVE, stride, data);
-
- /* FIXME: cairo-gl? */
- cursor_surface = cairo_image_surface_create_for_data (data,
-@@ -570,7 +570,7 @@ grab_window_screenshot (KioskScreenshot *screenshot,
- screenshot->screenshot_area = rect;
-
- bitmap = meta_window_actor_paint_to_bitmap (META_WINDOW_ACTOR (window_actor), NULL,
-- COGL_PIXEL_FORMAT_CAIRO_ARGB32_COMPAT);
-+ COGL_PIXEL_FORMAT_ARGB32_NATIVE);
- if (!bitmap) {
- g_task_report_new_error (screenshot, on_screenshot_written, result, NULL,
- G_IO_ERROR, G_IO_ERROR_FAILED,
---
-GitLab
-
diff --git a/gnome-kiosk.spec b/gnome-kiosk.spec
index c50d0b4..df915d3 100644
--- a/gnome-kiosk.spec
+++ b/gnome-kiosk.spec
@@ -2,19 +2,13 @@
%global gnome_desktop_version 44.0
%global glib2_version 2.68.0
%global gtk4_version 4.0.0
-%global mutter_version 51~alpha
+%global mutter_version 51~beta
%global gsettings_desktop_schemas_version 40~rc
%global ibus_version 1.5.24
%global gnome_settings_daemon_version 40~rc
-%if 0%{?fedora} && 0%{?fedora} < 43
-%bcond x11 1
-%else
-%bcond x11 0
-%endif
-
Name: gnome-kiosk
-Version: 51~alpha
+Version: 51~beta
Release: %autorelease
Summary: Window management and application launching for GNOME
@@ -22,15 +16,8 @@ License: GPL-2.0-or-later
URL: https://gitlab.gnome.org/GNOME/gnome-kiosk
Source0: https://download.gnome.org/sources/%{name}/%{gnome_major_version}/%{name}-%{gnome_tarball_version}.tar.xz
-# https://gitlab.gnome.org/GNOME/gnome-kiosk/-/merge_requests/136
-Patch0: gnome-kiosk-screenshot-adapt-to-windowactor-get_image-api_change.patch
-
%gnome_check_version
-%if %{with x11}
-Provides: firstboot(windowmanager) = %{name}
-%endif
-
BuildRequires: dconf
BuildRequires: desktop-file-utils
BuildRequires: gcc
@@ -97,21 +84,29 @@ BuildArch: noarch
%description notification-daemon
A basic notification daemon for gnome-kiosk.
+%package root-menu
+Summary: A sample root menu application for gnome-kiosk
+Requires: %{name} = %{version}-%{release}
+Requires: python3-gobject
+Requires: gtk4
+BuildRequires: python3-devel
+BuildArch: noarch
+
+%description root-menu
+A basic application for gnome-kiosk demonstrating how to create a root
+menu to launch applications with GNOME Kiosk. The menu is configurable
+via its own configuration file.
+
%prep
%autosetup -S git -n %{name}-%{gnome_tarball_version}
%build
-%meson -Daccessibility-panel=true -Dnotification-daemon=true
+%meson -Daccessibility-panel=true -Dnotification-daemon=true -Dkiosk-menu=true
%meson_build
%install
%meson_install
-%if !%{with x11}
-rm -rf %{buildroot}%{_datadir}/xsessions
-rm -f %{buildroot}%{_userunitdir}/org.gnome.Kiosk@x11.service
-%endif
-
%check
desktop-file-validate %{buildroot}%{_datadir}/applications/org.gnome.Kiosk.desktop
desktop-file-validate %{buildroot}%{_datadir}/applications/org.gnome.Kiosk.SearchApp.desktop
@@ -126,9 +121,6 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.gnome.Kiosk.Searc
%{_datadir}/gnome-kiosk/window-config.ini
%{_userunitdir}/org.gnome.Kiosk.target
%{_userunitdir}/org.gnome.Kiosk@wayland.service
-%if %{with x11}
-%{_userunitdir}/org.gnome.Kiosk@x11.service
-%endif
%files -n gnome-kiosk-search-appliance
%{_userunitdir}/gnome-session@org.gnome.Kiosk.SearchApp.target.d/session.conf
@@ -136,9 +128,6 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.gnome.Kiosk.Searc
%{_datadir}/applications/org.gnome.Kiosk.SearchApp.desktop
%{_datadir}/gnome-session/sessions/org.gnome.Kiosk.SearchApp.session
%{_datadir}/wayland-sessions/org.gnome.Kiosk.SearchApp.Session.desktop
-%if %{with x11}
-%{_datadir}/xsessions/org.gnome.Kiosk.SearchApp.Session.desktop
-%endif
%files -n gnome-kiosk-script-session
%{_bindir}/gnome-kiosk-script
@@ -147,9 +136,6 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.gnome.Kiosk.Searc
%{_datadir}/applications/org.gnome.Kiosk.Script.desktop
%{_datadir}/gnome-session/sessions/gnome-kiosk-script.session
%{_datadir}/wayland-sessions/gnome-kiosk-script-wayland.desktop
-%if %{with x11}
-%{_datadir}/xsessions/gnome-kiosk-script-xorg.desktop
-%endif
%files -n gnome-kiosk-a11y
%{_bindir}/gnome-kiosk-accessibility-panel
@@ -163,5 +149,16 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.gnome.Kiosk.Searc
%{_datadir}/dbus-1/services/org.gtk.Notifications.service
%{_userunitdir}/gnome-kiosk-notification-daemon.service
+%files -n gnome-kiosk-root-menu
+%doc kiosk-menu/kiosk-menu.md
+%{_bindir}/gnome-kiosk-menu
+%{_datadir}/applications/org.gnome.Kiosk.Menu.desktop
+%{_datadir}/gnome-kiosk/kiosk-menu.css
+%{_datadir}/gnome-kiosk/kiosk-menu.conf
+%{_userunitdir}/gnome-session@gnome-kiosk-menu.target.d/session.conf
+%{_userunitdir}/org.gnome.Kiosk.Menu.service
+%{_datadir}/gnome-session/sessions/gnome-kiosk-menu.session
+%{_datadir}/wayland-sessions/gnome-kiosk-menu-wayland.desktop
+
%changelog
%autochangelog
diff --git a/sources b/sources
index d98dc7f..ae9b766 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (gnome-kiosk-51.alpha.tar.xz) = cf5be21bf4d4f527dbbff19f604d14a6c3b846ff8b6bc6a272544d1ca91f4d6bb8bed22e394a09f9216c255ad17e2bfdc17c7dbb28b5f22c85dbcd964a081ce9
+SHA512 (gnome-kiosk-51.beta.tar.xz) = eb29e9203819aebda1103bcfffb42f1f83638b8a7ebff2f88350934013f169015bd91616840629440829366b098ec269deaab3876389b27061f1be0a9df3f486
reply other threads:[~2026-08-04 15:23 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=178585698707.1.5485895843401945291.rpms-gnome-kiosk-fb2c5dcd4f29@fedoraproject.org \
--to=jgrulich@redhat.com \
--cc=git-commits@fedoraproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox