[gentoo-commits] gentoo-x86 commit in x11-wm/fluxbox/files: 1.3.5-generate_menu-printf-fix.patch

[gentoo-commits] gentoo-x86 commit in x11-wm/fluxbox/files: 1.3.5-generate_menu-printf-fix.patch

[Ian Delaney (idella4)]

idella4     15/01/24 03:11:20

  Added:                1.3.5-generate_menu-printf-fix.patch
  Log:
  revbump; Add patch prepared by proxy maintainer, D. Campbell, from bug #536370 addressing format issue in icon paths, fixes said Bug
  
  (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 0xB8072B0D)

Revision  Changes    Path
1.1                  x11-wm/fluxbox/files/1.3.5-generate_menu-printf-fix.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/fluxbox/files/1.3.5-generate_menu-printf-fix.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/fluxbox/files/1.3.5-generate_menu-printf-fix.patch?rev=1.1&content-type=text/plain

Index: 1.3.5-generate_menu-printf-fix.patch
===================================================================
--- fluxbox-1.3.6/util/fluxbox-generate_menu.in	2015-01-15 13:35:50.223367998 -0800
+++ fluxbox-1.3.6-copy/util/fluxbox-generate_menu.in	2015-01-15 13:38:21.789755711 -0800
@@ -331,7 +331,7 @@
     if [ -f "$entry_icon" ]; then
     # if icon exists and entry does not already exists, add it
         if ! grep -q -m 1 "^.${entry_exec}.[[:space:]]*<.*/${icon_base}\....>" $ICONMAPPING 2> /dev/null; then
-            printf "\"${entry_exec}\" \t <${entry_icon}>\n" >> $ICONMAPPING
+            printf "\"${execname}\" \t <${entry_icon}>\n" >> $ICONMAPPING
         else 
             : echo "#    mapping already exists for ${entry_exec}" >> $ICONMAPPING
         fi

[gentoo-commits] gentoo-x86 commit in x11-wm/fluxbox/files: 1.3.5-generate_menu-printf-fix.patch

[Ian Delaney (idella4)]

idella4     15/01/26 12:31:03

  Modified:             1.3.5-generate_menu-printf-fix.patch
  Log:
  update patch with final form from upstream, add missed addition from bug 537356 to -1.3.5-r1, full update to live ebuild from patch from same bug, remove broken 1.3.6 ebuild, fixes Bugs 537356, 536370 by maintainers
  
  (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 0xB8072B0D)

Revision  Changes    Path
1.2                  x11-wm/fluxbox/files/1.3.5-generate_menu-printf-fix.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/fluxbox/files/1.3.5-generate_menu-printf-fix.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/fluxbox/files/1.3.5-generate_menu-printf-fix.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/fluxbox/files/1.3.5-generate_menu-printf-fix.patch?r1=1.1&r2=1.2

Index: 1.3.5-generate_menu-printf-fix.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/files/1.3.5-generate_menu-printf-fix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 1.3.5-generate_menu-printf-fix.patch	24 Jan 2015 03:11:20 -0000	1.1
+++ 1.3.5-generate_menu-printf-fix.patch	26 Jan 2015 12:31:03 -0000	1.2
@@ -1,12 +1,22 @@
---- fluxbox-1.3.6/util/fluxbox-generate_menu.in	2015-01-15 13:35:50.223367998 -0800
-+++ fluxbox-1.3.6-copy/util/fluxbox-generate_menu.in	2015-01-15 13:38:21.789755711 -0800
-@@ -331,7 +331,7 @@
+https://github.com/fluxbox/fluxbox/commit/fc245408d6975d0813cd4440e7089d987b54d42e
+diff --git a/util/fluxbox-generate_menu.in b/util/fluxbox-generate_menu.in
+index 525315c..33b0153 100755
+--- a/util/fluxbox-generate_menu.in
++++ b/util/fluxbox-generate_menu.in
+@@ -330,13 +330,13 @@ searchForIcon(){
+     # echo "^.${entry_exec}.[[:space:]]*<.*/${icon_base}\....>" 
      if [ -f "$entry_icon" ]; then
      # if icon exists and entry does not already exists, add it
-         if ! grep -q -m 1 "^.${entry_exec}.[[:space:]]*<.*/${icon_base}\....>" $ICONMAPPING 2> /dev/null; then
+-        if ! grep -q -m 1 "^.${entry_exec}.[[:space:]]*<.*/${icon_base}\....>" $ICONMAPPING 2> /dev/null; then
 -            printf "\"${entry_exec}\" \t <${entry_icon}>\n" >> $ICONMAPPING
++        if ! grep -q -m 1 "^.${execname}.[[:space:]]*<.*/${icon_base}\....>" $ICONMAPPING 2> /dev/null; then
 +            printf "\"${execname}\" \t <${entry_icon}>\n" >> $ICONMAPPING
          else 
-             : echo "#    mapping already exists for ${entry_exec}" >> $ICONMAPPING
+-            : echo "#    mapping already exists for ${entry_exec}" >> $ICONMAPPING
++            : echo "#    mapping already exists for ${execname}" >> $ICONMAPPING
          fi
-
+     else
+-        echo "# No icon file found for $entry_exec" >> $ICONMAPPING
++        echo "# No icon file found for $execname" >> $ICONMAPPING
+     fi
+ }