From abac2a7917f1221b4b88532bc46e88537f7c0ae9 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Wed, 20 Jul 2022 08:58:50 -0700 Subject: [PATCH] Bump mutter requirements and rebuild against mutter 43 --- ...library-requirements-to-11-mutter-43.patch | 39 +++++++++++++++++++ ...tional-argument-to-i18n.merge_file-2.patch | 29 ++++++++++++++ gnome-kiosk.spec | 13 ++++++- 3 files changed, 79 insertions(+), 2 deletions(-) create mode 100644 0001-Bump-mutter-library-requirements-to-11-mutter-43.patch create mode 100644 0001-Drop-unused-positional-argument-to-i18n.merge_file-2.patch diff --git a/0001-Bump-mutter-library-requirements-to-11-mutter-43.patch b/0001-Bump-mutter-library-requirements-to-11-mutter-43.patch new file mode 100644 index 0000000..bc35105 --- /dev/null +++ b/0001-Bump-mutter-library-requirements-to-11-mutter-43.patch @@ -0,0 +1,39 @@ +From 46c39eed25956c2a900e559ebbde91e1ec79d65e Mon Sep 17 00:00:00 2001 +From: Adam Williamson +Date: Wed, 20 Jul 2022 08:50:47 -0700 +Subject: [PATCH] Bump mutter library requirements to 11 (mutter 43) + +Signed-off-by: Adam Williamson +--- + meson.build | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/meson.build b/meson.build +index 493616b..7716fc1 100644 +--- a/meson.build ++++ b/meson.build +@@ -34,7 +34,7 @@ config_h = configure_file( + + meson.add_install_script ('meson/postinstall.py') + +-mutter_dependency = dependency('libmutter-10') ++mutter_dependency = dependency('libmutter-11') + mutter_libdir = mutter_dependency.get_pkgconfig_variable('typelibdir') + + systemd_user_unit_dir = dependency('systemd').get_pkgconfig_variable('systemduserunitdir', +@@ -103,9 +103,9 @@ compositor_dependencies += dependency('glib-2.0') + compositor_dependencies += dependency('gnome-desktop-3.0') + compositor_dependencies += dependency('gobject-2.0') + compositor_dependencies += dependency('ibus-1.0') +-compositor_dependencies += dependency('mutter-cogl-10') +-compositor_dependencies += dependency('mutter-cogl-pango-10') +-compositor_dependencies += dependency('mutter-clutter-10') ++compositor_dependencies += dependency('mutter-cogl-11') ++compositor_dependencies += dependency('mutter-cogl-pango-11') ++compositor_dependencies += dependency('mutter-clutter-11') + compositor_dependencies += mutter_dependency + compositor_dependencies += systemd_dependency + +-- +2.37.1 + diff --git a/0001-Drop-unused-positional-argument-to-i18n.merge_file-2.patch b/0001-Drop-unused-positional-argument-to-i18n.merge_file-2.patch new file mode 100644 index 0000000..591fa0f --- /dev/null +++ b/0001-Drop-unused-positional-argument-to-i18n.merge_file-2.patch @@ -0,0 +1,29 @@ +From 4a05bcfc56f8c90bbd6b31cd63e95de02a758a05 Mon Sep 17 00:00:00 2001 +From: Adam Williamson +Date: Wed, 20 Jul 2022 08:48:03 -0700 +Subject: [PATCH] Drop unused positional argument to i18n.merge_file (#2) + +This doesn't do anything, and including it is a fatal error since +0.61.0. + +Signed-off-by: Adam Williamson +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 493616b..e8e9586 100644 +--- a/meson.build ++++ b/meson.build +@@ -142,7 +142,7 @@ desktop_file = configure_file( + configuration: desktop_config_data + ) + +-i18n.merge_file('desktop', ++i18n.merge_file( + input: desktop_file, + output: 'org.gnome.Kiosk.desktop', + po_dir: po_dir, +-- +2.37.1 + diff --git a/gnome-kiosk.spec b/gnome-kiosk.spec index 57c64bb..fa5a03a 100644 --- a/gnome-kiosk.spec +++ b/gnome-kiosk.spec @@ -12,12 +12,18 @@ Name: gnome-kiosk Version: 42.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Window management and application launching for GNOME License: GPLv2+ URL: https://gitlab.gnome.org/GNOME/gnome-kiosk Source0: https://download.gnome.org/sources/%{name}/%{major_version}/%{name}-%{tarball_version}.tar.xz +# Bump mutter requirements to build against mutter 43 +# https://gitlab.gnome.org/GNOME/gnome-kiosk/-/merge_requests/14 +Patch0: 0001-Bump-mutter-library-requirements-to-11-mutter-43.patch +# Fix build with meson >= 0.61.0 +# https://gitlab.gnome.org/GNOME/gnome-kiosk/-/merge_requests/13 +Patch1: 0001-Drop-unused-positional-argument-to-i18n.merge_file-2.patch Provides: firstboot(windowmanager) = %{name} @@ -31,7 +37,7 @@ BuildRequires: pkgconfig(gio-2.0) >= %{glib2_version} BuildRequires: pkgconfig(gnome-desktop-3.0) >= %{gnome_desktop_version} BuildRequires: pkgconfig(gtk4) >= %{gtk4_version} BuildRequires: pkgconfig(ibus-1.0) >= %{ibus_version} -BuildRequires: pkgconfig(libmutter-10) >= %{mutter_version} +BuildRequires: pkgconfig(libmutter-11) >= %{mutter_version} BuildRequires: mesa-libEGL-devel BuildRequires: mesa-libGL-devel BuildRequires: meson @@ -104,6 +110,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.gnome.Kiosk.Searc %{_datadir}/xsessions/gnome-kiosk-script-xorg.desktop %changelog +* Wed Jul 20 2022 Adam Williamson - 42.0-2 +- Bump mutter requirements and rebuild against mutter 43 + * Tue Mar 22 2022 David King - 42.0-1 - Update to 42.0