[Pkg-wmaker-commits] [wmaker] 01/02: New patch from upstream git; reference proplist menus in WMRootMenu.

[Doug Torrance]

This is an automated email from the git hooks/post-receive script.

dtorrance-guest pushed a commit to branch master
in repository wmaker.

commit 5859f919a16e248972b42f2096f4439cf13a01e1
Author: Doug Torrance <dtorrance at piedmont.edu>
Date:   Sun Aug 13 09:10:45 2017 -0400

    New patch from upstream git; reference proplist menus in WMRootMenu.
---
 debian/patches/12_reference-proplist-menus.patch | 30 ++++++++++++++++++++++++
 debian/patches/series                            |  1 +
 2 files changed, 31 insertions(+)

diff --git a/debian/patches/12_reference-proplist-menus.patch b/debian/patches/12_reference-proplist-menus.patch
new file mode 100644
index 0000000..7d56cd1
--- /dev/null
+++ b/debian/patches/12_reference-proplist-menus.patch
@@ -0,0 +1,30 @@
+Description: Reference proplist menu files in WMRootMenu
+Origin: http://repo.or.cz/wmaker-crm.git/commitdiff/b07075a
+Last-Update: 2017-08-13
+
+--- a/src/rootmenu.c
++++ b/src/rootmenu.c
+@@ -1505,6 +1505,7 @@
+ 		if (!scr->root_menu || stat_buf.st_mtime > scr->root_menu->timestamp
+ 		    /* if the pointer in WMRootMenu has changed */
+ 		    || w_global.domain.root_menu->timestamp > scr->root_menu->timestamp) {
++			WMPropList *menu_from_file = NULL;
+ 
+ 			if (menu_is_default) {
+ 				wwarning(_
+@@ -1512,7 +1513,14 @@
+ 					 path);
+ 			}
+ 
+-			menu = readMenuFile(scr, path);
++			menu_from_file = WMReadPropListFromFile(path);
++			if (menu_from_file == NULL) { /* old style menu */
++				menu = readMenuFile(scr, path);
++			} else {
++				menu = configureMenu(scr, menu_from_file);
++				WMReleasePropList(menu_from_file);
++			}
++
+ 			if (menu)
+ 				menu->timestamp = WMAX(stat_buf.st_mtime, w_global.domain.root_menu->timestamp);
+ 		} else {
diff --git a/debian/patches/series b/debian/patches/series
index b43c247..6e5093d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,5 @@
 10_util-fix-parsing-of-XDG-menus-with-multiple-groups.patch
 11_XDG-menu-categories.patch
+12_reference-proplist-menus.patch
 53_Debian_WMState.diff
 54_Debian_wmmacros.diff

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmaker.git