diff --git a/0003-add-kiran-flameshot-super-key-ce015032.patch b/0003-add-kiran-flameshot-super-key-ce015032.patch deleted file mode 100644 index 6bbe0df1e42e8c793a3f64649cc9c62edf297066..0000000000000000000000000000000000000000 --- a/0003-add-kiran-flameshot-super-key-ce015032.patch +++ /dev/null @@ -1,40 +0,0 @@ -From ce01503237138704e94b9f51be135675f841c3fd Mon Sep 17 00:00:00 2001 -From: longcheng -Date: Thu, 24 Mar 2022 18:59:42 +0800 -Subject: [PATCH 3/5] add kiran-flameshot super key - ---- - src/org.mate.marco.gschema.xml | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/org.mate.marco.gschema.xml b/src/org.mate.marco.gschema.xml -index 5716af3..57c286a 100644 ---- a/src/org.mate.marco.gschema.xml -+++ b/src/org.mate.marco.gschema.xml -@@ -618,7 +618,7 @@ - The format looks like "<Control>a" or "<Shift><Alt>F1". The parser is fairly liberal and allows lower or upper case, and also abbreviations such as "<Ctl>" and "<Ctrl>". If you set the option to the special string "disabled", then there will be no keybinding for this action. - - -- 'Print' -+ '<Control><Alt>A' - Take a screenshot - The format looks like "<Control>a" or "<Shift><Alt>F1". The parser is fairly liberal and allows lower or upper case, and also abbreviations such as "<Ctl>" and "<Ctrl>". If you set the option to the special string "disabled", then there will be no keybinding for this action. - -@@ -701,12 +701,12 @@ - The /apps/marco/global_keybindings/run_command_N keys define keybindings that correspond to these commands. Pressing the keybinding for run_command_N will execute command_N. - - -- 'mate-screenshot' -+ 'kiran-flameshot gui' - The screenshot command - The /apps/marco/global_keybindings/run_command_screenshot key defines a keybinding which causes the command specified by this setting to be invoked. - - -- 'mate-screenshot --window' -+ 'kiranflameshot screen' - The window screenshot command - The /apps/marco/global_keybindings/run_command_window_screenshot key defines a keybinding which causes the command specified by this setting to be invoked. - --- -2.27.0 - diff --git a/marco.spec b/marco.spec index b0ddf2bd0599f94b2a5ce2a2e7a631ca740cc770..90bec323f0680084457269293c79cc98a75e6784 100644 --- a/marco.spec +++ b/marco.spec @@ -32,7 +32,6 @@ URL: http://mate-desktop.org Patch0: 0000-change-workspace-titlebar-and-font-and-composite-49944cb7.patch Patch1: 0001-fix-disabled-Alt-F1-to-popop-mate-menu-b638cc7c.patch Patch2: 0002-feature-menu-pop-up-start-menu-when-press-super-key-bf212ac7.patch -Patch3: 0003-add-kiran-flameshot-super-key-ce015032.patch BuildRequires: desktop-file-utils BuildRequires: gtk3-devel @@ -154,7 +153,6 @@ desktop-file-install \ - KYOS-F: changed number of workspace to 2; set marco compositor to 0; changed title-bar font to 'Noto Sans CJK SC Regular' - KYOS-F: fix: disabled Alt+F1 to popop mate menu Related #28275 - KYOS-F: pop up start menu when press super key, Related #28467 -- KYOS-F: Change the mate-screenshot shortcut key to kiran-flameshot shortcut key, Related #29575 * Thu Mar 24 2022 caodongxia - 1.22.3-3 - restore else branch release