From 63d90d260e36b053ded18717c137ff0790e6de6a Mon Sep 17 00:00:00 2001 From: yueyaoqiang Date: Mon, 21 Oct 2024 14:32:25 +0800 Subject: [PATCH] add patches from 1.22 --- 0001-add-patches-and-build-error.patch | 25 +++++ ...-set-the-default-values-of-disable-w.patch | 32 +++++++ ...-add-the-window-scale-changed-tip-wi.patch | 93 +++++++++++++++++++ ...eyboard-not-show-the-xkb-status-icon.patch | 25 +++++ ...ding-add-some-media-key-translations.patch | 35 +++++++ ...dd-the-case-of-kiran-screensaver-whi.patch | 28 ++++++ ...rred-size-for-Virtual-screens-or-whe.patch | 68 ++++++++++++++ mate-settings-daemon.spec | 12 ++- 8 files changed, 317 insertions(+), 1 deletion(-) create mode 100644 0001-add-patches-and-build-error.patch create mode 100644 0001-feature-touchpad-set-the-default-values-of-disable-w.patch create mode 100644 0002-fix-mate-display-add-the-window-scale-changed-tip-wi.patch create mode 100644 0003-fix-plugin-keyboard-not-show-the-xkb-status-icon.patch create mode 100644 0004-fix-keybinding-add-some-media-key-translations.patch create mode 100644 0005-fix-media-keys-add-the-case-of-kiran-screensaver-whi.patch create mode 100644 0006-Always-use-preferred-size-for-Virtual-screens-or-whe.patch diff --git a/0001-add-patches-and-build-error.patch b/0001-add-patches-and-build-error.patch new file mode 100644 index 0000000..ae359be --- /dev/null +++ b/0001-add-patches-and-build-error.patch @@ -0,0 +1,25 @@ +From f7ce96eee7b9afbeac7eaf7d2950ce1d2b41e279 Mon Sep 17 00:00:00 2001 +From: yueyaoqiang +Date: Mon, 21 Oct 2024 14:49:03 +0800 +Subject: [PATCH] add patches and build error + +--- + 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 f84521d..d1ed2a2 100644 +--- a/plugins/media-keys/msd-media-keys-manager.c ++++ b/plugins/media-keys/msd-media-keys-manager.c +@@ -1262,7 +1262,7 @@ do_action (MsdMediaKeysManager *manager, + case SCREENSAVER_KEY: + 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"))) { ++ } 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/0001-feature-touchpad-set-the-default-values-of-disable-w.patch b/0001-feature-touchpad-set-the-default-values-of-disable-w.patch new file mode 100644 index 0000000..62b6dd1 --- /dev/null +++ b/0001-feature-touchpad-set-the-default-values-of-disable-w.patch @@ -0,0 +1,32 @@ +From 191e6facbbb6c730962c1319eda39201bcd7213d Mon Sep 17 00:00:00 2001 +From: yueyaoqiang +Date: Mon, 21 Oct 2024 13:58:36 +0800 +Subject: [PATCH 1/6] feature(touchpad): set the default values of + disable-while-typing and tap-to-click to true + +--- + 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 2755174..72602d8 100644 +--- a/data/org.mate.peripherals-touchpad.gschema.xml.in ++++ b/data/org.mate.peripherals-touchpad.gschema.xml.in +@@ -11,12 +11,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.27.0 + diff --git a/0002-fix-mate-display-add-the-window-scale-changed-tip-wi.patch b/0002-fix-mate-display-add-the-window-scale-changed-tip-wi.patch new file mode 100644 index 0000000..1766134 --- /dev/null +++ b/0002-fix-mate-display-add-the-window-scale-changed-tip-wi.patch @@ -0,0 +1,93 @@ +From 5b014f58922e5fd6aae22db94f9233104a5bafe6 Mon Sep 17 00:00:00 2001 +From: yueyaoqiang +Date: Mon, 21 Oct 2024 14:06:29 +0800 +Subject: [PATCH 2/6] fix(mate-display): add the window scale changed tip with + notify + +--- + plugins/xsettings/msd-xsettings-manager.c | 37 +++++++++++++++++++++++ + po/zh_CN.po | 6 ++++ + 2 files changed, 43 insertions(+) + +diff --git a/plugins/xsettings/msd-xsettings-manager.c b/plugins/xsettings/msd-xsettings-manager.c +index c8199da..c7b9eda 100644 +--- a/plugins/xsettings/msd-xsettings-manager.c ++++ b/plugins/xsettings/msd-xsettings-manager.c +@@ -40,6 +40,10 @@ + #include + #include + ++#ifdef HAVE_LIBNOTIFY ++#include ++#endif ++ + #include "mate-settings-profile.h" + #include "msd-xsettings-manager.h" + #include "xsettings-manager.h" +@@ -522,6 +526,38 @@ delayed_toggle_bg_draw (gpointer value) + return G_SOURCE_REMOVE; + } + ++ 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, int unscaled_dpi) + { +@@ -587,6 +623,7 @@ scale_change_workarounds (MateXSettingsManager *manager, int new_scale, int unsc + g_timeout_add_seconds (2, delayed_toggle_bg_draw, GBOOLEAN_TO_POINTER (TRUE)); + } + g_object_unref (desktop_settings); ++ 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 ce95172..ba85f80 100644 +--- a/po/zh_CN.po ++++ b/po/zh_CN.po +@@ -1072,6 +1072,12 @@ msgstr "配置硬件时钟" + 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有些应用需要注销再登录才能起作用！" ++ + #: plugins/dummy/dummy.mate-settings-plugin.desktop.in:5 + msgid "Dummy" + msgstr "傻瓜" +-- +2.27.0 + diff --git a/0003-fix-plugin-keyboard-not-show-the-xkb-status-icon.patch b/0003-fix-plugin-keyboard-not-show-the-xkb-status-icon.patch new file mode 100644 index 0000000..04b4314 --- /dev/null +++ b/0003-fix-plugin-keyboard-not-show-the-xkb-status-icon.patch @@ -0,0 +1,25 @@ +From 62c0797353645c59c0c087b28507c5a5a09245b8 Mon Sep 17 00:00:00 2001 +From: yueyaoqiang +Date: Mon, 21 Oct 2024 14:10:17 +0800 +Subject: [PATCH 3/6] 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 9158fb4..2f85d75 100644 +--- a/plugins/keyboard/msd-keyboard-xkb.c ++++ b/plugins/keyboard/msd-keyboard-xkb.c +@@ -474,7 +474,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/0004-fix-keybinding-add-some-media-key-translations.patch b/0004-fix-keybinding-add-some-media-key-translations.patch new file mode 100644 index 0000000..ad2778d --- /dev/null +++ b/0004-fix-keybinding-add-some-media-key-translations.patch @@ -0,0 +1,35 @@ +From 6e8e96e35819e3c070a5aadf946a65bcdac7fb99 Mon Sep 17 00:00:00 2001 +From: yueyaoqiang +Date: Mon, 21 Oct 2024 14:17:50 +0800 +Subject: [PATCH 4/6] fix(keybinding):add some media key translations + +--- + po/zh_CN.po | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +diff --git a/po/zh_CN.po b/po/zh_CN.po +index ba85f80..7e7f6d7 100644 +--- a/po/zh_CN.po ++++ b/po/zh_CN.po +@@ -582,6 +582,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:31 + msgid "Binding to mute the system volume." + msgstr "使系统静音的键绑定。" +-- +2.27.0 + diff --git a/0005-fix-media-keys-add-the-case-of-kiran-screensaver-whi.patch b/0005-fix-media-keys-add-the-case-of-kiran-screensaver-whi.patch new file mode 100644 index 0000000..3933ab9 --- /dev/null +++ b/0005-fix-media-keys-add-the-case-of-kiran-screensaver-whi.patch @@ -0,0 +1,28 @@ +From 4a551a39d4c418d36c2bce950424aa1ea41bd45f Mon Sep 17 00:00:00 2001 +From: yueyaoqiang +Date: Mon, 21 Oct 2024 14:20:53 +0800 +Subject: [PATCH 5/6] fix(media-keys):add the case of kiran screensaver while + lock screen + +--- + 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 7422e6f..f84521d 100644 +--- a/plugins/media-keys/msd-media-keys-manager.c ++++ b/plugins/media-keys/msd-media-keys-manager.c +@@ -1260,7 +1260,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/0006-Always-use-preferred-size-for-Virtual-screens-or-whe.patch b/0006-Always-use-preferred-size-for-Virtual-screens-or-whe.patch new file mode 100644 index 0000000..644f7fb --- /dev/null +++ b/0006-Always-use-preferred-size-for-Virtual-screens-or-whe.patch @@ -0,0 +1,68 @@ +From 6ab1bffdbdfb28758ee7ab63383260a169dcf901 Mon Sep 17 00:00:00 2001 +From: yueyaoqiang +Date: Mon, 21 Oct 2024 14:26:18 +0800 +Subject: [PATCH 6/6] Always use preferred size for Virtual screens or when + auto configure monitors + +--- + plugins/xrandr/msd-xrandr-manager.c | 30 +++++++++++++++++++++++++++-- + 1 file changed, 28 insertions(+), 2 deletions(-) + +diff --git a/plugins/xrandr/msd-xrandr-manager.c b/plugins/xrandr/msd-xrandr-manager.c +index 70b5ce0..5c0ed15 100644 +--- a/plugins/xrandr/msd-xrandr-manager.c ++++ b/plugins/xrandr/msd-xrandr-manager.c +@@ -1452,7 +1452,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; +@@ -1600,6 +1603,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; +@@ -1624,7 +1650,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.27.0 + diff --git a/mate-settings-daemon.spec b/mate-settings-daemon.spec index c0b2e5a..ebdf80b 100644 --- a/mate-settings-daemon.spec +++ b/mate-settings-daemon.spec @@ -18,7 +18,7 @@ Name: mate-settings-daemon Version: %{branch}.1 -Release: 1 +Release: 2 Summary: MATE Desktop settings daemon License: GPLv2+ URL: http://mate-desktop.org @@ -32,6 +32,13 @@ URL: http://mate-desktop.org # 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 +Patch4: 0001-feature-touchpad-set-the-default-values-of-disable-w.patch +Patch5: 0002-fix-mate-display-add-the-window-scale-changed-tip-wi.patch +Patch6: 0003-fix-plugin-keyboard-not-show-the-xkb-status-icon.patch +Patch7: 0004-fix-keybinding-add-some-media-key-translations.patch +Patch8: 0005-fix-media-keys-add-the-case-of-kiran-screensaver-whi.patch +Patch9: 0006-Always-use-preferred-size-for-Virtual-screens-or-whe.patch +Patch10: 0001-add-patches-and-build-error.patch BuildRequires: dbus-glib-devel BuildRequires: dconf-devel @@ -138,6 +145,9 @@ desktop-file-validate %{buildroot}%{_sysconfdir}/xdg/autostart/mate-settings-dae %changelog +* Mon Oct 21 2024 yueyaoqiang - 1.26.1-2 +- add patches from 1.22 + * Mon Aug 26 2024 yueyaoqiang - 1.26.1-1 - update to 1.26.1 -- Gitee