diff --git a/mate-settings-daemon.spec b/mate-settings-daemon.spec index 485893ec00232ca5316046914604bac90c31357f..b6769542a41b4069a92de9096ed8ed59199eccc4 100644 --- a/mate-settings-daemon.spec +++ b/mate-settings-daemon.spec @@ -1,14 +1,19 @@ Name: mate-settings-daemon Version: 1.28.0 -Release: 1 +Release: 2 Summary: MATE Desktop settings daemon -License: GPLv2+ +License: GPL-2.0-or-later URL: http://mate-desktop.org # for downloading the tarball use 'spectool -g -R mate-settings-daemon.spec' # Source for release-builds. Source0: http://pub.mate-desktop.org/releases/%{branch}/%{name}-%{version}.tar.xz - +# upstream commits +Patch1: mate-settings-daemon_0001-build-escape-newline.patch +Patch2: mate-settings-daemon_0002-plugins-add-missing-x11-linker-flags.patch +Patch3: mate-settings-daemon_0003-configure.ac-don-t-link-plugins-with-no-undefined.patch +Patch4: mate-settings-daemon_0004-Add-a-keyboard-shortcut-to-start-a-screen-reader-416.patch +Patch5: mate-settings-daemon_0005-Remove-remaining-unused-references-to-dbus-glib.patch BuildRequires: dbus-glib-devel BuildRequires: dconf-devel @@ -100,5 +105,8 @@ desktop-file-validate %{buildroot}%{_sysconfdir}/xdg/autostart/mate-settings-dae %changelog +* Tue Oct 14 2025 yueyaoqiang - 1.28.0-2 +- convert license to SPDX and add some upstream commits + * Wed Feb 19 2025 yuanxing - 1.28.0-1 - Initial build diff --git a/mate-settings-daemon_0001-build-escape-newline.patch b/mate-settings-daemon_0001-build-escape-newline.patch new file mode 100644 index 0000000000000000000000000000000000000000..04a45b8aa3d97906b5e3684ecb1e31d15953f30d --- /dev/null +++ b/mate-settings-daemon_0001-build-escape-newline.patch @@ -0,0 +1,25 @@ +From 2194cb268ddc7289ba7f7ec36544527c238fa797 Mon Sep 17 00:00:00 2001 +From: orbea +Date: Sun, 17 Mar 2024 10:35:26 -0700 +Subject: [PATCH 1/5] build: escape newline + +--- + mate-settings-daemon/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/mate-settings-daemon/Makefile.am b/mate-settings-daemon/Makefile.am +index 0dda4ac3..c99712d7 100644 +--- a/mate-settings-daemon/Makefile.am ++++ b/mate-settings-daemon/Makefile.am +@@ -21,7 +21,7 @@ libmsd_profile_la_SOURCES = \ + $(NULL) + + libmsd_profile_la_CPPFLAGS = \ +- $(AM_CPPFLAGS) ++ $(AM_CPPFLAGS) \ + $(DISABLE_DEPRECATED_CFLAGS) \ + $(NULL) + +-- +2.49.0 + diff --git a/mate-settings-daemon_0002-plugins-add-missing-x11-linker-flags.patch b/mate-settings-daemon_0002-plugins-add-missing-x11-linker-flags.patch new file mode 100644 index 0000000000000000000000000000000000000000..b17f3335e91f92a090e09a40f10032ab38c5c119 --- /dev/null +++ b/mate-settings-daemon_0002-plugins-add-missing-x11-linker-flags.patch @@ -0,0 +1,103 @@ +From 1462391e13a746157924ce80b14d7fd68cd48430 Mon Sep 17 00:00:00 2001 +From: orbea +Date: Sun, 17 Mar 2024 10:14:22 -0700 +Subject: [PATCH 2/5] plugins: add missing x11 linker flags + +Many of the plugins depend on the libX11 and libXi linker flags, but +they are missing. + +With GNU libtool the -no-undefined flag is silently ignored so the build +succeeds, but with slibtool is correctly sets -Wl,--no-undefined in the +linker flags. + +Gentoo issue: https://bugs.gentoo.org/922326 +--- + plugins/a11y-keyboard/Makefile.am | 2 ++ + plugins/background/Makefile.am | 1 + + plugins/clipboard/Makefile.am | 2 ++ + plugins/keyboard/Makefile.am | 2 ++ + plugins/xrandr/Makefile.am | 4 +++- + plugins/xsettings/Makefile.am | 1 + + 6 files changed, 11 insertions(+), 1 deletion(-) + +diff --git a/plugins/a11y-keyboard/Makefile.am b/plugins/a11y-keyboard/Makefile.am +index 0ea0e4a9..45078d7a 100644 +--- a/plugins/a11y-keyboard/Makefile.am ++++ b/plugins/a11y-keyboard/Makefile.am +@@ -66,6 +66,8 @@ liba11y_keyboard_la_LDFLAGS = \ + liba11y_keyboard_la_LIBADD = \ + $(SETTINGS_PLUGIN_LIBS) \ + $(LIBNOTIFY_LIBS) \ ++ $(X11_LIBS) \ ++ $(XINPUT_LIBS) \ + $(NULL) + + if HAVE_LIBATSPI +diff --git a/plugins/background/Makefile.am b/plugins/background/Makefile.am +index ac32cebb..b2ab685a 100644 +--- a/plugins/background/Makefile.am ++++ b/plugins/background/Makefile.am +@@ -58,6 +58,7 @@ libbackground_la_LDFLAGS = \ + libbackground_la_LIBADD = \ + $(SETTINGS_PLUGIN_LIBS) \ + $(MATE_DESKTOP_LIBS) \ ++ $(X11_LIBS) \ + $(NULL) + + plugin_in_files = \ +diff --git a/plugins/clipboard/Makefile.am b/plugins/clipboard/Makefile.am +index d8baed94..414fff10 100644 +--- a/plugins/clipboard/Makefile.am ++++ b/plugins/clipboard/Makefile.am +@@ -31,6 +31,8 @@ libclipboard_la_LDFLAGS = \ + + libclipboard_la_LIBADD = \ + $(SETTINGS_PLUGIN_LIBS) \ ++ $(X11_LIBS) \ ++ $(XINPUT_LIBS) \ + $(NULL) + + plugin_in_files = \ +diff --git a/plugins/keyboard/Makefile.am b/plugins/keyboard/Makefile.am +index 2e2b83ea..cc21f188 100644 +--- a/plugins/keyboard/Makefile.am ++++ b/plugins/keyboard/Makefile.am +@@ -46,6 +46,8 @@ libkeyboard_la_LIBADD = \ + $(SETTINGS_PLUGIN_LIBS) \ + $(LIBMATEKBDUI_LIBS) \ + $(MATE_DESKTOP_LIBS) \ ++ $(X11_LIBS) \ ++ $(XINPUT_LIBS) \ + $(NULL) + + plugin_in_files = \ +diff --git a/plugins/xrandr/Makefile.am b/plugins/xrandr/Makefile.am +index ccf6f694..7316599a 100644 +--- a/plugins/xrandr/Makefile.am ++++ b/plugins/xrandr/Makefile.am +@@ -70,7 +70,9 @@ libxrandr_la_LDFLAGS = \ + libxrandr_la_LIBADD = \ + $(SETTINGS_PLUGIN_LIBS) \ + $(LIBNOTIFY_LIBS) \ +- $(MATE_DESKTOP_LIBS) ++ $(MATE_DESKTOP_LIBS) \ ++ $(X11_LIBS) \ ++ $(NULL) + + plugin_in_files = \ + xrandr.mate-settings-plugin.desktop.in +diff --git a/plugins/xsettings/Makefile.am b/plugins/xsettings/Makefile.am +index 6e8e50f1..e81842f9 100644 +--- a/plugins/xsettings/Makefile.am ++++ b/plugins/xsettings/Makefile.am +@@ -38,6 +38,7 @@ libxsettings_la_LDFLAGS = \ + libxsettings_la_LIBADD = \ + $(SETTINGS_PLUGIN_LIBS) \ + $(FONTCONFIG_LIBS) \ ++ $(X11_LIBS) \ + $(NULL) + + plugin_in_files = \ +-- +2.49.0 + diff --git a/mate-settings-daemon_0003-configure.ac-don-t-link-plugins-with-no-undefined.patch b/mate-settings-daemon_0003-configure.ac-don-t-link-plugins-with-no-undefined.patch new file mode 100644 index 0000000000000000000000000000000000000000..41904f3e10dfb372246f2b8b558d763945c35d14 --- /dev/null +++ b/mate-settings-daemon_0003-configure.ac-don-t-link-plugins-with-no-undefined.patch @@ -0,0 +1,35 @@ +From dc9c2eb24269ea925d98e2bebda2d7fde61c086d Mon Sep 17 00:00:00 2001 +From: orbea +Date: Sun, 17 Mar 2024 11:52:48 -0700 +Subject: [PATCH 3/5] configure.ac: don't link plugins with -no-undefined + +Many of the plugins depend on mate_settings_plugin_get_type(), but this +symbol is only available at runtime in the mate-settings-daemon program. + +With GNU libtool the -no-undefined flag gets silently ignored and the +build succeeds, but with slibtool it correctly sets -Wl,--no-undefined +in the LDFLAGS causing the build to fail. + +To solve this simply removing -no-undefined is enough. + +Gentoo issue: https://bugs.gentoo.org/922326 +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 571817ad..a370771e 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -75,7 +75,7 @@ PKG_CHECK_MODULES(SETTINGS_PLUGIN, + gio-2.0 >= $GIO_REQUIRED_VERSION + ) + +-MSD_PLUGIN_LDFLAGS="-export_dynamic -module -avoid-version -no-undefined" ++MSD_PLUGIN_LDFLAGS="-export_dynamic -module -avoid-version" + case $host_os in + darwin*) + MSD_PLUGIN_LDFLAGS="${MSD_PLUGIN_LDFLAGS} -Wl,-bundle_loader,\$(top_builddir)/mate-settings-daemon/mate-settings-daemon" +-- +2.49.0 + diff --git a/mate-settings-daemon_0004-Add-a-keyboard-shortcut-to-start-a-screen-reader-416.patch b/mate-settings-daemon_0004-Add-a-keyboard-shortcut-to-start-a-screen-reader-416.patch new file mode 100644 index 0000000000000000000000000000000000000000..83cd9cc8a41b766956a58f7fd270d2c80f8de586 --- /dev/null +++ b/mate-settings-daemon_0004-Add-a-keyboard-shortcut-to-start-a-screen-reader-416.patch @@ -0,0 +1,26 @@ +From a007205797df6d1027f54d06cec3c16451c9ffd5 Mon Sep 17 00:00:00 2001 +From: vojtapolasek +Date: Tue, 10 Sep 2024 11:04:42 +0200 +Subject: [PATCH 4/5] Add a keyboard shortcut to start a screen reader (#416) + +alt+super+s +--- + data/org.mate.SettingsDaemon.plugins.media-keys.gschema.xml.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/data/org.mate.SettingsDaemon.plugins.media-keys.gschema.xml.in b/data/org.mate.SettingsDaemon.plugins.media-keys.gschema.xml.in +index 866fbf7a..2bb86120 100644 +--- a/data/org.mate.SettingsDaemon.plugins.media-keys.gschema.xml.in ++++ b/data/org.mate.SettingsDaemon.plugins.media-keys.gschema.xml.in +@@ -156,7 +156,7 @@ + Binding to show the screen magnifier + + +- '' ++ '<Alt><Mod4>s' + Toggle screen reader + Binding to start the screen reader + +-- +2.49.0 + diff --git a/mate-settings-daemon_0005-Remove-remaining-unused-references-to-dbus-glib.patch b/mate-settings-daemon_0005-Remove-remaining-unused-references-to-dbus-glib.patch new file mode 100644 index 0000000000000000000000000000000000000000..3eabc980c20332252085a8c5cce5f5c596cb3cd0 --- /dev/null +++ b/mate-settings-daemon_0005-Remove-remaining-unused-references-to-dbus-glib.patch @@ -0,0 +1,52 @@ +From e57d532ac69fc3f6f5a34d9ce648bbdfb6a81185 Mon Sep 17 00:00:00 2001 +From: lukefromdc +Date: Mon, 30 Sep 2024 03:50:18 -0400 +Subject: [PATCH 5/5] Remove remaining unused references to dbus-glib + +--- + configure.ac | 1 - + data/mate-settings-daemon-uninstalled.pc.in | 2 +- + data/mate-settings-daemon.pc.in | 2 +- + 3 files changed, 2 insertions(+), 3 deletions(-) + +diff --git a/configure.ac b/configure.ac +index a370771e..4ee59b23 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -52,7 +52,6 @@ dnl --------------------------------------------------------------------------- + dnl - Dependencies + dnl --------------------------------------------------------------------------- + +-DBUS_GLIB_REQUIRED_VERSION=0.74 + GLIB_REQUIRED_VERSION=2.58.0 + GIO_REQUIRED_VERSION=2.50.0 + GTK_REQUIRED_VERSION=3.22.0 +diff --git a/data/mate-settings-daemon-uninstalled.pc.in b/data/mate-settings-daemon-uninstalled.pc.in +index 89dadcde..0addf2f0 100644 +--- a/data/mate-settings-daemon-uninstalled.pc.in ++++ b/data/mate-settings-daemon-uninstalled.pc.in +@@ -6,7 +6,7 @@ binary=${pc_top_builddir}/mate-settings-daemon/mate-settings-daemon + + Name: mate-settings-daemon + Description: Utility library for accessing mate-settings-daemon over DBUS +-Requires: glib-2.0 dbus-1 dbus-glib-1 ++Requires: glib-2.0 dbus-1 + Version: @VERSION@ + Libs: ${pc_top_builddir}/${pcfiledir}/libmate-settings-daemon.la + Cflags: -I${pc_top_builddir}/${pcfiledir}/.. +diff --git a/data/mate-settings-daemon.pc.in b/data/mate-settings-daemon.pc.in +index e5317261..76345c38 100644 +--- a/data/mate-settings-daemon.pc.in ++++ b/data/mate-settings-daemon.pc.in +@@ -8,7 +8,7 @@ binary=${libexecdir}/mate-settings-daemon + + Name: mate-settings-daemon + Description: Utility library for accessing mate-settings-daemon over DBUS +-Requires: glib-2.0 dbus-1 dbus-glib-1 ++Requires: glib-2.0 dbus-1 + Version: @VERSION@ + Libs: -L${libdir} + Cflags: -I${includedir}/mate-settings-daemon +-- +2.49.0 +