From 544cfd22389e025cdd82346ae6b67d963a346dece4b75fbb507fc701a858b772 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Thu, 10 Feb 2022 22:52:15 +0000 Subject: [PATCH] Accepting request 953282 from home:iznogood:branches:GNOME:Factory mesonfix++ OBS-URL: https://build.opensuse.org/request/show/953282 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-kiosk?expand=0&rev=3 --- gnome-kiosk-fix-meson-061.patch | 66 +++++++++++++++++++++++++++++++++ gnome-kiosk.changes | 9 +++++ gnome-kiosk.spec | 26 ++++++++++--- 3 files changed, 96 insertions(+), 5 deletions(-) create mode 100644 gnome-kiosk-fix-meson-061.patch diff --git a/gnome-kiosk-fix-meson-061.patch b/gnome-kiosk-fix-meson-061.patch new file mode 100644 index 0000000..4de8732 --- /dev/null +++ b/gnome-kiosk-fix-meson-061.patch @@ -0,0 +1,66 @@ +diff -Nur orig-gnome-kiosk-41.0/meson.build gnome-kiosk-41.0/meson.build +--- orig-gnome-kiosk-41.0/meson.build 2022-02-10 19:30:05.416328516 +0100 ++++ gnome-kiosk-41.0/meson.build 2022-02-10 19:34:13.867701231 +0100 +@@ -142,7 +142,7 @@ + configuration: desktop_config_data + ) + +-i18n.merge_file('desktop', ++i18n.merge_file( + input: desktop_file, + output: 'org.gnome.Kiosk.desktop', + po_dir: po_dir, +@@ -183,7 +183,7 @@ + configuration: desktop_config_data + ) + +-i18n.merge_file('desktop', ++i18n.merge_file( + input: desktop_file, + output: 'org.gnome.Kiosk.Script.desktop', + po_dir: po_dir, +@@ -208,7 +208,7 @@ + install_dir: session_dir, + ) + +-i18n.merge_file('desktop', ++i18n.merge_file( + input: 'kiosk-script/xsessions/gnome-kiosk-script-xorg.desktop.in', + output: '@BASENAME@', + po_dir: po_dir, +@@ -217,7 +217,7 @@ + type: 'desktop' + ) + +-i18n.merge_file('desktop', ++i18n.merge_file( + input: 'kiosk-script/wayland-sessions/gnome-kiosk-script-wayland.desktop.in', + output: '@BASENAME@', + po_dir: po_dir, +@@ -237,7 +237,7 @@ + + subdir('input-selector') + +-i18n.merge_file('desktop', ++i18n.merge_file( + input: session_file, + output: 'org.gnome.Kiosk.SearchApp.session', + po_dir: po_dir, +@@ -246,7 +246,7 @@ + type: 'desktop' + ) + +-i18n.merge_file('desktop', ++i18n.merge_file( + input: 'search-app/org.gnome.Kiosk.SearchApp.Session.desktop.in', + output: 'org.gnome.Kiosk.SearchApp.Session.desktop', + po_dir: po_dir, +@@ -261,7 +261,7 @@ + configuration: desktop_config_data + ) + +-i18n.merge_file('desktop', ++i18n.merge_file( + input: search_app_desktop_file, + output: 'org.gnome.Kiosk.SearchApp.desktop', + po_dir: po_dir, diff --git a/gnome-kiosk.changes b/gnome-kiosk.changes index bf087dc..6a5ec3b 100644 --- a/gnome-kiosk.changes +++ b/gnome-kiosk.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +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. + ------------------------------------------------------------------- Thu Sep 23 16:03:25 UTC 2021 - Dominique Leuenberger diff --git a/gnome-kiosk.spec b/gnome-kiosk.spec index 1f821a4..1a4b285 100644 --- a/gnome-kiosk.spec +++ b/gnome-kiosk.spec @@ -1,7 +1,7 @@ # # spec file for package gnome-kiosk # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -23,6 +23,10 @@ Summary: Mutter based compositor for kiosks License: GPL-2.0-or-later URL: https://gitlab.gnome.org/GNOME/gnome-kiosk Source: https://download.gnome.org/sources/gnome-kiosk/41/%{name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM gnome-kiosk-fix-meson-061.patch bjorn.lie@gmail.com -- Fix build with meson 0.61 and newer +Patch: gnome-kiosk-fix-meson-061.patch + +BuildRequires: fdupes BuildRequires: meson BuildRequires: mutter-devel BuildRequires: pkgconfig @@ -38,8 +42,17 @@ Requires: gnome-session 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 + +%description sample-app +Search appliance sample app that demonstate how the kiosk +compositor is used. + %prep -%autosetup +%autosetup -p1 %build %meson @@ -47,6 +60,7 @@ application deployments like wall displays and point-of-sale systems. %install %meson_install +%fdupes -s %{buildroot}%{_datadir} %files %license COPYING @@ -59,16 +73,18 @@ application deployments like wall displays and point-of-sale systems. %{_userunitdir}/org.gnome.Kiosk@wayland.service %{_userunitdir}/org.gnome.Kiosk@x11.service %{_datadir}/applications/org.gnome.Kiosk.Script.desktop -%{_datadir}/applications/org.gnome.Kiosk.SearchApp.desktop %{_datadir}/applications/org.gnome.Kiosk.desktop %dir %{_datadir}/gnome-session %dir %{_datadir}/gnome-session/sessions %{_datadir}/gnome-session/sessions/gnome-kiosk-script.session -%{_datadir}/gnome-session/sessions/org.gnome.Kiosk.SearchApp.session %dir %{_datadir}/wayland-sessions %{_datadir}/wayland-sessions/gnome-kiosk-script-wayland.desktop -%{_datadir}/wayland-sessions/org.gnome.Kiosk.SearchApp.Session.desktop %{_datadir}/xsessions/gnome-kiosk-script-xorg.desktop + +%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