diff options
| author |   Caleb Tennis <caleb@gentoo.org> | 2004-02-17 12:20:17 +0000 |
|---|---|---|
| committer | Caleb Tennis <caleb@gentoo.org> | 2004-02-17 12:20:17 +0000 |
| commit | 9c8f3b2f07c58b19fa94ae6deed7135ffeacb849 (patch) | |
| tree | 27a919f024780ea08d6eb593f03273cb86406667 /x11-libs/qt | |
| parent | add py2.3 patch to 0.7.0 also (diff) | |
| download | historical-9c8f3b2f07c58b19fa94ae6deed7135ffeacb849.tar.gz historical-9c8f3b2f07c58b19fa94ae6deed7135ffeacb849.tar.bz2 historical-9c8f3b2f07c58b19fa94ae6deed7135ffeacb849.zip | |
Use LD_PRELOAD to force the uic program to use the currently building Qt and not the already installed Qt.
Diffstat (limited to 'x11-libs/qt')
| -rw-r--r-- | x11-libs/qt/ChangeLog | 7 | ||||
| -rw-r--r-- | x11-libs/qt/Manifest | 4 | ||||
| -rw-r--r-- | x11-libs/qt/qt-3.3.0-r1.ebuild | 10 |
3 files changed, 13 insertions, 8 deletions
diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog index ca056d54a55f..e2ba6f6c1723 100644 --- a/x11-libs/qt/ChangeLog +++ b/x11-libs/qt/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for x11-libs/qt # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.124 2004/02/16 18:24:46 caleb Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.125 2004/02/17 12:20:17 caleb Exp $ + + 17 Feb 2004; Caleb Tennis <caleb@gentoo.org> qt-3.3.0-r1.ebuild: + Okay, I think this new ebuild fixes the problems of uic using the old + Qt versus the new Qt. We just force it to preload the new Qt library + first! *qt-3.3.0-r1 (16 Feb 2004) diff --git a/x11-libs/qt/Manifest b/x11-libs/qt/Manifest index f0932eeb7a38..78a23d4baea5 100644 --- a/x11-libs/qt/Manifest +++ b/x11-libs/qt/Manifest @@ -1,10 +1,10 @@ -MD5 96b01bfad86f4274d6dce5716cd40a62 qt-3.3.0-r1.ebuild 5027 +MD5 27d1605b76e6b4e60d793eef789472e5 qt-3.3.0-r1.ebuild 4963 MD5 c9c496912fe8e4b25bd5cf84645accdf qt-3.3.0.ebuild 5291 MD5 9e84006a240b69c02e0aa8b957d48662 qt-3.1.2-r3.ebuild 4984 MD5 15cb67cf0a0a71f8c86c4aa91714360c qt-2.3.2-r1.ebuild 2285 MD5 913367613ee452605a107179d5fa1c76 qt-3.0.5-r2.ebuild 3907 MD5 8ba2f35348af78eaa4cf70cdfef1ba01 qt-3.1.2-r4.ebuild 5347 -MD5 9932fc9ee1a5235255f5197993abe63e ChangeLog 21769 +MD5 782d65011358d7f9570543a0fe731ece ChangeLog 21990 MD5 512150b47a904b0240101e319856aab1 metadata.xml 156 MD5 df04f93b1fb59bd66a5d6f6cca115454 qt-3.2.3-r1.ebuild 5095 MD5 9ac22fe721162a565a7507763f785ab5 files/qt-3.2.3-qpsprinter-useFreeType2-20031128.patch 9972 diff --git a/x11-libs/qt/qt-3.3.0-r1.ebuild b/x11-libs/qt/qt-3.3.0-r1.ebuild index c49fab1b1e76..e92a350ca132 100644 --- a/x11-libs/qt/qt-3.3.0-r1.ebuild +++ b/x11-libs/qt/qt-3.3.0-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.0-r1.ebuild,v 1.1 2004/02/16 18:24:46 caleb Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.0-r1.ebuild,v 1.2 2004/02/17 12:20:17 caleb Exp $ SRCTYPE="free" DESCRIPTION="QT version ${PV}" @@ -51,8 +51,6 @@ src_unpack() { src_compile() { export QTDIR=${S} export SYSCONF=${D}${QTBASE}/etc/settings - LD_LIBRARY_PATH_OLD=${LD_LIBRARY_PATH} - export LD_LIBRARY_PATH=${S}/lib:${LD_LIBRARY_PATH} # Let's just allow writing to these directories during Qt emerge # as it makes Qt much happier. @@ -83,8 +81,10 @@ src_compile() { -dlopen-opengl || die export QTDIR=${S} - emake src-qmake src-moc sub-src sub-tools || die - export LD_LIBRARY_PATH=${LD_LIBRARY_PATH_OLD} + + emake src-qmake src-moc sub-src || die + export LD_PRELOAD="${LD_PRELOAD} ${QTDIR}/lib/libqt-mt.so" + emake sub-tools || die } src_install() { |