diff --git a/0001-feature-backends-Compatible-wayland-framework-which-.patch b/0001-feature-backends-Compatible-wayland-framework-which-.patch deleted file mode 100644 index 205df27d60f8781bf1f606c66440da1e824cc7a9..0000000000000000000000000000000000000000 --- a/0001-feature-backends-Compatible-wayland-framework-which-.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 74f5adf42fe766790f38791c939624fcc3c0b6b3 Mon Sep 17 00:00:00 2001 -From: kylinsecos_admin -Date: Tue, 7 Feb 2023 15:40:27 +0800 -Subject: [PATCH] feature(backends): Compatible wayland framework which exists - xwayland. - -Signed-off-by: kylinsecos_admin ---- - mate-settings-daemon/main.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/mate-settings-daemon/main.c b/mate-settings-daemon/main.c -index b070361..05b80e1 100644 ---- a/mate-settings-daemon/main.c -+++ b/mate-settings-daemon/main.c -@@ -489,6 +489,7 @@ main (int argc, char *argv[]) - } - - mate_settings_profile_start ("opening gtk display"); -+ gdk_set_allowed_backends("x11"); - if (! gtk_init_check (NULL, NULL)) { - g_warning ("Unable to initialize GTK+"); - exit (EXIT_FAILURE); --- -2.36.1 - diff --git a/0001-feature-touchpad-set-the-default-values-of-disable-w.patch b/0001-feature-touchpad-set-the-default-values-of-disable-w.patch deleted file mode 100644 index 066b47787b60ddd167bf4a7c7ce6093f7e75c117..0000000000000000000000000000000000000000 --- a/0001-feature-touchpad-set-the-default-values-of-disable-w.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 4b946f8e463d62fe77b1d76838b528117b036d60 Mon Sep 17 00:00:00 2001 -From: tangjie02 -Date: Mon, 24 Aug 2020 11:06:21 +0800 -Subject: [PATCH] feature(touchpad): set the default values of - disable-while-typing and tap-to-click to true. -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -- 设置disable-while-typing和tap-to-click的默认值为true - -Signed-off-by: tangjie02 ---- - data/org.mate.peripherals-touchpad.gschema.xml.in | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/data/org.mate.peripherals-touchpad.gschema.xml.in b/data/org.mate.peripherals-touchpad.gschema.xml.in -index 90b83c8..a67b6c9 100644 ---- a/data/org.mate.peripherals-touchpad.gschema.xml.in -+++ b/data/org.mate.peripherals-touchpad.gschema.xml.in -@@ -6,12 +6,12 @@ - - - -- false -+ true - Disable touchpad while typing - Set this to TRUE if you have problems with accidentally hitting the touchpad while typing. - - -- false -+ true - Enable mouse clicks with touchpad - Set this to TRUE to be able to send mouse clicks by tapping on the touchpad. - --- -2.18.1 - diff --git a/0001-fix-mate-display-add-the-window-scale-changed-tip-wi.patch b/0001-fix-mate-display-add-the-window-scale-changed-tip-wi.patch deleted file mode 100644 index 54c80e447640e3ffe5ad3bab2f19d85c9ec7da72..0000000000000000000000000000000000000000 --- a/0001-fix-mate-display-add-the-window-scale-changed-tip-wi.patch +++ /dev/null @@ -1,97 +0,0 @@ -From 61c2ae5e954b82dac23b16ec6770e009d8e6f237 Mon Sep 17 00:00:00 2001 -From: wangxiaoqing -Date: Tue, 16 Jun 2020 17:27:55 +0800 -Subject: [PATCH] fix(mate-display): add the window scale changed tip with - notify -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -- 当窗口缩放发生改变时， 通过notify显示有些应用需要注销再登录才能起作用的提示。 - - Fixes #25310 ---- - plugins/xsettings/msd-xsettings-manager.c | 38 +++++++++++++++++++++++++++++++ - po/zh_CN.po | 6 +++++ - 2 files changed, 44 insertions(+) - -diff --git a/plugins/xsettings/msd-xsettings-manager.c b/plugins/xsettings/msd-xsettings-manager.c -index b31288d..17d5b88 100644 ---- a/plugins/xsettings/msd-xsettings-manager.c -+++ b/plugins/xsettings/msd-xsettings-manager.c -@@ -39,6 +39,10 @@ - #include - #include - -+#ifdef HAVE_LIBNOTIFY -+#include -+#endif -+ - #include "mate-settings-profile.h" - #include "msd-xsettings-manager.h" - #include "xsettings-manager.h" -@@ -518,6 +522,38 @@ delayed_toggle_bg_draw (gboolean value) - } - - static void -+info_message (const char *primary_text, const char *secondary_text) -+{ -+#ifdef HAVE_LIBNOTIFY -+ NotifyNotification *notification; -+ -+ notification = notify_notification_new (primary_text, -+ secondary_text, -+ "msd-xrandr"); -+ -+ notify_notification_show (notification, NULL); /* NULL-GError */ -+#else -+ GtkWidget *dialog; -+ -+ dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL, GTK_MESSAGE_INFO, GTK_BUTTONS_CLOSE, -+ "%s", primary_text); -+ gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), "%s", -+ secondary_text); -+ -+ gtk_dialog_run (GTK_DIALOG (dialog)); -+ gtk_widget_destroy (dialog); -+#endif /* HAVE_LIBNOTIFY */ -+} -+ -+static gboolean -+delayed_show_info_msg (gboolean value) -+{ -+ info_message (_("Window zooming"), _("Window zooming has changed,\nsome applications need to logout and login again to work!")); -+ -+ return FALSE; -+} -+ -+static void - scale_change_workarounds (MateXSettingsManager *manager, int new_scale) - { - if (manager->priv->window_scale == new_scale) -@@ -578,6 +614,8 @@ scale_change_workarounds (MateXSettingsManager *manager, int new_scale) - g_timeout_add_seconds (1, (GSourceFunc) delayed_toggle_bg_draw, (gpointer) FALSE); - g_timeout_add_seconds (2, (GSourceFunc) delayed_toggle_bg_draw, (gpointer) TRUE); - } -+ -+ g_timeout_add_seconds (2, (GSourceFunc) delayed_show_info_msg, (gpointer) TRUE); - } - - /* Store new scale value */ -diff --git a/po/zh_CN.po b/po/zh_CN.po -index 88573d4..e581552 100644 ---- a/po/zh_CN.po -+++ b/po/zh_CN.po -@@ -1358,3 +1358,9 @@ msgstr "配置硬件时钟" - #: ../plugins/datetime/org.mate.settingsdaemon.datetimemechanism.policy.in.h:6 - msgid "Privileges are required to configure the hardware clock." - msgstr "配置硬件时钟需要权限" -+ -+msgid "Window zooming" -+msgstr "窗口缩放" -+ -+msgid "Window zooming has changed,\nsome applications need to logout and login again to work!" -+msgstr "窗口缩放已经改变，\n有些应用需要注销再登录才能起作用！" --- -1.8.3.1 - diff --git a/0001-fix-media-keys-Fix-grap-keys-while-set-capital-lette.patch b/0001-fix-media-keys-Fix-grap-keys-while-set-capital-lette.patch deleted file mode 100644 index eb8466241d3105ca9431fda108b2f004f9d7948f..0000000000000000000000000000000000000000 --- a/0001-fix-media-keys-Fix-grap-keys-while-set-capital-lette.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 7e74e79da8ef92e1800fc451ac0b9bc5aaada184 Mon Sep 17 00:00:00 2001 -From: meizhigang -Date: Fri, 9 Jun 2023 15:19:34 +0800 -Subject: [PATCH] fix(media-keys):Fix grap keys while set capital letters -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - - -兼容快捷键设置的大写字母 - - Related #I7C0TD - -Signed-off-by: meizhigang ---- - plugins/common/eggaccelerators.c | 25 ++++++++++++++++++++++++- - 1 file changed, 24 insertions(+), 1 deletion(-) - -diff --git a/plugins/common/eggaccelerators.c b/plugins/common/eggaccelerators.c -index 9662a3f..2099eca 100644 ---- a/plugins/common/eggaccelerators.c -+++ b/plugins/common/eggaccelerators.c -@@ -197,6 +197,22 @@ is_keycode (const gchar *string) - (string[1] == 'x')); - } - -+static guint -+get_single_letter_keyval(gchar ch) -+{ -+ gchar str[2] = {0}; -+ if (ch >= 'A' && ch <= 'Z') -+ { -+ snprintf(str, 2, "%c", tolower(ch)); -+ } -+ else -+ { -+ snprintf(str, 2, "%c", ch); -+ } -+ -+ return gdk_keyval_from_name (str); -+} -+ - /** - * egg_accelerator_parse_virtual: - * @accelerator: string representing an accelerator -@@ -346,7 +362,14 @@ egg_accelerator_parse_virtual (const gchar *accelerator, - } - else - { -- keyval = gdk_keyval_from_name (accelerator); -+ if (len == 1) -+ { -+ keyval = get_single_letter_keyval(*accelerator); -+ } -+ else -+ { -+ keyval = gdk_keyval_from_name (accelerator); -+ } - - if (keyval == 0) - { --- -2.27.0 - diff --git a/0001-fix-media-keys-Fix-sound-up-change-volume-normal-to-.patch b/0001-fix-media-keys-Fix-sound-up-change-volume-normal-to-.patch deleted file mode 100644 index 0b633968a93e2f886ca19fd4e51a16fc997627ca..0000000000000000000000000000000000000000 --- a/0001-fix-media-keys-Fix-sound-up-change-volume-normal-to-.patch +++ /dev/null @@ -1,31 +0,0 @@ -From c7ea14902880d20fa454ac57ea4d0c9c582f829f Mon Sep 17 00:00:00 2001 -From: meizhigang -Date: Mon, 26 Jun 2023 13:50:15 +0800 -Subject: [PATCH] fix(media-keys):Fix sound up change volume normal to max -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - - - 适配音量增大替换基准音量使用最大音量 - - Related #I7C0TD ---- - plugins/media-keys/msd-media-keys-manager.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/plugins/media-keys/msd-media-keys-manager.c b/plugins/media-keys/msd-media-keys-manager.c -index 79d9496..62690f3 100644 ---- a/plugins/media-keys/msd-media-keys-manager.c -+++ b/plugins/media-keys/msd-media-keys-manager.c -@@ -713,7 +713,7 @@ do_sound_action (MsdMediaKeysManager *manager, - /* Theoretically the volume limits might be different for different - * streams, also the minimum might not always start at 0 */ - volume_min = mate_mixer_stream_control_get_min_volume (control); -- volume_max = mate_mixer_stream_control_get_normal_volume (control); -+ volume_max = mate_mixer_stream_control_get_max_volume (control); - - volume_step = g_settings_get_int (manager->priv->settings, "volume-step"); - if (volume_step <= 0 || --- -2.27.0 - diff --git a/0001-fix-plugin-keyboard-not-show-the-xkb-status-icon-2613d058.patch b/0001-fix-plugin-keyboard-not-show-the-xkb-status-icon-2613d058.patch deleted file mode 100644 index 52cad50828d5c7393d5561111eabe6fb299562d2..0000000000000000000000000000000000000000 --- a/0001-fix-plugin-keyboard-not-show-the-xkb-status-icon-2613d058.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 2613d0586f2043ace936d2f34b85de2166f4fc09 Mon Sep 17 00:00:00 2001 -From: longcheng -Date: Thu, 15 Jul 2021 17:31:17 +0800 -Subject: [PATCH] fix(plugin-keyboard): not show the xkb status icon - ---- - plugins/keyboard/msd-keyboard-xkb.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/plugins/keyboard/msd-keyboard-xkb.c b/plugins/keyboard/msd-keyboard-xkb.c -index 7e90f1c..0584919 100644 ---- a/plugins/keyboard/msd-keyboard-xkb.c -+++ b/plugins/keyboard/msd-keyboard-xkb.c -@@ -467,7 +467,7 @@ apply_xkb_settings (void) - "Actual KBD configuration was not changed: redundant notification\n"); - - matekbd_keyboard_config_term (¤t_sys_kbd_config); -- show_hide_icon (); -+ /*show_hide_icon ();*/ - } - - static void --- -2.27.0 - diff --git a/1004-fix-keybinding-add-some-media-key-translations-f605e267.patch b/1004-fix-keybinding-add-some-media-key-translations-f605e267.patch deleted file mode 100644 index b6d1cc486fb97ffe7b32b6660bb179a448aea052..0000000000000000000000000000000000000000 --- a/1004-fix-keybinding-add-some-media-key-translations-f605e267.patch +++ /dev/null @@ -1,77 +0,0 @@ -From f605e26779dccba3c2d2e808c926e6b37785dc7c Mon Sep 17 00:00:00 2001 -From: yuanxing -Date: Tue, 11 Jan 2022 14:30:12 +0800 -Subject: [PATCH] fix(keybinding):add some media key translations -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -- 添加一些多媒体按键的翻译 - -Related #48455 ---- - po/zh_CN.po | 20 ++++++++++++++++---- - 1 file changed, 16 insertions(+), 4 deletions(-) - -diff --git a/po/zh_CN.po b/po/zh_CN.po -index 88573d4..03456e5 100644 ---- a/po/zh_CN.po -+++ b/po/zh_CN.po -@@ -427,6 +427,18 @@ msgstr "启用或禁用触摸板的键绑定。" - msgid "Volume mute" - msgstr "静音" - -+msgid "Volume down quietly" -+msgstr "安静地将音量调低" -+ -+msgid "Volume up quietly" -+msgstr "安静地将音量调高" -+ -+msgid "Volume mute quietly" -+msgstr "音频静音" -+ -+msgid "Microphone mute" -+msgstr "麦克风静音" -+ - #: ../data/org.mate.SettingsDaemon.plugins.media-keys.gschema.xml.in.h:12 - msgid "Binding to mute the system volume." - msgstr "使系统静音的键绑定。" -@@ -449,7 +461,7 @@ msgstr "升高系统音量的键绑定。" - - #: ../data/org.mate.SettingsDaemon.plugins.media-keys.gschema.xml.in.h:17 - msgid "Mute the audio quietly" --msgstr "" -+msgstr "音频静音" - - #: ../data/org.mate.SettingsDaemon.plugins.media-keys.gschema.xml.in.h:18 - msgid "Binding to mute the system volume quietly." -@@ -457,7 +469,7 @@ msgstr "" - - #: ../data/org.mate.SettingsDaemon.plugins.media-keys.gschema.xml.in.h:19 - msgid "Turn the volume down quietly" --msgstr "" -+msgstr "安静地把音量调低" - - #: ../data/org.mate.SettingsDaemon.plugins.media-keys.gschema.xml.in.h:20 - msgid "Binding to lower the system volume quietly." -@@ -465,7 +477,7 @@ msgstr "" - - #: ../data/org.mate.SettingsDaemon.plugins.media-keys.gschema.xml.in.h:21 - msgid "Turn the volume up quietly" --msgstr "" -+msgstr "安静地把音量调高" - - #: ../data/org.mate.SettingsDaemon.plugins.media-keys.gschema.xml.in.h:22 - msgid "Binding to raise the system volume quietly." -@@ -473,7 +485,7 @@ msgstr "" - - #: ../data/org.mate.SettingsDaemon.plugins.media-keys.gschema.xml.in.h:23 - msgid "Microphone mute/unmute" --msgstr "" -+msgstr "麦克风静音" - - #: ../data/org.mate.SettingsDaemon.plugins.media-keys.gschema.xml.in.h:24 - msgid "Binding to mute/unmute the microphone." --- -2.27.0 - diff --git a/1005-fix-media-keys-add-the-case-of-kiran-screensaver-whi-cc8f2984.patch b/1005-fix-media-keys-add-the-case-of-kiran-screensaver-whi-cc8f2984.patch deleted file mode 100644 index a2a00e9563bdbac8793dbececdcb88bb96a151fc..0000000000000000000000000000000000000000 --- a/1005-fix-media-keys-add-the-case-of-kiran-screensaver-whi-cc8f2984.patch +++ /dev/null @@ -1,34 +0,0 @@ -From cc8f2984ef67083abb13ab1a7a7e0b395defb9bc Mon Sep 17 00:00:00 2001 -From: meizhigang -Date: Mon, 24 Jan 2022 14:38:57 +0800 -Subject: [PATCH] fix(media-keys):add the case of kiran screensaver while lock - screen -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - - -添加快捷键锁屏kiran-screensaver条件分支 - - Related #48454 ---- - plugins/media-keys/msd-media-keys-manager.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/plugins/media-keys/msd-media-keys-manager.c b/plugins/media-keys/msd-media-keys-manager.c -index fc9bee7..79d9496 100644 ---- a/plugins/media-keys/msd-media-keys-manager.c -+++ b/plugins/media-keys/msd-media-keys-manager.c -@@ -1243,7 +1243,9 @@ do_action (MsdMediaKeysManager *manager, - g_free (cmd); - break; - case SCREENSAVER_KEY: -- if ((cmd = g_find_program_in_path ("mate-screensaver-command"))) { -+ if ((cmd = g_find_program_in_path ("kiran-screensaver-command"))) { -+ execute (manager, "kiran-screensaver-command --lock", FALSE, FALSE); -+ } else if ((cmd = g_find_program_in_path ("mate-screensaver-command"))) { - execute (manager, "mate-screensaver-command --lock", FALSE, FALSE); - } else { - execute (manager, "xscreensaver-command -lock", FALSE, FALSE); --- -2.27.0 - diff --git a/mate-settings-daemon-1.22.0.tar.xz b/mate-settings-daemon-1.22.0.tar.xz deleted file mode 100644 index 30df9e2eb3243e0e54c817bd2f84f4fd391d9424..0000000000000000000000000000000000000000 Binary files a/mate-settings-daemon-1.22.0.tar.xz and /dev/null differ diff --git a/mate-settings-daemon-1.28.0.tar.xz b/mate-settings-daemon-1.28.0.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..17f20edebe3272d81c9cbc405aeb06bdb92ed5c5 Binary files /dev/null and b/mate-settings-daemon-1.28.0.tar.xz differ diff --git a/mate-settings-daemon.spec b/mate-settings-daemon.spec index 164fe38eaaa6f07dbf6b81be337001067d6d30db..485893ec00232ca5316046914604bac90c31357f 100644 --- a/mate-settings-daemon.spec +++ b/mate-settings-daemon.spec @@ -1,68 +1,37 @@ -# Conditional for release and snapshot builds. Uncomment for release-builds. -%global rel_build 1 - -# This is needed, because src-url contains branched part of versioning-scheme. -%global branch 1.22 - -# Settings used for build from snapshots. -%{!?rel_build:%global commit 83fe1f587f5c6328b10a899a880275d79bf88921} -%{!?rel_build:%global commit_date 20141215} -%{!?rel_build:%global shortcommit %(c=%{commit};echo ${c:0:7})} -%{!?rel_build:%global git_ver git%{commit_date}-%{shortcommit}} -%{!?rel_build:%global git_rel .git%{commit_date}.%{shortcommit}} -%{!?rel_build:%global git_tar %{name}-%{version}-%{git_ver}.tar.xz} - Name: mate-settings-daemon -Version: %{branch}.0 -%if 0%{?rel_build} -Release: 8 -%else -Release: 0.10%{?git_rel} -%endif +Version: 1.28.0 +Release: 1 Summary: MATE Desktop settings daemon License: GPLv2+ URL: http://mate-desktop.org # for downloading the tarball use 'spectool -g -R mate-settings-daemon.spec' # Source for release-builds. -%{?rel_build:Source0: http://pub.mate-desktop.org/releases/%{branch}/%{name}-%{version}.tar.xz} -# Source for snapshot-builds. -%{!?rel_build:Source0: http://git.mate-desktop.org/%{name}/snapshot/%{name}-%{commit}.tar.xz#/%{git_tar}} - -# fix rhbz (#1140329) -#%if 0%{?rhel} -%if 0 -Patch1: mate-settings-daemon_fix-xrdb-plugin-for-rhel.patch -%endif - -Patch1000: mate-settings-daemon_Always-use-preferred-size-for-Virtual-screens-or-whe.patch -Patch1001: 0001-fix-mate-display-add-the-window-scale-changed-tip-wi.patch -Patch1002: 0001-feature-touchpad-set-the-default-values-of-disable-w.patch -Patch1003: 0001-fix-plugin-keyboard-not-show-the-xkb-status-icon-2613d058.patch -Patch1004: 1004-fix-keybinding-add-some-media-key-translations-f605e267.patch -Patch1005: 1005-fix-media-keys-add-the-case-of-kiran-screensaver-whi-cc8f2984.patch -Patch1006: 0001-feature-backends-Compatible-wayland-framework-which-.patch -Patch1007: 0001-fix-media-keys-Fix-grap-keys-while-set-capital-lette.patch -Patch1008: 0001-fix-media-keys-Fix-sound-up-change-volume-normal-to-.patch - -BuildRequires: dbus-glib-devel -BuildRequires: dconf-devel -BuildRequires: desktop-file-utils -BuildRequires: gtk3-devel -BuildRequires: libmatemixer-devel -BuildRequires: libcanberra-devel -BuildRequires: libmatekbd-devel -BuildRequires: libnotify-devel -BuildRequires: libSM-devel -BuildRequires: mate-common -BuildRequires: mate-desktop-devel -BuildRequires: polkit-devel -BuildRequires: nss-devel -BuildRequires: pulseaudio-libs-devel +Source0: http://pub.mate-desktop.org/releases/%{branch}/%{name}-%{version}.tar.xz + + +BuildRequires: dbus-glib-devel +BuildRequires: dconf-devel +BuildRequires: desktop-file-utils +BuildRequires: gtk3-devel +BuildRequires: libmatemixer-devel +BuildRequires: libcanberra-devel +BuildRequires: libmatekbd-devel +BuildRequires: libnotify-devel +BuildRequires: libSM-devel +BuildRequires: make +BuildRequires: mate-common +BuildRequires: mate-desktop-devel +BuildRequires: nss-devel +BuildRequires: polkit-devel +BuildRequires: pulseaudio-libs-devel +BuildRequires: systemd-devel Requires: libmatekbd%{?_isa} >= 0:1.6.1-1 +%if !0%{?bootstrap} # needed for xrandr capplet -#Requires: mate-control-center-filesystem +Requires: mate-control-center-filesystem +%endif %description This package contains the daemon which is responsible for setting the @@ -79,19 +48,9 @@ various parameters of a MATE session and the applications that run under it. %prep -%if 0%{?rel_build} %autosetup -p1 -%else -%autosetup -n %{name}-%{commit} -p1 -%endif -%if 0%{?rel_build} -#NOCONFIGURE=1 ./autogen.sh -%else # 0%{?rel_build} -# for snapshots -# needed for git snapshots NOCONFIGURE=1 ./autogen.sh -%endif # 0%{?rel_build} %build %configure \ @@ -118,7 +77,6 @@ desktop-file-validate %{buildroot}%{_sysconfdir}/xdg/autostart/mate-settings-dae %doc AUTHORS COPYING README %dir %{_sysconfdir}/mate-settings-daemon %dir %{_sysconfdir}/mate-settings-daemon/xrandr -%config %{_sysconfdir}/dbus-1/system.d/org.mate.SettingsDaemon.DateTimeMechanism.conf %{_sysconfdir}/xdg/autostart/mate-settings-daemon.desktop %{_sysconfdir}/xrdb/ %{_libdir}/mate-settings-daemon @@ -129,6 +87,7 @@ desktop-file-validate %{buildroot}%{_sysconfdir}/xdg/autostart/mate-settings-dae %{_datadir}/mate-control-center/keybindings/50-accessibility.xml %{_datadir}/dbus-1/services/org.mate.SettingsDaemon.service %{_datadir}/dbus-1/system-services/org.mate.SettingsDaemon.DateTimeMechanism.service +%{_datadir}/dbus-1/system.d/org.mate.SettingsDaemon.DateTimeMechanism.conf %{_datadir}/icons/hicolor/*/*/* %{_datadir}/mate-settings-daemon %{_datadir}/glib-2.0/schemas/org.mate.*.xml @@ -141,304 +100,5 @@ desktop-file-validate %{buildroot}%{_sysconfdir}/xdg/autostart/mate-settings-dae %changelog -* Mon Jun 26 2023 meizhigang - 1.22.0-8 -- KYOS-B: Fix sound up change volume normal to max (#I7C0TD) - -* Fri Jun 09 2023 meizhigang - 1.22.0-7 -- KYOS-B: Fix grap keys while set capital letters (#I7C0TD) - -* Tue Feb 07 2023 tangjie02 - 1.22.0-6 -- Compatible wayland framework which exists xwayland. - -* Fri Jul 08 2022 longcheng - 1.22.0-5 -- Always use preferred size for Virtual screens or when auto configure monitors Related #24217 #24260 -- add the window scale changed tip with notify. (#25310) -- set the default values of disable-while-typing and tap-to-click to true. -- KYOS-F: fix plugin keyboard not show the xkb status icon (#39545) -- KYOS-F: add some media key translations (#48455) -- KYOS-F: add the case of kiran screensaver while lock screen (#48454) - -* Mon Jun 13 2022 qiaoyujie - 1.22.0-4 -- remove %{dist} from spec file - -* Thu Jul 25 2019 Fedora Release Engineering - 1.22.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Thu Jun 20 2019 Adam Jackson - 1.22.0-2 -- Drop BuildRequires: libXxf86misc-devel, X servers haven't implemented that - extension in 10+ years. - -* Mon Mar 04 2019 Wolfgang Ulbrich - 1.22.0-1 -- update to 1.22.0 - -* Fri Feb 01 2019 Fedora Release Engineering - 1.20.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Mon Dec 24 2018 Wolfgang Ulbrich - 1.20.4-1 -- update to 1.20.4 release - -* Fri Jul 13 2018 Fedora Release Engineering - 1.20.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Sun Jun 03 2018 Wolfgang Ulbrich - 1.20.2-1 -- update to 1.20.2 -- use xrandr-applet improvements from upstream - -* Wed Apr 18 2018 Wolfgang Ulbrich - 1.20.1-2 -- improve background handling for HIDPI monitors -- use https://github.com/mate-desktop/mate-settings-daemon/pull/217 - -* Tue Mar 27 2018 Wolfgang Ulbrich - 1.20.1-1 -- update to 1.20.1 -- drop IconCache rpm scriptlet - -* Sun Feb 11 2018 Wolfgang Ulbrich - 1.20.0-1 -- update to 1.20.0 release -- drop GSettings Schema rpm scriplet -- switch to autosetup -- use BR polkit-devel instead of mate-polkit-devel - -* Thu Feb 08 2018 Fedora Release Engineering - 1.19.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Jan 25 2018 Wolfgang Ulbrich - 1.19.2-1 -- update to 1.19.2 - -* Mon Jan 01 2018 Wolfgang Ulbrich - 1.19.1-1 -- update to 1.19.1 - -* Wed Nov 29 2017 Wolfgang Ulbrich - 1.19.0-2 -- fix rhbz (#1517547) - -* Thu Aug 17 2017 Wolfgang Ulbrich - 1.19.0-1 -- update to 1.19.0 release - -* Thu Aug 03 2017 Fedora Release Engineering - 1.18.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 1.18.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Wed May 03 2017 Wolfgang Ulbrich - 1.18.1-2 -- add patch to fix xrdb plugin for rhel7 build - -* Wed Apr 05 2017 Wolfgang Ulbrich - 1.18.1-1 -- update to 1.18.1 - -* Tue Mar 14 2017 Wolfgang Ulbrich - 1.18.0-1 -- update to 1.18.0 release -- add https://github.com/mate-desktop/mate-settings-daemon/commit/280c174 - -* Fri Feb 10 2017 Fedora Release Engineering - 1.17.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Wed Jan 25 2017 Wolfgang Ulbrich - 1.17.1-1 -- update 1.17.1 to release with libinput support - -* Mon Jan 09 2017 Dan Horák - 1.17.0-3 -- don't require Xorg drivers on s390(x) - -* Fri Dec 23 2016 Wolfgang Ulbrich - 1.17.0-2 -- update to 1.17.0 release -- remove priority synaptic symlink for f26 -- use requires xorg-x11-drv-synaptics-legacy for f26 -- fix rhbz (#1406948) - -* Sat Dec 03 2016 Wolfgang Ulbrich - 1.17.0-1 -- update to 1.17.0 release -- add priority symlinks for synaptics and evdev driver - -* Sat Sep 17 2016 Wolfgang Ulbrich - 1.16.0-1 -- update to 1.16.0 release - -* Thu Aug 04 2016 Wolfgang Ulbrich - 1.15.1-1 -- update to 1.15.1 release - -* Sun Jul 24 2016 Wolfgang Ulbrich - 1.15.0-2 -- fix desktop redraw issues with gtk+-3.21.4 - -* Thu Jun 09 2016 Wolfgang Ulbrich - 1.15.0-1 -- update to 1.15.0 release -- switch to gtk+3 - -* Wed Apr 06 2016 Wolfgang Ulbrich - 1.14.0-1 -- update to 1.14.0 release - -* Sun Feb 07 2016 Wolfgang Ulbrich - 1.13.0-1 -- update to 1.13.0 release - -* Thu Feb 04 2016 Fedora Release Engineering - 1.12.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Fri Dec 04 2015 Wolfgang Ulbrich 1.12.1-1 -- update to 1.12.1 release - -* Fri Nov 06 2015 Wolfgang Ulbrich - 1.12.0-1 -- update to 1.12.0 release - -* Wed Oct 21 2015 Wolfgang Ulbrich - 1.11.0-1 -- update to 1.11.0 release - -* Mon Aug 31 2015 Wolfgang Ulbrich - 1.10.2-1 -- update to 1.10.2 release -- remove upstreamed patches -- add upstream touchpad improvement - -* Wed Aug 19 2015 Wolfgang Ulbrich - 1.10.1-2 -- another fix for glib2/gsettings regression - -* Tue Jul 14 2015 Wolfgang Ulbrich - 1.10.1.1 -- update to 1.10.1 release - -* Wed Jun 17 2015 Fedora Release Engineering - 1.10.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Tue Apr 07 2015 Wolfgang Ulbrich - 1.10.0-1 -- update to 1.10.0 release - -* Thu Feb 26 2015 Wolfgang Ulbrich - 1.9.90-1 -- update to 1.9.90 release - -* Wed Jan 21 2015 Wolfgang Ulbrich - 1.9.6-1 -- update to 1.9.6 release - -* Thu Nov 20 2014 Wolfgang Ulbrich - 1.9.5-1 -- update to 1.9.5 release - -* Tue Nov 11 2014 Wolfgang Ulbrich - 1.9.4-1 -- update to 1.9.4 release - -* Mon Oct 27 2014 Wolfgang Ulbrich - 1.9.3-1 -- update to 1.9.3 release - -* Sun Oct 12 2014 Wolfgang Ulbrich - 1.9.2-1 -- update to 1.9.2 release - -* Sun Aug 17 2014 Fedora Release Engineering - 1.9.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sat Jul 12 2014 Wolfgang Ulbrich - 1.9.1-1 -- update to 1.9.1 release - -* Sat Jun 07 2014 Fedora Release Engineering - 1.8.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Tue May 06 2014 Wolfgang Ulbrich - 1.8.1-1 -- update to 1.8.1 - -* Wed Mar 05 2014 Dan Mashal - 1.8.0-1 -- Update to 1.8.0 - -* Tue Feb 18 2014 Wolfgang Ulbrich - 1.7.90-1 -- update to 1.7.90 -- use --with-gnome --all-name for find locale -- use modern 'make install' macro -- add man dir - -* Sun Feb 09 2014 Dan Mashal - 1.7.1-1 -- Update to 1.7.1 - -* Thu Dec 05 2013 Dan Mashal - 1.7.0-1 -- Update to 1.7.0 - -* Thu Oct 03 2013 Wolfgang Ulbrich - 1.6.2-0.3.gitd2d3aa7 -- enable pulsaudio support - -* Tue Oct 01 2013 Wolfgang Ulbrich - 1.6.2-0.2.gitd2d3aa7 -- add misssing directory for xrandr-capplet function 'system-wide installation' -- add runtime requires mate-control-center-filesystem for xrandr-capplet - -* Mon Sep 23 2013 Wolfgang Ulbrich - 1.6.2-0.1.gitd2d3aa7 -- update to latest snapshot -- fix https://github.com/mate-desktop/mate-settings-daemon/issues/32 -- remove runtime require mate-icon-theme, no need of it -- remove %%config from desktop file -- remove needless find '*.a' -- switch to pulseaudio, fix rhbz (#1008011) -- cleanup BRs - -* Sat Aug 03 2013 Fedora Release Engineering - 1.6.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Fri Jun 28 2013 Wolfgang Ulbrich - 1.6.1.2 -- remove BR gsettings-desktop-schemas-devel -- remove needless gsettings convert file -- clean up BR's -- add versioned runtime require libmatekbd - -* Mon Jun 24 2013 Dan Mashal - 1.6.1-1 -- Update to latest upstream release. - -* Sat Jun 22 2013 Dan Mashal - 1.6.0-3 -- Update libnotify.patch with latest upstream commits - -* Tue Jun 11 2013 Dan Mashal - 1.6.0-2 -- Add libnotify patch - -* Wed Apr 03 2013 Dan Mashal - 1.6.0-1 -- Update to latest 1.6.0 stable release. - -* Tue Mar 26 2013 Dan Mashal - 1.5.7-1 -- Update to latest upstream release - -* Fri Feb 08 2013 Dan Mashal - 1.5.5-1 --Update to latest upstream release --Convert back to old BR style --Own dirs we are supposed to own - -* Tue Jan 15 2013 Dan Mashal - 1.5.4-3 -- Fix icon scriptlets - -* Fri Dec 21 2012 Nelson Marques - 1.5.4-2 -- Fix broken gstreamer support: - + add gstreamer BuildRequires - + disable pulse so we build with gstreamer support -- Add '--disable-static' to %%configure and remove find entries -- Improve description, overall readability, order dependencies and - minor improvements - -* Mon Dec 03 2012 Dan Mashal - 1.5.4-1 -- Latest upstream release - -* Fri Nov 23 2012 Dan Mashal - 1.5.3-5 -- Remove archlinux configure.ac bits. -- REALLY fix CVE-2012-5560 - -* Fri Nov 23 2012 Dan Mashal - 1.5.3-4 -- stop generating version specific libdirs for plugins and fix CVE-2012-5560 - -* Thu Nov 22 2012 Dan Mashal - 1.5.3-3 -- fix build failures - -* Thu Nov 22 2012 Dan Mashal - 1.5.3-2 -- drop mate-corba from br as it is deprecated - -* Mon Oct 29 2012 Leigh Scott - 1.5.3-1 -- update to 1.5.3 release - -* Mon Oct 29 2012 Leigh Scott - 1.5.0-1 -- update to 1.5.0 release -- add schema scriptlets and remove mateconf scriptlets -- add requires gsettings-desktop-schemas -- add build requires gsettings-desktop-schemas-devel -- change build requires style - -* Wed Oct 10 2012 Rex Dieter 1.4.0-6 -- fix icon scriptlets - -* Fri Sep 28 2012 Rex Dieter - 1.4.0-5 -- remove local quirks not needed for fedora buildsys -- simplify %%files, fix some dir-ownership -- cosmetics: move scriptlets to be next to %%files - -* Tue Sep 25 2012 Dan Mashal 1.4.0-4 -- Own mate-settings-daemon directory, update build requires and configure flags - -* Tue Sep 25 2012 Dan Mashal 1.4.0-3 -- Fix mateconf scritplets, switch back to upstream source. - -* Sat Sep 15 2012 Dan Mashal 1.4.0-2 -- Move shared libs to main package and update buildrequires to add libSM-devel add mateconf scriptlets - -* Sat Sep 01 2012 Dan Mashal 1.4.0-1 +* Wed Feb 19 2025 yuanxing - 1.28.0-1 - Initial build diff --git a/mate-settings-daemon.yaml b/mate-settings-daemon.yaml new file mode 100644 index 0000000000000000000000000000000000000000..86f0266ab2370fe4396e00ce1ab5fc9889ee3915 --- /dev/null +++ b/mate-settings-daemon.yaml @@ -0,0 +1,4 @@ +version_control: github +src_repo: mate-desktop/mate-settings-daemon +tag_prefix: ^v +seperator: . diff --git a/mate-settings-daemon_Always-use-preferred-size-for-Virtual-screens-or-whe.patch b/mate-settings-daemon_Always-use-preferred-size-for-Virtual-screens-or-whe.patch deleted file mode 100644 index 0be8db44761f37d5734fbd0c83f0544d77cfc653..0000000000000000000000000000000000000000 --- a/mate-settings-daemon_Always-use-preferred-size-for-Virtual-screens-or-whe.patch +++ /dev/null @@ -1,74 +0,0 @@ -From 228384e4772f13d3078c45e726a3940dd2913af5 Mon Sep 17 00:00:00 2001 -From: songchuanfei -Date: Tue, 7 Apr 2020 19:03:34 +0800 -Subject: [PATCH] Always use preferred size for Virtual screens or when auto - configure monitors -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -- 对于接入的新输出，自动设置分辨率时总是使用最佳分辨率, Fix #24217 #24260 -- 对于虚拟屏幕, 总是自动设置分辨率 - -Signed-off-by: songchuanfei ---- - plugins/xrandr/msd-xrandr-manager.c | 29 ++++++++++++++++++++++++++++- - 1 file changed, 28 insertions(+), 1 deletion(-) - -diff --git a/plugins/xrandr/msd-xrandr-manager.c b/plugins/xrandr/msd-xrandr-manager.c -index fff0c9b..ff6fa3c 100644 ---- a/plugins/xrandr/msd-xrandr-manager.c -+++ b/plugins/xrandr/msd-xrandr-manager.c -@@ -1455,7 +1455,10 @@ auto_configure_outputs (MsdXrandrManager *manager, guint32 timestamp) - int width, height; - g_assert (mate_rr_output_info_is_connected (output)); - -- mate_rr_output_info_get_geometry (output, NULL, NULL, &width, &height); -+ width = mate_rr_output_info_get_preferred_width(output); -+ height = mate_rr_output_info_get_preferred_height(output); -+ -+ log_msg("Set output '%s' size to '%d x %d'\n", mate_rr_output_info_get_name(output), width, height); - mate_rr_output_info_set_geometry (output, x, 0, width, height); - - x += width; -@@ -1603,6 +1606,29 @@ on_randr_event (MateRRScreen *screen, gpointer data) - - show_timestamps_dialog (manager, "need to deal with reconfiguration, as config > change"); - -+ do { -+ MsdXrandrManagerPrivate *priv = manager->priv; -+ MateRROutput **outputs = mate_rr_screen_list_outputs(priv->rw_screen); -+ int i; -+ -+ for (i = 0; outputs[i] != NULL; i++) { -+ MateRROutput *output = outputs[i]; -+ -+ if (!mate_rr_output_is_connected(output)) -+ continue; -+ -+ if (mate_rr_output_has_hotplug_mode_update(output)) { -+ log_msg (" Found output '%s' with property 'hotplug_mode_update'\n", -+ mate_rr_output_get_name(output)); -+ /* -+ * Virtual screen found, just do autoconfigure -+ */ -+ goto autoconfigure; -+ } -+ } -+ -+ } while (0); -+ - intended_filename = mate_rr_config_get_intended_filename (); - - error = NULL; -@@ -1628,6 +1654,7 @@ on_randr_event (MateRRScreen *screen, gpointer data) - if (error) - g_error_free (error); - -+autoconfigure: - if (config_timestamp != priv->last_config_timestamp) { - priv->last_config_timestamp = config_timestamp; - auto_configure_outputs (manager, config_timestamp); --- -2.18.1 -