packages/marco
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!11 Remove some patches

Browse Source 
From: @longcheng01 
Reviewed-by: @tangjie02 
Signed-off-by: @tangjie02
This commit is contained in:
openeuler-ci-bot 2022-08-05 07:11:18 +00:00 committed by Gitee
commit e114118cfc
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
3 changed files with 0 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
0004-fix-keybinding-modify-error-of-window-screen-keybind-1d9b4797.patch
View File

@ -1,25 +0,0 @@
From 1d9b4797a9b6c29ab6e31aba6bf36132e2b95167 Mon Sep 17 00:00:00 2001
From: longcheng <longcheng@kylinos.com.cn>
Date: Thu, 24 Mar 2022 19:01:50 +0800
Subject: [PATCH 4/5] fix(keybinding): modify error of window screen keybinding
---
src/org.mate.marco.gschema.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/org.mate.marco.gschema.xml b/src/org.mate.marco.gschema.xml
index 57c286a..6b58b89 100644
--- a/src/org.mate.marco.gschema.xml
+++ b/src/org.mate.marco.gschema.xml
@@ -706,7 +706,7 @@
<description>The /apps/marco/global_keybindings/run_command_screenshot key defines a keybinding which causes the command specified by this setting to be invoked.</description>
</key>
<key name="command-window-screenshot" type="s">
- <default>'kiranflameshot screen'</default>
+ <default>'kiran-flameshot gui'</default>
<summary>The window screenshot command</summary>
<description>The /apps/marco/global_keybindings/run_command_window_screenshot key defines a keybinding which causes the command specified by this setting to be invoked.</description>
</key>
--
2.27.0

27
0005-fix-keybinding-Hide-screenshort-keybinding-545f9e60.patch
View File

@ -1,27 +0,0 @@
From 545f9e60becbd385de61825d04bd1a96962ff48f Mon Sep 17 00:00:00 2001
From: longcheng <longcheng@kylinos.com.cn>
Date: Thu, 24 Mar 2022 19:02:49 +0800
Subject: [PATCH 5/5] fix(keybinding): Hide screenshort keybinding
---
src/50-marco-desktop-key.xml.in | 4 ----
1 file changed, 4 deletions(-)
diff --git a/src/50-marco-desktop-key.xml.in b/src/50-marco-desktop-key.xml.in
index 1719291..d5c7637 100644
--- a/src/50-marco-desktop-key.xml.in
+++ b/src/50-marco-desktop-key.xml.in
@@ -7,10 +7,6 @@
<KeyListEntry name="panel-kiran-menu" _description="Show the panel's main menu of kiran" />
- <KeyListEntry name="run-command-screenshot" _description="Take a screenshot" />
-
- <KeyListEntry name="run-command-window-screenshot" _description="Take a screenshot of a window" />
-
<KeyListEntry name="run-command-terminal" _description="Run a terminal" />
<KeyListEntry name="rename-workspace" _description="Rename current workspace" />
--
2.27.0

4
marco.spec
View File

@ -33,8 +33,6 @@ 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
Patch4: 0004-fix-keybinding-modify-error-of-window-screen-keybind-1d9b4797.patch
Patch5: 0005-fix-keybinding-Hide-screenshort-keybinding-545f9e60.patch
BuildRequires: desktop-file-utils
BuildRequires: gtk3-devel
@ -157,8 +155,6 @@ desktop-file-install \
- 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
- KYOS-F: modify error of window screen keybinding, Related #41989
- KYOS-F: Hide screenshort keybindings. (#49931)
* Thu Mar 24 2022 caodongxia <caodongxia@huawei.com> - 1.22.3-3
- restore else branch release