From acb4bf44a65994922e08517fc4d83d596f597faf Mon Sep 17 00:00:00 2001 From: xzyangha <1430552949@qq.com> Date: Mon, 24 May 2021 14:35:33 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=B8=80=E4=B8=AApatch?= =?UTF-8?q?=20=E4=BF=AE=E6=94=B9mate-panel-deleate=20=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mate-panel.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mate-panel.spec b/mate-panel.spec index d60be4e..b67ef4e 100644 --- a/mate-panel.spec +++ b/mate-panel.spec @@ -15,7 +15,7 @@ Name: mate-panel Version: %{branch}.2 %if 0%{?rel_build} -Release: 4%{?dist} +Release: 5%{?dist} %else Release: 0.10%{?git_rel}%{?dist} %endif @@ -39,6 +39,7 @@ Source4: background.png Patch1: mate-panel_0001-struts-Create-struts-for-panels-on-inside-edges-of-m.patch Patch2: mate-panel_0002-struts-Use-inside-edge-panels-only-on-Marco-and-Meta.patch Patch3: 0001-change-panel-background.patch +Patch4: mate-panel-delete-shutdown-action.patch Requires: %{name}-libs%{?_isa} = %{version}-%{release} #for fish From 677773a6247f3615b8c97f27a4f646e66852efb8 Mon Sep 17 00:00:00 2001 From: xzyangha <1430552949@qq.com> Date: Mon, 24 May 2021 14:38:37 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9mate-panel-deleate=20?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mate-panel.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mate-panel.spec b/mate-panel.spec index b67ef4e..d34e8d0 100644 --- a/mate-panel.spec +++ b/mate-panel.spec @@ -168,6 +168,9 @@ install -D -m 0644 %{SOURCE4} %{buildroot}%{_datadir}/mate-panel/background.png %changelog +* Mon May 24 2021 xianzhao Yang - 1.22.2-5 +- update to 1.22.2 + * Tue Dec 31 2019 Wolfgang Ulbrich - 1.22.2-2 - change Source3 - update to 1.22.2 From 8c6ceec38f0a9e5f692159b842d1fe8e3cf75b64 Mon Sep 17 00:00:00 2001 From: xzyangha <1430552949@qq.com> Date: Mon, 24 May 2021 15:03:15 +0800 Subject: [PATCH 3/3] modify contest --- mate-panel-delete-shutdown-action.patch | 24 ------------------------ mate-panel.spec | 4 ---- 2 files changed, 28 deletions(-) delete mode 100644 mate-panel-delete-shutdown-action.patch diff --git a/mate-panel-delete-shutdown-action.patch b/mate-panel-delete-shutdown-action.patch deleted file mode 100644 index 7538086..0000000 --- a/mate-panel-delete-shutdown-action.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -Naur mate-panel-bak/mate-panel/panel-menu-items.c mate-panel-1.22.2/mate-panel/panel-menu-items.c ---- mate-panel-bak/mate-panel/panel-menu-items.c 2020-04-09 12:20:30.480838558 +0800 -+++ mate-panel-1.22.2/mate-panel/panel-menu-items.c 2020-04-09 13:04:21.475963657 +0800 -@@ -1644,13 +1644,13 @@ - gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); - } - -- item = panel_menu_items_create_action_item (PANEL_ACTION_SHUTDOWN); -- if (item != NULL) { -- if (!separator_inserted) -- add_menu_separator (menu); -- -- gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); -- } -+// item = panel_menu_items_create_action_item (PANEL_ACTION_SHUTDOWN); -+// if (item != NULL) { -+// if (!separator_inserted) -+// add_menu_separator (menu); -+// -+// gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); -+// } - } - - void diff --git a/mate-panel.spec b/mate-panel.spec index d34e8d0..8ba3241 100644 --- a/mate-panel.spec +++ b/mate-panel.spec @@ -39,7 +39,6 @@ Source4: background.png Patch1: mate-panel_0001-struts-Create-struts-for-panels-on-inside-edges-of-m.patch Patch2: mate-panel_0002-struts-Use-inside-edge-panels-only-on-Marco-and-Meta.patch Patch3: 0001-change-panel-background.patch -Patch4: mate-panel-delete-shutdown-action.patch Requires: %{name}-libs%{?_isa} = %{version}-%{release} #for fish @@ -168,9 +167,6 @@ install -D -m 0644 %{SOURCE4} %{buildroot}%{_datadir}/mate-panel/background.png %changelog -* Mon May 24 2021 xianzhao Yang - 1.22.2-5 -- update to 1.22.2 - * Tue Dec 31 2019 Wolfgang Ulbrich - 1.22.2-2 - change Source3 - update to 1.22.2