58 lines
2.3 KiB
Diff
58 lines
2.3 KiB
Diff
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
|
|
|