[packages/mate-panel] no-xdg-menu-prefix patch seems to be no longer necessary

atler atler at pld-linux.org
Tue Mar 19 19:29:40 CET 2019


commit c9e2abc63471b1348eec8e9b056e3a07f1fb8d63
Author: Jan Palus <atler at pld-linux.org>
Date:   Tue Mar 19 19:29:11 2019 +0100

    no-xdg-menu-prefix patch seems to be no longer necessary

 mate-panel.spec          |  2 --
 no-xdg-menu-prefix.patch | 64 ------------------------------------------------
 2 files changed, 66 deletions(-)
---
diff --git a/mate-panel.spec b/mate-panel.spec
index 37aa4c0..2b40d0d 100644
--- a/mate-panel.spec
+++ b/mate-panel.spec
@@ -11,7 +11,6 @@ License:	LGPL v2+ (library), GPL v2+ (applets)
 Group:		X11/Applications
 Source0:	http://pub.mate-desktop.org/releases/1.22/%{name}-%{version}.tar.xz
 # Source0-md5:	82f99551476bff08dca6140e52de10c2
-Patch0:		no-xdg-menu-prefix.patch
 URL:		http://wiki.mate-desktop.org/mate-panel
 BuildRequires:	NetworkManager-devel >= 0.6
 BuildRequires:	autoconf >= 2.53
@@ -126,7 +125,6 @@ Dokumentacja API biblioteki libmate-panel-applet.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 %{__libtoolize}
diff --git a/no-xdg-menu-prefix.patch b/no-xdg-menu-prefix.patch
deleted file mode 100644
index b5fa89c..0000000
--- a/no-xdg-menu-prefix.patch
+++ /dev/null
@@ -1,64 +0,0 @@
---- mate-panel-1.5.3/./mate-panel/panel-menu-bar.c~	2012-12-20 00:48:49.000000000 +0200
-+++ mate-panel-1.5.3/./mate-panel/panel-menu-bar.c	2013-01-16 12:07:54.282974605 +0200
-@@ -116,7 +116,7 @@
- 	menubar->priv->info = NULL;
- 
- 
--	menubar->priv->applications_menu = create_applications_menu("mate-applications.menu", NULL, TRUE);
-+	menubar->priv->applications_menu = create_applications_menu("applications.menu", NULL, TRUE);
- 
- 	menubar->priv->applications_item = panel_image_menu_item_new();
- 	gtk_menu_item_set_label(GTK_MENU_ITEM(menubar->priv->applications_item), _("Applications"));
---- mate-panel-1.5.3/./mate-panel/menu.c~	2012-12-20 00:48:49.000000000 +0200
-+++ mate-panel-1.5.3/./mate-panel/menu.c	2013-01-16 12:08:04.950133393 +0200
-@@ -1793,7 +1793,7 @@
- {
- 	GtkWidget* main_menu;
- 
--	main_menu = create_applications_menu("mate-applications.menu", NULL, TRUE);
-+	main_menu = create_applications_menu("applications.menu", NULL, TRUE);
- 
- 	g_object_set_data(G_OBJECT(main_menu), "menu_panel", panel);
- 	/* FIXME need to update the panel on parent_set */
---- mate-panel-1.5.3/./mate-panel/panel-menu-button.c~	2012-12-20 00:48:49.000000000 +0200
-+++ mate-panel-1.5.3/./mate-panel/panel-menu-button.c	2013-01-16 12:08:17.590716557 +0200
-@@ -77,7 +77,7 @@
- } MenuPathRootItem;
- 
- static MenuPathRootItem root_items[] = {
--	{APPLICATIONS_MENU, "mate-applications", "mate-applications.menu"},
-+	{APPLICATIONS_MENU, "applications", "applications.menu"},
- 	{SETTINGS_MENU, "mate-settings", "mate-settings.menu"}
- };
- 
---- mate-panel-1.22.0/mate-panel/panel-addto.c.orig	2019-03-18 23:53:11.196726003 +0100
-+++ mate-panel-1.22.0/mate-panel/panel-addto.c	2019-03-18 23:54:51.086061909 +0100
-@@ -677,7 +677,7 @@
- 
- 	store = gtk_tree_store_new(NUMBER_COLUMNS, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_POINTER, G_TYPE_STRING);
- 
--	tree = matemenu_tree_new ("mate-applications.menu", MATEMENU_TREE_FLAGS_SORT_DISPLAY_NAME);
-+	tree = matemenu_tree_new ("applications.menu", MATEMENU_TREE_FLAGS_SORT_DISPLAY_NAME);
- 	if (! matemenu_tree_load_sync (tree, &error)) {
- 		g_warning("Applications menu tree loading got error:%s\n", error->message);
- 		g_error_free(error);
-@@ -686,7 +686,7 @@
- 
- 	if ((root = matemenu_tree_get_root_directory (tree)) != NULL )
- 	{
--		panel_addto_make_application_list(&dialog->application_list, root, "mate-applications.menu");
-+		panel_addto_make_application_list(&dialog->application_list, root, "applications.menu");
- 		panel_addto_populate_application_model(store, NULL, dialog->application_list);
- 
- 		matemenu_tree_item_unref(root);
---- mate-panel-1.22.0/mate-panel/panel-run-dialog.c.orig	2019-03-18 23:53:11.196726003 +0100
-+++ mate-panel-1.22.0/mate-panel/panel-run-dialog.c	2019-03-18 23:55:51.322327695 +0100
-@@ -836,7 +836,7 @@
- 	GError        *error = NULL;
- 	GSList* retval;
- 
--	tree = matemenu_tree_new ("mate-applications.menu", MATEMENU_TREE_FLAGS_SORT_DISPLAY_NAME);
-+	tree = matemenu_tree_new ("applications.menu", MATEMENU_TREE_FLAGS_SORT_DISPLAY_NAME);
- 	if (!matemenu_tree_load_sync (tree, &error)) {
- 		g_printerr ("Failed to load tree: %s\n", error->message);
- 		g_error_free(error);
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/mate-panel.git/commitdiff/c9e2abc63471b1348eec8e9b056e3a07f1fb8d63



More information about the pld-cvs-commit mailing list