diff options
| author |   Ian Delaney <idella4@gentoo.org> | 2015-01-26 12:31:03 +0000 |
|---|---|---|
| committer | Ian Delaney <idella4@gentoo.org> | 2015-01-26 12:31:03 +0000 |
| commit | a86a7f13fe7540cb826ceb27558df5e15cee8783 (patch) | |
| tree | b3974046920f5acda3a5b093beb79d1d6be0193b /x11-wm/fluxbox/files | |
| parent | Version bump, drop old (diff) | |
| download | gentoo-2-a86a7f13fe7540cb826ceb27558df5e15cee8783.tar.gz gentoo-2-a86a7f13fe7540cb826ceb27558df5e15cee8783.tar.bz2 gentoo-2-a86a7f13fe7540cb826ceb27558df5e15cee8783.zip | |
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)
Diffstat (limited to 'x11-wm/fluxbox/files')
| -rw-r--r-- | x11-wm/fluxbox/files/1.3.5-generate_menu-printf-fix.patch | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/x11-wm/fluxbox/files/1.3.5-generate_menu-printf-fix.patch b/x11-wm/fluxbox/files/1.3.5-generate_menu-printf-fix.patch index 6804b29102ee..f9246f159076 100644 --- a/x11-wm/fluxbox/files/1.3.5-generate_menu-printf-fix.patch +++ b/x11-wm/fluxbox/files/1.3.5-generate_menu-printf-fix.patch @@ -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 + } |