Merged update from upstream sources
This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/gnome-settings-daemon.git#6da46a2cabb9204708e4ac76a299f6800397a52a
This commit is contained in:
DistroBaker
parent
bc17bb6fde
commit
bc0982c913
|
|
@ -1,57 +0,0 @@
|
|||
From 49ca22626e0553b3a521e1601bc84c5429a438cd Mon Sep 17 00:00:00 2001
|
||||
From: Kalev Lember <klember@redhat.com>
|
||||
Date: Mon, 15 Feb 2021 16:15:58 +0100
|
||||
Subject: [PATCH 1/2] xsettings: Go back to loading gtk modules from
|
||||
lib/gnome-settings-daemon-3.0
|
||||
|
||||
This is where other projects install the gtk modules desktop files.
|
||||
|
||||
There is little point in rebuilding all of the other projects every time
|
||||
gnome-settings-daemon version changes, so just leave the directory name
|
||||
hardcoded to what it was during GNOME 3.x.
|
||||
|
||||
Also, while at this, print out the configured gtk modules directory from
|
||||
meson to make it clear where it is.
|
||||
---
|
||||
meson.build | 4 ++++
|
||||
plugins/xsettings/meson.build | 2 +-
|
||||
2 files changed, 5 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/meson.build b/meson.build
|
||||
index 24bb9a95..c8ab875e 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -35,6 +35,9 @@ gsd_schemadir = join_paths(gsd_datadir, 'glib-2.0', 'schemas')
|
||||
|
||||
gsd_xdg_autostart = join_paths(gsd_sysconfdir, 'xdg', 'autostart')
|
||||
|
||||
+gsd_3_0_api_name = '@0@-@1@'.format(meson.project_name(), '3.0')
|
||||
+gsd_gtk_modules_directory = join_paths(gsd_libdir, gsd_3_0_api_name, 'gtk-modules')
|
||||
+
|
||||
gsd_buildtype = get_option('buildtype')
|
||||
|
||||
host_is_darwin = host_machine.system().contains('darwin')
|
||||
@@ -262,6 +265,7 @@ output += ' libexecdir: ' + gsd_libexecdir + '\n'
|
||||
output += ' bindir: ' + gsd_bindir + '\n'
|
||||
output += ' sysconfdir: ' + gsd_sysconfdir + '\n'
|
||||
output += ' datadir: ' + gsd_datadir + '\n\n'
|
||||
+output += ' gtk modules dir: ' + gsd_gtk_modules_directory + '\n\n'
|
||||
output += ' source code location: ' + meson.source_root() + '\n'
|
||||
output += ' compiler: ' + cc.get_id() + '\n'
|
||||
output += ' cflags: ' + ' '.join(compiler_flags) + '\n\n'
|
||||
diff --git a/plugins/xsettings/meson.build b/plugins/xsettings/meson.build
|
||||
index b4a2b39f..9adb102c 100644
|
||||
--- a/plugins/xsettings/meson.build
|
||||
+++ b/plugins/xsettings/meson.build
|
||||
@@ -19,7 +19,7 @@ deps = plugins_deps + [
|
||||
dependency('fontconfig')
|
||||
]
|
||||
|
||||
-cflags += ['-DGTK_MODULES_DIRECTORY="@0@"'.format(join_paths(gsd_pkglibdir, 'gtk-modules'))]
|
||||
+cflags += ['-DGTK_MODULES_DIRECTORY="@0@"'.format(gsd_gtk_modules_directory)]
|
||||
|
||||
executable(
|
||||
'gsd-' + plugin_name,
|
||||
--
|
||||
2.29.2
|
||||
|
||||
|
|
@ -1,29 +0,0 @@
|
|||
From 6a3335a16ef50fe132c46b3a1077fb8b4db62968 Mon Sep 17 00:00:00 2001
|
||||
From: Kalev Lember <klember@redhat.com>
|
||||
Date: Mon, 15 Feb 2021 16:22:10 +0100
|
||||
Subject: [PATCH 2/2] meson.build: Don't add '.0' to libgsd path
|
||||
|
||||
'.0' was a leftover from constructing gnome-settings-daemon-3.0
|
||||
directory and doesn't serve any purpose any more.
|
||||
---
|
||||
meson.build | 4 +---
|
||||
1 file changed, 1 insertion(+), 3 deletions(-)
|
||||
|
||||
diff --git a/meson.build b/meson.build
|
||||
index c8ab875e..8cab6f2a 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -9,9 +9,7 @@ gsd_version = meson.project_version()
|
||||
version_array = gsd_version.split('.')
|
||||
gsd_major_version = version_array[0].to_int()
|
||||
|
||||
-gsd_api_version_minor = 0
|
||||
-gsd_api_version = '@0@.@1@'.format(gsd_major_version, gsd_api_version_minor)
|
||||
-gsd_api_name = '@0@-@1@'.format(meson.project_name(), gsd_api_version)
|
||||
+gsd_api_name = '@0@-@1@'.format(meson.project_name(), gsd_major_version)
|
||||
|
||||
glib_min_version = '2.56'
|
||||
|
||||
--
|
||||
2.29.2
|
||||
|
||||
|
|
@ -10,8 +10,8 @@
|
|||
%global tarball_version %%(echo %{version} | tr '~' '.')
|
||||
|
||||
Name: gnome-settings-daemon
|
||||
Version: 40~beta
|
||||
Release: 2%{?dist}
|
||||
Version: 40~rc
|
||||
Release: 1%{?dist}
|
||||
Summary: The daemon sharing settings from GNOME to GTK+/KDE applications
|
||||
|
||||
License: GPLv2+
|
||||
|
|
@ -19,9 +19,6 @@ URL: https://download.gnome.org/sources/%{name}
|
|||
Source0: https://download.gnome.org/sources/%{name}/40/%{name}-%{tarball_version}.tar.xz
|
||||
Source1: org.gnome.settings-daemon.plugins.power.gschema.override
|
||||
|
||||
Patch0: 0001-xsettings-Go-back-to-loading-gtk-modules-from-lib-gn.patch
|
||||
Patch1: 0002-meson.build-Don-t-add-.0-to-libgsd-path.patch
|
||||
|
||||
BuildRequires: meson >= 0.44.0
|
||||
BuildRequires: gcc
|
||||
BuildRequires: cups-devel
|
||||
|
|
@ -195,6 +192,9 @@ cp %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/glib-2.0/schemas
|
|||
%{_libdir}/pkgconfig/gnome-settings-daemon.pc
|
||||
|
||||
%changelog
|
||||
* Mon Mar 15 2021 Kalev Lember <klember@redhat.com> - 40~rc-1
|
||||
- Update to 40.rc
|
||||
|
||||
* Mon Feb 15 2021 Kalev Lember <klember@redhat.com> - 40~beta-2
|
||||
- Fix loading gtk modules
|
||||
- Update versioned dependencies
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (gnome-settings-daemon-40.beta.tar.xz) = f3f88d65e1ec1b848c4691ec146b84c2e4d8c2b85e447b745694e48b5bc5e0ca57d1c22f114f51712a58d6d2aa35951f1f4a16d641eb992c1fce517e7df3972f
|
||||
SHA512 (gnome-settings-daemon-40.rc.tar.xz) = 0fa31fe1372a3e2c680ff7958351a9cd17e0172e812dccb3119e4a7cc8e58ff6ab9e808b64bc0fe7d1f41045bf765b3eb34a08c4f117424bf7631a03bcda6885
|
||||
|
|
|
|||
Loading…
Reference in New Issue