From 748f125317bd986582771f95b6dab5060c4fe3a5a5c682a2fc42148fc882920d Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 19 Mar 2024 13:32:39 +0000 Subject: [PATCH] Accepting request 1159250 from GNOME:Next GNOME 46 OBS-URL: https://build.opensuse.org/request/show/1159250 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-kiosk?expand=0&rev=16 --- _service | 2 +- gnome-kiosk-45.0.obscpio | 3 --- gnome-kiosk-46.0.obscpio | 3 +++ gnome-kiosk-mutter-46.patch | 46 +++++++++++++++++++++++++++++++++++++ gnome-kiosk.changes | 28 ++++++++++++++++++++++ gnome-kiosk.obsinfo | 6 ++--- gnome-kiosk.spec | 8 ++++--- 7 files changed, 86 insertions(+), 10 deletions(-) delete mode 100644 gnome-kiosk-45.0.obscpio create mode 100644 gnome-kiosk-46.0.obscpio create mode 100644 gnome-kiosk-mutter-46.patch diff --git a/_service b/_service index 75fbdf4..76674bb 100644 --- a/_service +++ b/_service @@ -3,7 +3,7 @@ git https://gitlab.gnome.org/GNOME/gnome-kiosk.git - refs/tags/45.0 + 46.0 @PARENT_TAG@+@TAG_OFFSET@ (.*)\+0 \1 diff --git a/gnome-kiosk-45.0.obscpio b/gnome-kiosk-45.0.obscpio deleted file mode 100644 index 2e353bd..0000000 --- a/gnome-kiosk-45.0.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0b9b3917436a284b6c9521cce5fa774e4999c31be9312f92c22bc6929182c5d2 -size 313867 diff --git a/gnome-kiosk-46.0.obscpio b/gnome-kiosk-46.0.obscpio new file mode 100644 index 0000000..d46ca53 --- /dev/null +++ b/gnome-kiosk-46.0.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5a3d92024f7134bd2b090f3ca35a734ebb32e6519bc1222ba0d23de52e919691 +size 324107 diff --git a/gnome-kiosk-mutter-46.patch b/gnome-kiosk-mutter-46.patch new file mode 100644 index 0000000..b7db45b --- /dev/null +++ b/gnome-kiosk-mutter-46.patch @@ -0,0 +1,46 @@ +From f9c184bf52ce218c2121301a68480b105594a071 Mon Sep 17 00:00:00 2001 +From: Adam Williamson +Date: Mon, 4 Mar 2024 16:16:15 -0800 +Subject: [PATCH] kiosk-compositor.c: drop xevent_filter + +mutter dropped this upstream in +https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3599 + +Signed-off-by: Adam Williamson +--- + compositor/kiosk-compositor.c | 11 ----------- + 1 file changed, 11 deletions(-) + +diff --git a/compositor/kiosk-compositor.c b/compositor/kiosk-compositor.c +index 6c25c6c..9527408 100644 +--- a/compositor/kiosk-compositor.c ++++ b/compositor/kiosk-compositor.c +@@ -462,16 +462,6 @@ kiosk_compositor_show_window_menu_for_rect (MetaPlugin *plugin, + g_assert (META_PLUGIN_CLASS (kiosk_compositor_parent_class)->show_window_menu_for_rect == NULL); + } + +-static gboolean +-kiosk_compositor_xevent_filter (MetaPlugin *plugin, +- XEvent *x_server_event) +-{ +- KioskCompositor *self = KIOSK_COMPOSITOR (plugin); +- +- g_signal_emit (G_OBJECT (self), signals[X_SERVER_EVENT], 0, x_server_event); +- return FALSE; +-} +- + static gboolean + kiosk_compositor_keybinding_filter (MetaPlugin *plugin, + MetaKeyBinding *binding) +@@ -546,7 +536,6 @@ kiosk_compositor_class_init (KioskCompositorClass *compositor_class) + plugin_class->show_window_menu = kiosk_compositor_show_window_menu; + plugin_class->show_window_menu_for_rect = kiosk_compositor_show_window_menu_for_rect; + +- plugin_class->xevent_filter = kiosk_compositor_xevent_filter; + plugin_class->keybinding_filter = kiosk_compositor_keybinding_filter; + + plugin_class->confirm_display_change = kiosk_compositor_confirm_display_change; +-- +GitLab + + diff --git a/gnome-kiosk.changes b/gnome-kiosk.changes index 0b1be37..89c62eb 100644 --- a/gnome-kiosk.changes +++ b/gnome-kiosk.changes @@ -1,3 +1,31 @@ +------------------------------------------------------------------- +Tue Mar 19 07:48:31 UTC 2024 - Dominique Leuenberger + +- Update to version 46.0: + + Fixes with localed integration. + +------------------------------------------------------------------- +Thu Mar 7 15:34:09 UTC 2024 - Dominique Leuenberger + +- Add gnome-kiosk-mutter-46.patch: Fix build against mutter 46.rc. + +------------------------------------------------------------------- +Mon Mar 4 08:26:37 UTC 2024 - Dominique Leuenberger + +- Update to version 46.rc: + + Use gnome-text-editor instead of gedit for example script. + + Keymap fix. + +------------------------------------------------------------------- +Wed Jan 17 07:43:29 UTC 2024 - Dominique Leuenberger + +- Update to version 46.alpha: + + Add automount manager. + + Support headless sessions. + + Port to mutter 46. + + Docs update. +- Set mutter_api 14, following upstreams port to Mutter 46. + ------------------------------------------------------------------- Sun Sep 17 12:52:47 UTC 2023 - Bjørn Lie diff --git a/gnome-kiosk.obsinfo b/gnome-kiosk.obsinfo index 11a18bb..3055c37 100644 --- a/gnome-kiosk.obsinfo +++ b/gnome-kiosk.obsinfo @@ -1,4 +1,4 @@ name: gnome-kiosk -version: 45.0 -mtime: 1694954679 -commit: a235abce1828be82adcb004688a26aefebae843b +version: 46.0 +mtime: 1710790799 +commit: ece36cecbac4e5ca0cd7ed0e6a06b7d59c8b5bf4 diff --git a/gnome-kiosk.spec b/gnome-kiosk.spec index 1c720dc..35fb093 100644 --- a/gnome-kiosk.spec +++ b/gnome-kiosk.spec @@ -1,7 +1,7 @@ # # spec file for package gnome-kiosk # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,15 +16,17 @@ # -%define mutter_api 13 +%define mutter_api 14 Name: gnome-kiosk -Version: 45.0 +Version: 46.0 Release: 0 Summary: Mutter based compositor for kiosks License: GPL-2.0-or-later URL: https://gitlab.gnome.org/GNOME/gnome-kiosk Source0: %{name}-%{version}.tar.zst +# PATCH-FIX-UPSTREAM +Patch0: gnome-kiosk-mutter-46.patch BuildRequires: fdupes BuildRequires: meson