Accepting request 964036 from GNOME:Factory

OBS-URL: https://build.opensuse.org/request/show/964036
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnome-kiosk?expand=0&rev=3

gnome-kiosk-41.0.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:af126a201c4df6ab5c1263eefeb99d3c9fe9a78d38e98661e9087c6fa7bea0a1
-size 41024

gnome-kiosk-42.0.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2ae99484c71ebaa792d766d4d37981bfcade7c98fe0a480b85676609c6ad9cf8
+size 41060

gnome-kiosk-fix-meson-061.patch

@@ -1,6 +1,6 @@
-diff -Nur orig-gnome-kiosk-41.0/meson.build gnome-kiosk-41.0/meson.build
+diff -Nur orig-gnome-kiosk-42.alpha/meson.build gnome-kiosk-42.alpha/meson.build
---- orig-gnome-kiosk-41.0/meson.build	2022-02-10 19:30:05.416328516 +0100
+--- orig-gnome-kiosk-42.alpha/meson.build	2022-02-02 22:19:47.297891292 +0100
-+++ gnome-kiosk-41.0/meson.build	2022-02-10 19:34:13.867701231 +0100
++++ gnome-kiosk-42.alpha/meson.build	2022-02-02 22:20:52.338499586 +0100
 @@ -142,7 +142,7 @@
          configuration: desktop_config_data
  )
@@ -10,57 +10,4 @@ diff -Nur orig-gnome-kiosk-41.0/meson.build gnome-kiosk-41.0/meson.build
          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,

gnome-kiosk.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Mar 22 08:10:07 UTC 2022 - Bjørn Lie <bjorn.lie@gmail.com>
+
+- Update to version 42.0:
+  + No changes, stable bump only.
+
 -------------------------------------------------------------------
 Wed Feb  2 21:26:51 UTC 2022 - Bjørn Lie <bjorn.lie@gmail.com>
 
@@ -7,6 +13,25 @@ Wed Feb  2 21:26:51 UTC 2022 - Bjørn Lie <bjorn.lie@gmail.com>
 - 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 <bjorn.lie@gmail.com>
+
+- 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 <bjorn.lie@gmail.com>
+
+- Add gnome-kiosk-bump-mutter.patch: Bump version of libmutter
+  required.
+
 -------------------------------------------------------------------
 Thu Sep 23 16:03:25 UTC 2021 - Dominique Leuenberger <dimstar@opensuse.org>
 

gnome-kiosk.spec

@@ -16,25 +16,30 @@
 #
 
 
+%define mutter_api 10
+
 Name:           gnome-kiosk
-Version:        41.0
+Version:        42.0
 Release:        0
 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
+Source0:        https://download.gnome.org/sources/gnome-kiosk/42/%{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
+Patch0:         gnome-kiosk-fix-meson-061.patch
 
 BuildRequires:  fdupes
 BuildRequires:  meson
-BuildRequires:  mutter-devel
 BuildRequires:  pkgconfig
 BuildRequires:  pkgconfig(gio-2.0)
 BuildRequires:  pkgconfig(gnome-desktop-3.0)
 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
 
@@ -55,7 +60,8 @@ compositor is used.
 %autosetup -p1
 
 %build
-%meson
+%meson \
+	%{nil}
 %meson_build
 
 %install