rpms/gnome-kiosk
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Build against mutter 42 (#2040955)

Browse Source
This commit is contained in:
David King 2022-01-17 08:37:28 +00:00
parent c3ded89c88
commit 3e786cedc9
2 changed files with 48 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
gnome-kiosk-41.0-mutter-42.patch Normal file
View File

@ -0,0 +1,39 @@
From c4bb6ee0674e4fe3355945cfb0bc20765c592bd3 Mon Sep 17 00:00:00 2001
From: David King <amigadave@amigadave.com>
Date: Mon, 17 Jan 2022 08:05:18 +0000
Subject: [PATCH] meson: Build against mutter 42
Fixes: https://gitlab.gnome.org/GNOME/gnome-kiosk/-/issues/1
---
meson.build | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/meson.build b/meson.build
index c47215b..8fcca06 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-9')
+mutter_dependency = dependency('libmutter-10')
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-9')
-compositor_dependencies += dependency('mutter-cogl-pango-9')
-compositor_dependencies += dependency('mutter-clutter-9')
+compositor_dependencies += dependency('mutter-cogl-10')
+compositor_dependencies += dependency('mutter-cogl-pango-10')
+compositor_dependencies += dependency('mutter-clutter-10')
compositor_dependencies += mutter_dependency
compositor_dependencies += systemd_dependency
--
2.34.1

13
gnome-kiosk.spec
View File

@ -5,19 +5,21 @@
%global gnome_desktop_version 40~rc
%global glib2_version 2.68.0
%global gtk4_version 3.24.27
%global mutter_version 41~beta
%global mutter_version 42~alpha
%global gsettings_desktop_schemas_version 40~rc
%global ibus_version 1.5.24
%global gnome_settings_daemon_version 40~rc
Name: gnome-kiosk
Version: 41.0
Release: 1%{?dist}
Release: 2%{?dist}
Summary: Window management and application launching for GNOME
License: GPLv2+
URL: https://gitlab.gnome.org/halfline/gnome-kiosk
URL: https://gitlab.gnome.org/GNOME/gnome-kiosk
Source0: https://download.gnome.org/sources/%{name}/%{major_version}/%{name}-%{tarball_version}.tar.xz
# https://bugzilla.redhat.com/show_bug.cgi?id=2040955
Patch0: gnome-kiosk-41.0-mutter-42.patch
Provides: firstboot(windowmanager) = %{name}
@ -31,7 +33,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-9) >= %{mutter_version}
BuildRequires: pkgconfig(libmutter-10) >= %{mutter_version}
BuildRequires: mesa-libEGL-devel
BuildRequires: mesa-libGL-devel
BuildRequires: meson
@ -104,6 +106,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.gnome.Kiosk.Searc
%{_datadir}/xsessions/gnome-kiosk-script-xorg.desktop
%changelog
* Mon Jan 17 2022 David King <amigadave@amigadave.com> - 41.0-2
- Build against mutter 42 (#2040955)
* Thu Sep 23 2021 Kalev Lember <klember@redhat.com> - 41.0-1
- Update to 41.0