[gentoo-commits] gentoo-x86 commit in x11-wm/fluxbox/files: fluxbox-1.3.0-osx-has-otool.patch

[Jim Ramsay (lack)]

lack        11/02/22 13:22:55

  Added:                fluxbox-1.3.0-osx-has-otool.patch
  Log:
  Fluxbox 1.3.0 is released!  (Bug #355643)
  
  (Portage version: 2.1.9.34/cvs/Linux i686)

Revision  Changes    Path
1.1                  x11-wm/fluxbox/files/fluxbox-1.3.0-osx-has-otool.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/fluxbox/files/fluxbox-1.3.0-osx-has-otool.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/fluxbox/files/fluxbox-1.3.0-osx-has-otool.patch?rev=1.1&content-type=text/plain

Index: fluxbox-1.3.0-osx-has-otool.patch
===================================================================
--- 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