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.26.1.tar.xz b/mate-settings-daemon-1.26.1.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..7cc8bbc6b521797bad364c3d51be30abd4055d9b Binary files /dev/null and b/mate-settings-daemon-1.26.1.tar.xz differ diff --git a/mate-settings-daemon.spec b/mate-settings-daemon.spec index 164fe38eaaa6f07dbf6b81be337001067d6d30db..c0b2e5a97137a6cc07b77f395b65b1e14c76a9ac 100644 --- a/mate-settings-daemon.spec +++ b/mate-settings-daemon.spec @@ -2,7 +2,11 @@ %global rel_build 1 # This is needed, because src-url contains branched part of versioning-scheme. -%global branch 1.22 +%global branch 1.26 + +# Needed to break circular dependencies between mate-settings-daemon(-devel) +# and mate-control-center(-filesystem), especially for new RHEL releases. +%global bootstrap 0 # Settings used for build from snapshots. %{!?rel_build:%global commit 83fe1f587f5c6328b10a899a880275d79bf88921} @@ -13,12 +17,8 @@ %{!?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: %{branch}.1 +Release: 1 Summary: MATE Desktop settings daemon License: GPLv2+ URL: http://mate-desktop.org @@ -29,40 +29,37 @@ URL: http://mate-desktop.org # 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 +# from upstream +# https://github.com/mate-desktop/mate-settings-daemon/commit/babfbd3 +Patch3: mate-settings-daemon_0001-Add-setting-for-adjustment-of-audio-volume-above-100.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: 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 +# since f34 +%if 0%{?fedora} && 0%{?fedora} >= 34 +Requires: xmodmap +Requires: xrdb +%endif %description This package contains the daemon which is responsible for setting the @@ -87,11 +84,11 @@ under it. %if 0%{?rel_build} #NOCONFIGURE=1 ./autogen.sh -%else # 0%{?rel_build} +%else # for snapshots # needed for git snapshots NOCONFIGURE=1 ./autogen.sh -%endif # 0%{?rel_build} +%endif %build %configure \ @@ -118,7 +115,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 +125,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,22 +138,8 @@ 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 Aug 26 2024 yueyaoqiang - 1.26.1-1 +- update to 1.26.1 * Mon Jun 13 2022 qiaoyujie - 1.22.0-4 - remove %{dist} from spec file diff --git a/mate-settings-daemon_0001-Add-setting-for-adjustment-of-audio-volume-above-100.patch b/mate-settings-daemon_0001-Add-setting-for-adjustment-of-audio-volume-above-100.patch new file mode 100644 index 0000000000000000000000000000000000000000..e5351cebad72d140388cb5ff9dc29330afedc61e --- /dev/null +++ b/mate-settings-daemon_0001-Add-setting-for-adjustment-of-audio-volume-above-100.patch @@ -0,0 +1,88 @@ +From 7a665fa4f6f2d99eeef08185ca887b828be39730 Mon Sep 17 00:00:00 2001 +From: Gordon Norman Squash +Date: Thu, 28 Jul 2022 21:27:16 -0400 +Subject: [PATCH] Add setting for adjustment of audio volume above 100 per + cent: Part 3 + +There is often a need for the user to increase the audio playback volume above +the volume level known as "100% volume". While increasing the audio volume +above 100% can result in degraded audio quality, sometimes the audio was, for +example, originally recorded at an extremely low volume, and the user has no +other option to clearly hear the audio. Unfortunately, most MATE applications +with volume controls do not allow the user to set the volume level above 100%. +For example, the main MATE Sound Preferences dialog lets you set the audio +volume beyond 100% (when possible), whereas the Volume Control Applet, Volume +Control status icon, and special "multimedia" volume control keys do not. In +fact, if the user even tries to change the volume using any of the latter +methods, and the current volume level is above 100%, these latter methods will +all reduce the volume to 100%, even if the user tried to increase the volume! + +This is part 3 of a patch to change this situation. This patch adds this +capability to the handlers for the "multimedia" volume control keys -- if the +appropriate setting is enabled in the MATE Volume Control Dialog (see +patch 2), then the user can increase the audio volume beyond 100% by pressing +the "Volume Up" key on their keyboard (if they have such a key). While this +patch is smaller than patch 2, it is equally important since the original +feature request was for the multimedia keys and not for anything else in +particular. +--- + plugins/media-keys/msd-media-keys-manager.c | 15 ++++++++++++++- + 1 file changed, 14 insertions(+), 1 deletion(-) + +diff --git a/plugins/media-keys/msd-media-keys-manager.c b/plugins/media-keys/msd-media-keys-manager.c +index 4abb4afd..7422e6ff 100644 +--- a/plugins/media-keys/msd-media-keys-manager.c ++++ b/plugins/media-keys/msd-media-keys-manager.c +@@ -59,6 +59,9 @@ + #define TOUCHPAD_SCHEMA "org.mate.peripherals-touchpad" + #define TOUCHPAD_ENABLED_KEY "touchpad-enabled" + ++#define SOUND_SCHEMA "org.mate.sound" ++#define VOLUME_OVERAMPLIFIABLE_KEY "volume-overamplifiable" ++ + typedef struct { + char *application; + guint32 time; +@@ -76,6 +79,7 @@ struct _MsdMediaKeysManagerPrivate + #endif + GtkWidget *dialog; + GSettings *settings; ++ GSettings *sound_settings; + GVolumeMonitor *volume_monitor; + + /* Multihead stuff */ +@@ -723,7 +727,10 @@ 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); ++ if (g_settings_get_boolean (manager->priv->sound_settings, VOLUME_OVERAMPLIFIABLE_KEY)) ++ volume_max = mate_mixer_stream_control_get_max_volume (control); ++ else ++ volume_max = mate_mixer_stream_control_get_normal_volume (control); + + volume_step = g_settings_get_int (manager->priv->settings, "volume-step"); + if (volume_step <= 0 || volume_step > 100) { +@@ -1424,6 +1431,7 @@ start_media_keys_idle_cb (MsdMediaKeysManager *manager) + + manager->priv->volume_monitor = g_volume_monitor_get (); + manager->priv->settings = g_settings_new (BINDING_SCHEMA); ++ manager->priv->sound_settings = g_settings_new (SOUND_SCHEMA); + + ensure_cancellable (&manager->priv->rfkill_cancellable); + +@@ -1537,6 +1545,11 @@ msd_media_keys_manager_stop (MsdMediaKeysManager *manager) + priv->settings = NULL; + } + ++ if (priv->sound_settings != NULL) { ++ g_object_unref (priv->sound_settings); ++ priv->sound_settings = NULL; ++ } ++ + if (priv->volume_monitor != NULL) { + g_object_unref (priv->volume_monitor); + priv->volume_monitor = NULL; +-- +2.37.1 + 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 -