From 75c3f6447b3f0d02f5c2d77bf9dcdae56e600a3c Mon Sep 17 00:00:00 2001 From: longcheng Date: Thu, 7 Jul 2022 17:19:24 +0800 Subject: [PATCH] Add some patches Signed-off-by: longcheng (cherry picked from commit 83e89449aabb62cf14712081949397c02d15397a) --- ...ume-icon-is-not-displayed-w-b3744859.patch | 22 ++++++++++ ...gories-in-desktop-and-fixed-combobox.patch | 42 +++++++++++++++++++ mate-media.spec | 9 +++- 3 files changed, 72 insertions(+), 1 deletion(-) create mode 100644 0001-fix-autostart-Fix-the-volume-icon-is-not-displayed-w-b3744859.patch create mode 100644 0001-modify-catagories-in-desktop-and-fixed-combobox.patch diff --git a/0001-fix-autostart-Fix-the-volume-icon-is-not-displayed-w-b3744859.patch b/0001-fix-autostart-Fix-the-volume-icon-is-not-displayed-w-b3744859.patch new file mode 100644 index 0000000..48770b5 --- /dev/null +++ b/0001-fix-autostart-Fix-the-volume-icon-is-not-displayed-w-b3744859.patch @@ -0,0 +1,22 @@ +From b37448593ab3d91374d8c3c14e6dddf846c1aef7 Mon Sep 17 00:00:00 2001 +From: longcheng +Date: Mon, 5 Jul 2021 17:28:07 +0800 +Subject: [PATCH] fix autostart Fix the volume icon is not displayed when + entering the desktop environment through init 5 + +--- + data/mate-volume-control-status-icon.desktop.in | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/data/mate-volume-control-status-icon.desktop.in b/data/mate-volume-control-status-icon.desktop.in +index 86f0756..6c0eb73 100644 +--- a/data/mate-volume-control-status-icon.desktop.in ++++ b/data/mate-volume-control-status-icon.desktop.in +@@ -15,3 +15,4 @@ X-MATE-Bugzilla-Component=mate-volume-control + # See http://bugzilla.mate.org/show_bug.cgi?id=568320 + #X-MATE-Autostart-Phase=Panel + X-MATE-Autostart-Notify=true ++X-MATE-Autostart-Delay=1 +-- +2.27.0 + diff --git a/0001-modify-catagories-in-desktop-and-fixed-combobox.patch b/0001-modify-catagories-in-desktop-and-fixed-combobox.patch new file mode 100644 index 0000000..b533cb0 --- /dev/null +++ b/0001-modify-catagories-in-desktop-and-fixed-combobox.patch @@ -0,0 +1,42 @@ +From 9aa7ae49737372e1923b6e7ef870493f9dfec05b Mon Sep 17 00:00:00 2001 +From: mazhiguo +Date: Wed, 4 Sep 2019 23:16:32 -0400 +Subject: [PATCH] modify catagories in desktop and fixed combobox + +--- + data/mate-volume-control.desktop.in.in | 2 +- + mate-volume-control/gvc-sound-theme-chooser.c | 3 ++- + 2 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/data/mate-volume-control.desktop.in.in b/data/mate-volume-control.desktop.in.in +index 60708a4..7e9976c 100644 +--- a/data/mate-volume-control.desktop.in.in ++++ b/data/mate-volume-control.desktop.in.in +@@ -6,7 +6,7 @@ Icon=multimedia-volume-control + Terminal=false + Type=Application + StartupNotify=true +-Categories=AudioVideo;Mixer;Settings;HardwareSettings; ++Categories=AudioVideo;Mixer;Settings;HardwareSettings;X-Hardware; + Keywords=MATE;volume;control;mixer;settings;sound;events; + OnlyShowIn=MATE; + X-MATE-Bugzilla-Bugzilla=MATE +diff --git a/mate-volume-control/gvc-sound-theme-chooser.c b/mate-volume-control/gvc-sound-theme-chooser.c +index 4034c6f..c5b16fc 100644 +--- a/mate-volume-control/gvc-sound-theme-chooser.c ++++ b/mate-volume-control/gvc-sound-theme-chooser.c +@@ -112,9 +112,10 @@ on_combobox_changed (GtkComboBox *widget, + /* special case for no sounds */ + if (strcmp (theme_name, NO_SOUNDS_THEME_NAME) == 0) { + g_settings_set_boolean (chooser->priv->sound_settings, EVENT_SOUNDS_KEY, FALSE); +- return; ++ g_settings_set_string (chooser->priv->sound_settings, SOUND_THEME_KEY, theme_name); + } else { + g_settings_set_boolean (chooser->priv->sound_settings, EVENT_SOUNDS_KEY, TRUE); ++ g_settings_set_string (chooser->priv->sound_settings, SOUND_THEME_KEY, theme_name); + } + + g_free (theme_name); +-- +2.18.1 + diff --git a/mate-media.spec b/mate-media.spec index 0183d1a..cd68a4f 100644 --- a/mate-media.spec +++ b/mate-media.spec @@ -1,6 +1,6 @@ Name: mate-media Version: 1.22.2 -Release: 2 +Release: 3 Summary: MATE media programs License: GPLv2+ and LGPLv2+ URL: http://mate-desktop.org @@ -15,6 +15,9 @@ BuildRequires: mate-desktop-devel BuildRequires: mate-common BuildRequires: mate-panel-devel +Patch1001: 0001-modify-catagories-in-desktop-and-fixed-combobox.patch +Patch1002: 0001-fix-autostart-Fix-the-volume-icon-is-not-displayed-w-b3744859.patch + %description This package contains a few media utilities for the MATE desktop, including a volume control. @@ -57,6 +60,10 @@ desktop-file-install \ %changelog +* Thu Jul 07 2022 longcheng - 1.22.2-3 +- KYOS-B: modify catagories in desktop;fixed combobox while change to default option +- KYOS-F: fix autostart Fix the volume icon is not displayed when entering the desktop environment through init 5 (#40693) + * Thu Mar 24 2022 xigaoxinyan - 1.22.2-2 - delete %{?dist}