diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2005-06-03 00:49:17 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2005-06-03 00:49:17 +0000 |
| commit | 5571a2f52a3c4783219eb10da5668010c095a8f4 (patch) | |
| tree | 3a20a166056769493e8332b95dab0e350edc1d24 /media-libs | |
| parent | updating maintainer info in metadata.xml (diff) | |
| download | historical-5571a2f52a3c4783219eb10da5668010c095a8f4.tar.gz historical-5571a2f52a3c4783219eb10da5668010c095a8f4.tar.bz2 historical-5571a2f52a3c4783219eb10da5668010c095a8f4.zip | |
Make sure we search custom lib paths before system paths so broken libs dont screw us #94867 by ferret.
Package-Manager: portage-2.0.51.22-r1
Diffstat (limited to 'media-libs')
| -rw-r--r-- | media-libs/libjsw/ChangeLog | 9 | ||||
| -rw-r--r-- | media-libs/libjsw/Manifest | 5 | ||||
| -rw-r--r-- | media-libs/libjsw/files/libjsw-1.5.5-liborder.patch | 14 | ||||
| -rw-r--r-- | media-libs/libjsw/libjsw-1.5.5.ebuild | 3 |
4 files changed, 26 insertions, 5 deletions
diff --git a/media-libs/libjsw/ChangeLog b/media-libs/libjsw/ChangeLog index 38dd0091aa6d..110bbc48f574 100644 --- a/media-libs/libjsw/ChangeLog +++ b/media-libs/libjsw/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-libs/libjsw -# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libjsw/ChangeLog,v 1.8 2005/05/23 15:46:22 herbs Exp $ +# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-libs/libjsw/ChangeLog,v 1.9 2005/06/03 00:49:16 vapier Exp $ + + 03 Jun 2005; Mike Frysinger <vapier@gentoo.org> + +files/libjsw-1.5.5-liborder.patch, libjsw-1.5.5.ebuild: + Make sure we search custom lib paths before system paths so broken libs dont + screw us #94867 by ferret. 23 May 2005; Herbie Hopkins <herbs@gentoo.org> libjsw-1.5.5.ebuild: Fixed multilib issue, bug #93672 diff --git a/media-libs/libjsw/Manifest b/media-libs/libjsw/Manifest index c3ac0bd4ad0c..65cb7fec5ba1 100644 --- a/media-libs/libjsw/Manifest +++ b/media-libs/libjsw/Manifest @@ -1,5 +1,6 @@ -MD5 85ed5027fa441a85f45ba03f18cf266a ChangeLog 958 +MD5 3d668a87ba9873bc055f02add8876192 ChangeLog 1177 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158 -MD5 a7cd398ff0770a1457e150561e017f0a libjsw-1.5.5.ebuild 1486 +MD5 6ed5e658b3d9650d6edc016d01ed2fb4 libjsw-1.5.5.ebuild 1529 MD5 31ad1236d527eb6aa9762930554c4239 files/digest-libjsw-1.5.5 65 MD5 a780f984cee6892ed8cc9f14d6c4c5f3 files/libjsw-1.5.5-gcc33.patch 943 +MD5 28a904876c5e894ec7833c517dfacd93 files/libjsw-1.5.5-liborder.patch 415 diff --git a/media-libs/libjsw/files/libjsw-1.5.5-liborder.patch b/media-libs/libjsw/files/libjsw-1.5.5-liborder.patch new file mode 100644 index 000000000000..0def9ba95ad0 --- /dev/null +++ b/media-libs/libjsw/files/libjsw-1.5.5-liborder.patch @@ -0,0 +1,14 @@ +Search our custom $(LIB_DIRS) path before the stuff +gtk-config injects in $(LIBS). + +http://bugs.gentoo.org/94867 + +--- jscalibrator/Makefile ++++ jscalibrator/Makefile +@@ -132,5 +132,5 @@ + modules: $(OBJ_C) $(OBJ_CPP) + @echo -n "Linking modules..." +- @$(CPP) $(OBJ_C) $(OBJ_CPP) -o $(BIN) $(LIBS) $(LIB_DIRS) ++ @$(CPP) $(OBJ_C) $(OBJ_CPP) -o $(BIN) $(LIB_DIRS) $(LIBS) + @echo -n " " + @-$(LS) $(LSFLAGS) $(BIN) diff --git a/media-libs/libjsw/libjsw-1.5.5.ebuild b/media-libs/libjsw/libjsw-1.5.5.ebuild index 116084515ec3..ecd14b05fb50 100644 --- a/media-libs/libjsw/libjsw-1.5.5.ebuild +++ b/media-libs/libjsw/libjsw-1.5.5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libjsw/libjsw-1.5.5.ebuild,v 1.4 2005/05/23 15:46:22 herbs Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libjsw/libjsw-1.5.5.ebuild,v 1.5 2005/06/03 00:49:16 vapier Exp $ inherit eutils @@ -22,6 +22,7 @@ src_unpack() { bunzip2 libjsw/man/* jscalibrator/jscalibrator.1.bz2 || die "bunzip failed" cd jscalibrator epatch "${FILESDIR}"/${P}-gcc33.patch + epatch "${FILESDIR}"/${P}-liborder.patch } src_compile() { |