Archives
Archives
| From: | "Jim Ramsay (lack)" <lack@g.o> |
|---|---|
| To: | gentoo-commits@l.g.o |
| Subject: | [gentoo-commits] gentoo-x86 commit in x11-wm/fluxbox/files: osx-has-otool.patch fluxbox-1.3.0-osx-has-otool.patch fluxbox-1.1.1-osx-has-otool.patch |
| Date: | Mon, 28 Feb 2011 00:32:41 |
| Message-Id: | 20110228003230.AE2DE20054@flycatcher.gentoo.org |
| 1 | lack 11/02/28 00:32:30 |
| 2 | |
| 3 | Added: osx-has-otool.patch |
| 4 | Removed: fluxbox-1.3.0-osx-has-otool.patch |
| 5 | fluxbox-1.1.1-osx-has-otool.patch |
| 6 | Log: |
| 7 | Fluxbox-1.3.1 is released. Plus cleanup of a prefix patch for osx (Bug #355177) |
| 8 | |
| 9 | (Portage version: 2.1.9.34/cvs/Linux i686) |
| 10 | |
| 11 | Revision Changes Path |
| 12 | 1.1 x11-wm/fluxbox/files/osx-has-otool.patch |
| 13 | |
| 14 | file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/fluxbox/files/osx-has-otool.patch?rev=1.1&view=markup |
| 15 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/fluxbox/files/osx-has-otool.patch?rev=1.1&content-type=text/plain |
| 16 | |
| 17 | Index: osx-has-otool.patch |
| 18 | =================================================================== |
| 19 | --- util/fbsetbg |
| 20 | +++ util/fbsetbg |
| 21 | @@ -356,7 +356,8 @@ |
| 22 | if [ ! "$wpsetter" = Esetroot ]; then |
| 23 | WPSETTER=$wpsetter |
| 24 | break |
| 25 | - elif ldd `which Esetroot`|grep libImlib 2>&1 > /dev/null; then |
| 26 | + elif ldd `which Esetroot`|grep libImlib 2>&1 > /dev/null || \ |
| 27 | + otool -L `which Esetroot`|grep libImlib 2>&1 > /dev/null; then |
| 28 | WPSETTER=$wpsetter |
| 29 | break |
| 30 | else |