Update to 43.0
This commit is contained in:
parent
1e41289752
commit
0ff2eed91c
1
.gitignore
vendored
1
.gitignore
vendored
@ -4,3 +4,4 @@
|
||||
/gnome-kiosk-41.0.tar.xz
|
||||
/gnome-kiosk-42.alpha.tar.xz
|
||||
/gnome-kiosk-42.0.tar.xz
|
||||
/gnome-kiosk-43.0.tar.xz
|
||||
|
@ -1,39 +0,0 @@
|
||||
From 46c39eed25956c2a900e559ebbde91e1ec79d65e Mon Sep 17 00:00:00 2001
|
||||
From: Adam Williamson <awilliam@redhat.com>
|
||||
Date: Wed, 20 Jul 2022 08:50:47 -0700
|
||||
Subject: [PATCH] Bump mutter library requirements to 11 (mutter 43)
|
||||
|
||||
Signed-off-by: Adam Williamson <awilliam@redhat.com>
|
||||
---
|
||||
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
|
||||
|
@ -1,29 +0,0 @@
|
||||
From 4a05bcfc56f8c90bbd6b31cd63e95de02a758a05 Mon Sep 17 00:00:00 2001
|
||||
From: Adam Williamson <awilliam@redhat.com>
|
||||
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 <awilliam@redhat.com>
|
||||
---
|
||||
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
|
||||
|
@ -5,25 +5,19 @@
|
||||
%global gnome_desktop_version 40~rc
|
||||
%global glib2_version 2.68.0
|
||||
%global gtk4_version 3.24.27
|
||||
%global mutter_version 42~alpha
|
||||
%global mutter_version 43~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: 42.0
|
||||
Release: 3%{?dist}
|
||||
Version: 43.0
|
||||
Release: 1%{?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}
|
||||
|
||||
@ -110,6 +104,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.gnome.Kiosk.Searc
|
||||
%{_datadir}/xsessions/gnome-kiosk-script-xorg.desktop
|
||||
|
||||
%changelog
|
||||
* Tue Sep 20 2022 Kalev Lember <klember@redhat.com> - 43.0-1
|
||||
- Update to 43.0
|
||||
|
||||
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 42.0-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||
|
||||
|
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (gnome-kiosk-42.0.tar.xz) = 2d541c2a1a16a2285b52981c7cf896eb406dcd1f7491ec22dd1a6509fac2eb3c57d0c107d8d97472f4b2bb144d2f702c9357e91a73f069674949780a11160686
|
||||
SHA512 (gnome-kiosk-43.0.tar.xz) = 95a4bcf8ec1fb07b2a6f1c4a24bc73083d785edca58f99d14d4b92369228c3c91943df8fcaa411c9e7b3f757f9944ecfd781076e07c6f697d0b30895669993e3
|
||||
|
Loading…
Reference in New Issue
Block a user