[packages/mate-menus] xdg-menu-prefix-compat seems to be no longer necessary

[atler]

commit 865a34d4095f5b12c72d97f1d26cc731237ac685
Author: Jan Palus <atler at pld-linux.org>
Date:   Tue Mar 19 19:26:05 2019 +0100

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

 mate-menus.spec              |  2 --
 xdg-menu-prefix-compat.patch | 63 --------------------------------------------
 2 files changed, 65 deletions(-)
---
diff --git a/mate-menus.spec b/mate-menus.spec
index b03376e..c279c29 100644
--- a/mate-menus.spec
+++ b/mate-menus.spec
@@ -8,7 +8,6 @@ License:	LGPL v2+
 Group:		X11/Applications
 Source0:	http://pub.mate-desktop.org/releases/1.22/%{name}-%{version}.tar.xz
 # Source0-md5:	8210063cf56ea7b6a9ac3411507ee0a4
-Patch0:		xdg-menu-prefix-compat.patch
 URL:		http://wiki.mate-desktop.org/mate-menus
 BuildRequires:	autoconf >= 2.62
 BuildRequires:	automake >= 1:1.9
@@ -58,7 +57,6 @@ Pliki programistyczne biblioteki libmate-menu.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 %{__intltoolize}
diff --git a/xdg-menu-prefix-compat.patch b/xdg-menu-prefix-compat.patch
deleted file mode 100644
index df5c6be..0000000
--- a/xdg-menu-prefix-compat.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-restore XDG_MENU_PREFIX functionality
-
-23:19:05  glen> hmm, xdg menus does not seem to work
-23:19:07  glen> i mean $XDG_MENU_PREFIX
-23:19:09  glen> is not respected
-23:19:51  glen> 23:19:38 root[load: 3.16]@blodnatt xdg/menus# ls -l /etc/xdg/menus/${XDG_MENU_PREFIX}applications.menu
-23:19:51  glen> -rw-r--r-- 1 root root 23K 18. mai    2012 /etc/xdg/menus/applnk-applications.menu
-
-seems perberos just renamed the file not to conflict file installed by GNOME
-
-additionally load mate-applications.menu if XDG_MENU_PREFIX is not set, as this
-is how we package mate applications.menu.
---- mate-menus-1.5.0/./libmenu/matemenu-tree.c~	2012-10-11 11:26:03.000000000 +0300
-+++ mate-menus-1.5.0/./libmenu/matemenu-tree.c	2013-01-15 23:41:33.733159313 +0200
-@@ -1895,7 +1895,7 @@
- 	found = FALSE;
- 	menu_file = g_strconcat(menu_name, ".menu", NULL);
- 
--	if (strcmp(menu_file, "mate-applications.menu") == 0 && g_getenv("XDG_MENU_PREFIX"))
-+	if (strcmp(menu_file, "applications.menu") == 0 && g_getenv("XDG_MENU_PREFIX"))
- 	{
- 		char* prefixed_basename;
- 		prefixed_basename = g_strdup_printf("%s%s", g_getenv("XDG_MENU_PREFIX"), menu_file);
---- mate-menus-1.22.0/util/test-menu-spec.c.orig	2019-03-18 20:37:19.227541031 +0100
-+++ mate-menus-1.22.0/util/test-menu-spec.c	2019-03-18 20:38:44.433638632 +0100
-@@ -216,7 +216,7 @@
- 	if (include_unallocated)
- 		flags |= MATEMENU_TREE_FLAGS_INCLUDE_UNALLOCATED;
- 
--	tree = matemenu_tree_new(menu_file ? menu_file : "mate-applications.menu", flags);
-+	tree = matemenu_tree_new(menu_file ? menu_file : "applications.menu", flags);
- 	g_assert(tree != NULL);
- 
- 	if (!matemenu_tree_load_sync (tree, &error))
---- mate-menus-1.5.0/util/mate-menus-ls.py~	2012-10-11 11:26:03.000000000 +0300
-+++ mate-menus-1.5.0/util/mate-menus-ls.py	2013-01-15 23:37:38.595663893 +0200
-@@ -72,7 +72,7 @@
-     if options.file:
-         menu_file = options.file
-     else:
--        menu_file = 'mate-applications.menu'
-+        menu_file = 'applications.menu'
- 
-     flags = matemenu.FLAGS_NONE
-     if options.exclude:
---- mate-menus-1.5.0/libmenu/matemenu-tree.c~	2013-01-16 11:12:55.000000000 +0200
-+++ mate-menus-1.5.0/libmenu/matemenu-tree.c	2013-01-16 12:36:08.224428926 +0200
-@@ -1903,6 +1903,15 @@
- 		g_free(prefixed_basename);
- 	}
- 
-+	// load mate-applications.menu
-+	if (!found && !g_getenv("XDG_MENU_PREFIX"))
-+	{
-+		char* prefixed_basename;
-+		prefixed_basename = g_strdup_printf("mate-%s", menu_file);
-+		found = load_parent_merge_file_from_basename(tree, loaded_menu_files, layout, prefixed_basename, canonical_basedir);
-+		g_free(prefixed_basename);
-+	}
-+
- 	if (!found)
- 	{
- 		found = load_parent_merge_file_from_basename(tree, loaded_menu_files, layout, menu_file, canonical_basedir);
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/mate-menus.git/commitdiff/865a34d4095f5b12c72d97f1d26cc731237ac685