Removing 01-Fix-crash-with-invalid-Name-tag-in-a-menu.patch and 02-Fix-potential...
authorAndriy Grytsenko <andrej@rep.kiev.ua>
Fri, 3 Nov 2017 21:52:44 +0000 (23:52 +0200)
committerAndriy Grytsenko <andrej@rep.kiev.ua>
Fri, 3 Nov 2017 21:52:44 +0000 (23:52 +0200)
debian/patches/01-Fix-crash-with-invalid-Name-tag-in-a-menu.patch [deleted file]
debian/patches/02-Fix-potential-access-violation.patch [deleted file]
debian/patches/series [deleted file]

diff --git a/debian/patches/01-Fix-crash-with-invalid-Name-tag-in-a-menu.patch b/debian/patches/01-Fix-crash-with-invalid-Name-tag-in-a-menu.patch
deleted file mode 100644 (file)
index ecacd0e..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-Author: Andriy Grytsenko <andrej@rep.kiev.ua>
-Description: Fix crash with invalid <Name> tag in a menu. (Closes: #849356, #851748)
-Bug: https://sourceforge.net/p/lxde/bugs/863
-Applied-Upstream: 54ab9e45764435634cdf5de360b295ee3a22817a
-
---- a/menu-cache-gen/menu-merge.c
-+++ b/menu-cache-gen/menu-merge.c
-@@ -1,7 +1,7 @@
- /*
-  *      menu-file.c : parses <name>.menu file and merges all XML tags.
-  *
-- *      Copyright 2013-2016 Andriy Grytsenko (LStranger) <andrej@rep.kiev.ua>
-+ *      Copyright 2013-2017 Andriy Grytsenko (LStranger) <andrej@rep.kiev.ua>
-  *
-  *      This file is a part of libmenu-cache package and created program
-  *      should be not used without the library.
-@@ -138,11 +138,13 @@ static gboolean _menu_xml_handler_Name(FmXmlFileItem *item, GList *children,
-                                        guint n_attributes, gint line, gint pos,
-                                        GError **error, gpointer user_data)
- {
-+    FmXmlFileItem *name_item;
-     const char *name;
-     RETURN_IF_IN_LAYOUT(item, error);
--    item = fm_xml_file_item_find_child(item, FM_XML_FILE_TEXT);
--    if (item == NULL || (name = fm_xml_file_item_get_data(item, NULL)) == NULL ||
-+    name_item = fm_xml_file_item_find_child(item, FM_XML_FILE_TEXT);
-+    if (name_item == NULL ||
-+        (name = fm_xml_file_item_get_data(name_item, NULL)) == NULL ||
-         strchr(name, '/') != NULL) /* empty or invalid tag */
-     {
-         RETURN_TRUE_AND_DESTROY_IF_QUIET(item);
diff --git a/debian/patches/02-Fix-potential-access-violation.patch b/debian/patches/02-Fix-potential-access-violation.patch
deleted file mode 100644 (file)
index 3699547..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-Author: Andriy Grytsenko <andrej@rep.kiev.ua>
-Description: Fix potential access violation, use runtime user dir instead of tmp dir. (Closes: #862570)
-Applied-Upstream: 56f66684592abf257c4004e6e1fff041c64a12ce
-
---- a/libmenu-cache/menu-cache.c
-+++ b/libmenu-cache/menu-cache.c
-@@ -1538,8 +1538,13 @@ static void get_socket_name( char* buf, int len )
-         if(*p)
-             *p = '\0';
-     }
-+#if GLIB_CHECK_VERSION(2, 28, 0)
-+    g_snprintf( buf, len, "%s/menu-cached-%s", g_get_user_runtime_dir(),
-+                dpy ? dpy : ":0" );
-+#else
-     g_snprintf( buf, len, "%s/.menu-cached-%s-%s", g_get_tmp_dir(),
-                 dpy ? dpy : ":0", g_get_user_name() );
-+#endif
-     g_free(dpy);
- }
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644 (file)
index 9fb38a3..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-01-Fix-crash-with-invalid-Name-tag-in-a-menu.patch
-02-Fix-potential-access-violation.patch