Gentoo Archives: gentoo-commits

From: Mikle Kolyada <zlogene@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-wm/fluxbox/files/
Date: Thu, 22 Mar 2018 20:16:49
Message-Id: 1521749802.4fd3c6c8751d9cdba627af3cf5191782acd18c58.zlogene@gentoo
1 commit: 4fd3c6c8751d9cdba627af3cf5191782acd18c58
2 Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Wed Mar 14 14:23:41 2018 +0000
4 Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
5 CommitDate: Thu Mar 22 20:16:42 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4fd3c6c8
7
8 x11-wm/fluxbox: remove unused patch
9
10 Closes: https://github.com/gentoo/gentoo/pull/7459
11
12 .../files/1.3.5-generate_menu-printf-fix.patch | 22 ----------------------
13 1 file changed, 22 deletions(-)
14
15 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
16 deleted file mode 100644
17 index f9246f15907..00000000000
18 --- a/x11-wm/fluxbox/files/1.3.5-generate_menu-printf-fix.patch
19 +++ /dev/null
20 @@ -1,22 +0,0 @@
21 -https://github.com/fluxbox/fluxbox/commit/fc245408d6975d0813cd4440e7089d987b54d42e
22 -diff --git a/util/fluxbox-generate_menu.in b/util/fluxbox-generate_menu.in
23 -index 525315c..33b0153 100755
24 ---- a/util/fluxbox-generate_menu.in
25 -+++ b/util/fluxbox-generate_menu.in
26 -@@ -330,13 +330,13 @@ searchForIcon(){
27 - # echo "^.${entry_exec}.[[:space:]]*<.*/${icon_base}\....>"
28 - if [ -f "$entry_icon" ]; then
29 - # if icon exists and entry does not already exists, add it
30 -- if ! grep -q -m 1 "^.${entry_exec}.[[:space:]]*<.*/${icon_base}\....>" $ICONMAPPING 2> /dev/null; then
31 -- printf "\"${entry_exec}\" \t <${entry_icon}>\n" >> $ICONMAPPING
32 -+ if ! grep -q -m 1 "^.${execname}.[[:space:]]*<.*/${icon_base}\....>" $ICONMAPPING 2> /dev/null; then
33 -+ printf "\"${execname}\" \t <${entry_icon}>\n" >> $ICONMAPPING
34 - else
35 -- : echo "# mapping already exists for ${entry_exec}" >> $ICONMAPPING
36 -+ : echo "# mapping already exists for ${execname}" >> $ICONMAPPING
37 - fi
38 - else
39 -- echo "# No icon file found for $entry_exec" >> $ICONMAPPING
40 -+ echo "# No icon file found for $execname" >> $ICONMAPPING
41 - fi
42 - }