diff options
| author |   Jim Ramsay <lack@gentoo.org> | 2011-02-28 00:32:30 +0000 |
|---|---|---|
| committer | Jim Ramsay <lack@gentoo.org> | 2011-02-28 00:32:30 +0000 |
| commit | 23b49e7a0d8daf19541e3baedd72782739bb0471 (patch) | |
| tree | 69648e8c442469877eeec1f689dd3c2a6eba900a /x11-wm/fluxbox/files | |
| parent | Unmasked =sci-mathematics/octave-3.4* (diff) | |
| download | historical-23b49e7a0d8daf19541e3baedd72782739bb0471.tar.gz historical-23b49e7a0d8daf19541e3baedd72782739bb0471.tar.bz2 historical-23b49e7a0d8daf19541e3baedd72782739bb0471.zip | |
Fluxbox-1.3.1 is released. Plus cleanup of a prefix patch for osx (Bug #355177)
Package-Manager: portage-2.1.9.34/cvs/Linux i686
Diffstat (limited to 'x11-wm/fluxbox/files')
| -rw-r--r-- | x11-wm/fluxbox/files/fluxbox-1.3.0-osx-has-otool.patch | 14 | ||||
| -rw-r--r-- | x11-wm/fluxbox/files/osx-has-otool.patch (renamed from x11-wm/fluxbox/files/fluxbox-1.1.1-osx-has-otool.patch) | 8 |
2 files changed, 3 insertions, 19 deletions
diff --git a/x11-wm/fluxbox/files/fluxbox-1.3.0-osx-has-otool.patch b/x11-wm/fluxbox/files/fluxbox-1.3.0-osx-has-otool.patch deleted file mode 100644 index 637d2a824669..000000000000 --- a/x11-wm/fluxbox/files/fluxbox-1.3.0-osx-has-otool.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- util/fbsetbg -+++ util/fbsetbg -@@ -356,7 +356,10 @@ - if [ ! "$wpsetter" = Esetroot ]; then - WPSETTER=$wpsetter - break -- elif ldd `which Esetroot`|grep libImlib 2>&1 > /dev/null; then -+ elif ( [[ `type -t otool` == file ]] \ -+ && otool -L `which Esetroot`|grep libImlib 2>&1 > /dev/null ) \ -+ || ( [[ `type -t ldd` == file ]] \ -+ && ldd `which Esetroot`|grep libImlib 2>&1 > /dev/null ); then - WPSETTER=$wpsetter - break - else diff --git a/x11-wm/fluxbox/files/fluxbox-1.1.1-osx-has-otool.patch b/x11-wm/fluxbox/files/osx-has-otool.patch index 637d2a824669..7671dd83647c 100644 --- a/x11-wm/fluxbox/files/fluxbox-1.1.1-osx-has-otool.patch +++ b/x11-wm/fluxbox/files/osx-has-otool.patch @@ -1,14 +1,12 @@ --- util/fbsetbg +++ util/fbsetbg -@@ -356,7 +356,10 @@ +@@ -356,7 +356,8 @@ if [ ! "$wpsetter" = Esetroot ]; then WPSETTER=$wpsetter break - elif ldd `which Esetroot`|grep libImlib 2>&1 > /dev/null; then -+ elif ( [[ `type -t otool` == file ]] \ -+ && otool -L `which Esetroot`|grep libImlib 2>&1 > /dev/null ) \ -+ || ( [[ `type -t ldd` == file ]] \ -+ && ldd `which Esetroot`|grep libImlib 2>&1 > /dev/null ); then ++ elif ldd `which Esetroot`|grep libImlib 2>&1 > /dev/null || \ ++ otool -L `which Esetroot`|grep libImlib 2>&1 > /dev/null; then WPSETTER=$wpsetter break else |