From c2ddfce92f1a42dbd4c8b307a535a48be4f4cdaaf4842af3d895158309a1a6f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Mon, 30 Sep 2024 07:56:30 +0000 Subject: [PATCH] Scripted push of GNOME 47 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-kiosk?expand=0&rev=18 --- .gitattributes | 23 +++++ .gitignore | 1 + _service | 17 ++++ gnome-kiosk-46.0.obscpio | 3 + gnome-kiosk-47.0.obscpio | 3 + gnome-kiosk-mutter-46.patch | 46 ++++++++++ gnome-kiosk.changes | 167 ++++++++++++++++++++++++++++++++++++ gnome-kiosk.obsinfo | 4 + gnome-kiosk.spec | 100 +++++++++++++++++++++ 9 files changed, 364 insertions(+) create mode 100644 .gitattributes create mode 100644 .gitignore create mode 100644 _service create mode 100644 gnome-kiosk-46.0.obscpio create mode 100644 gnome-kiosk-47.0.obscpio create mode 100644 gnome-kiosk-mutter-46.patch create mode 100644 gnome-kiosk.changes create mode 100644 gnome-kiosk.obsinfo create mode 100644 gnome-kiosk.spec diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9b03811 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..57affb6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.osc diff --git a/_service b/_service new file mode 100644 index 0000000..b0f7365 --- /dev/null +++ b/_service @@ -0,0 +1,17 @@ + + + + git + https://gitlab.gnome.org/GNOME/gnome-kiosk.git + 47.0 + @PARENT_TAG@+@TAG_OFFSET@ + (.*)\+0 + \1 + + + + *.tar + zst + + + 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-47.0.obscpio b/gnome-kiosk-47.0.obscpio new file mode 100644 index 0000000..86e33a3 --- /dev/null +++ b/gnome-kiosk-47.0.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:721b873fbf305d162150b8a7d06252d3f7bd058eb31c3d86af157a37d8f9e8ab +size 422923 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 new file mode 100644 index 0000000..2271c08 --- /dev/null +++ b/gnome-kiosk.changes @@ -0,0 +1,167 @@ +------------------------------------------------------------------- +Wed Sep 18 16:28:12 UTC 2024 - Bjørn Lie + +- Update to version 47.0: + + No changes. + +------------------------------------------------------------------- +Mon Sep 16 12:00:24 UTC 2024 - Dominique Leuenberger + +- Update to version 47.rc: + + Fix crash on VT change. + + Support gnome-shell introspection api when started with + --unsafe-mode. + + CI updates. + +------------------------------------------------------------------- +Wed Sep 11 17:41:03 UTC 2024 - Bjørn Lie + +- Update to version 47.alpha: + + Port to mutter 47 + + Build with mutter that lacks X11 support + + Typo fixes +- Drop gnome-kiosk-mutter-46.patch: No longer needed. +- Set mutter_api 15, following upstreams port to Mutter 47. + +------------------------------------------------------------------- +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 + +- Update to version 45.0: + + Complete port to mutter 45. +- Switch compression to zst in both service and tarball produced. + +------------------------------------------------------------------- +Sun Sep 10 19:42:16 UTC 2023 - Luciano Santos + +- Update to version 45.rc: + + Switch to gnome-desktop4. + + Port to mutter 45. + +------------------------------------------------------------------- +Wed Aug 9 15:25:06 UTC 2023 - Bjørn Lie + +- Update to version 44.0+4: + + build: Switch to gnome-desktop-4 + + Build against mutter API version 13 +- Replace pkgconfig(gnome-desktop-3.0) with + pkgconfig(gnome-desktop-4) BuildRequires following upstream + changes. +- Bump mutter_api define to 13 following upstream changes. + +------------------------------------------------------------------- +Mon Mar 20 16:09:31 UTC 2023 - Bjørn Lie + +- Update to version 44.0: + + No changes, stable bump only. + +------------------------------------------------------------------- +Mon Mar 6 16:02:51 UTC 2023 - Bjørn Lie + +- Update to version 44.rc: + + Rename dconf profile to not have hyphen + + Set dconf profile unconditionally + + Use https instead of http in search-app + +------------------------------------------------------------------- +Fri Feb 24 18:05:38 UTC 2023 - Bjørn Lie + +- Update to version 44.beta: + + Deprecation fixes + + Require mutter 44 + + Compat fix for Anaconda Installer project + + Script session double-starting fix + + Allow changing background in gsettings +- Bump mutter_api define to 12 following upstream changes. +- Build sample-app as noarch. + +------------------------------------------------------------------- +Tue Sep 20 17:52:44 UTC 2022 - Bjørn Lie + +- Update to version 43.0: + + Meson build fixes. + + Require mutter 43. + + Clean up code format. + +------------------------------------------------------------------- +Sat Sep 10 13:37:57 UTC 2022 - bjorn.lie@gmail.com + +- Update to version 42.0+12: + * compositor: + - Delete g_autoptr blank lines + - Run entire codebase through uncrustify + * scripts: + - Don't force newline after variable declarations + - Add uncrustify config + * ci: Enforce coding style in CI + * Bump mutter library requirements to 11 (mutter 43) + * Drop unused positional argument to i18n.merge_file +- Switch to git checkout via source service, following this, bump + mutter_api to 11 following upstream changes. +- Drop gnome-kiosk-fix-meson-061.patch: Fixed upstream. + +------------------------------------------------------------------- +Tue Mar 22 08:10:07 UTC 2022 - Bjørn Lie + +- Update to version 42.0: + + No changes, stable bump only. + +------------------------------------------------------------------- +Wed Feb 2 21:26:51 UTC 2022 - Bjørn Lie + +- Add gnome-kiosk-fix-meson-061.patch: Fix build with meson 0.61 + and newer. +- Add fdupes BuildRequires and macro, remove duplicates. +- Split out gnome-kiosk-sample-app and add a hard Requires on + MozillaFirefox, needed for the sample app. + +------------------------------------------------------------------- +Mon Jan 24 21:22:56 UTC 2022 - Bjørn Lie + +- Update to version 42.alpha: + + Port to mutter 42. + + Docs fixes. + + Build goo fixes. +- Drop gnome-kiosk-bump-mutter.patch: Fixed upstream. +- Drop mutter-devel, switch to proper pkgconfig() BuildRequires and + add a mutter_api define and set it to 10. Add the following + pkgconfig(libmutter-10), pkgconfig(mutter-clutter-10), + pkgconfig(mutter-cogl-10) and pkgconfig(mutter-cogl-pango-10). + +------------------------------------------------------------------- +Wed Jan 12 12:12:04 UTC 2022 - Bjørn Lie + +- Add gnome-kiosk-bump-mutter.patch: Bump version of libmutter + required. + +------------------------------------------------------------------- +Thu Sep 23 16:03:25 UTC 2021 - Dominique Leuenberger + +- Initial package, version 41.0. diff --git a/gnome-kiosk.obsinfo b/gnome-kiosk.obsinfo new file mode 100644 index 0000000..2e907f5 --- /dev/null +++ b/gnome-kiosk.obsinfo @@ -0,0 +1,4 @@ +name: gnome-kiosk +version: 47.0 +mtime: 1726670262 +commit: d3141895d746e39c4c42afe61883a32ba4f118be diff --git a/gnome-kiosk.spec b/gnome-kiosk.spec new file mode 100644 index 0000000..aa63449 --- /dev/null +++ b/gnome-kiosk.spec @@ -0,0 +1,100 @@ +# +# spec file for package gnome-kiosk +# +# 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 +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# + + +%define mutter_api 15 + +Name: gnome-kiosk +Version: 47.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 + +BuildRequires: fdupes +BuildRequires: meson +BuildRequires: pkgconfig +BuildRequires: pkgconfig(gio-2.0) +BuildRequires: pkgconfig(gnome-desktop-4) +BuildRequires: pkgconfig(gtk4) +BuildRequires: pkgconfig(ibus-1.0) +BuildRequires: pkgconfig(libmutter-%{mutter_api}) +BuildRequires: pkgconfig(libsystemd) +BuildRequires: pkgconfig(mutter-clutter-%{mutter_api}) +BuildRequires: pkgconfig(mutter-cogl-%{mutter_api}) +BuildRequires: pkgconfig(mutter-cogl-pango-%{mutter_api}) +BuildRequires: pkgconfig(systemd) +Requires: gnome-session + +%description +Kiosk provides a desktop enviroment suitable for fixed purpose, or single +application deployments like wall displays and point-of-sale systems. + +%package sample-app +Summary: Search appliance sample app +Requires: %{name} = %{version} +Requires: MozillaFirefox +BuildArch: noarch + +%description sample-app +Search appliance sample app that demonstate how the kiosk +compositor is used. + +%prep +%autosetup -p1 + +%build +%meson \ + %{nil} +%meson_build + +%install +%meson_install +%fdupes -s %{buildroot}%{_datadir} + +%files +%license COPYING +%{_bindir}/gnome-kiosk +%{_bindir}/gnome-kiosk-script +%dir %{_userunitdir}/gnome-session@gnome-kiosk-script.target.d +%{_userunitdir}/gnome-session@gnome-kiosk-script.target.d/session.conf +%{_userunitdir}/org.gnome.Kiosk.Script.service +%{_userunitdir}/org.gnome.Kiosk.target +%{_userunitdir}/org.gnome.Kiosk@wayland.service +%{_userunitdir}/org.gnome.Kiosk@x11.service +%{_datadir}/applications/org.gnome.Kiosk.Script.desktop +%{_datadir}/applications/org.gnome.Kiosk.desktop +%dir %{_datadir}/gnome-session +%dir %{_datadir}/gnome-session/sessions +%{_datadir}/gnome-session/sessions/gnome-kiosk-script.session +%dir %{_datadir}/wayland-sessions +%{_datadir}/wayland-sessions/gnome-kiosk-script-wayland.desktop +%{_datadir}/xsessions/gnome-kiosk-script-xorg.desktop +%dir %{_datadir}/dconf +%dir %{_datadir}/dconf/profile +%dir %{_datadir}/gnome-kiosk +%{_datadir}/dconf/profile/gnomekiosk +%{_datadir}/gnome-kiosk/gnomekiosk.dconf.compiled + +%files sample-app +%{_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 +%{_datadir}/xsessions/org.gnome.Kiosk.SearchApp.Session.desktop + +%changelog