diff options
| author |   Caleb Tennis <caleb@gentoo.org> | 2004-02-13 13:05:15 +0000 |
|---|---|---|
| committer | Caleb Tennis <caleb@gentoo.org> | 2004-02-13 13:05:15 +0000 |
| commit | 74d9568a8e906d3d84688a7578abc29d9a39e636 (patch) | |
| tree | 0694627c2c350332a1e6024215d3cb90b1f14d0a /x11-libs/qt | |
| parent | change descriptions (#41393) (diff) | |
| download | historical-74d9568a8e906d3d84688a7578abc29d9a39e636.tar.gz historical-74d9568a8e906d3d84688a7578abc29d9a39e636.tar.bz2 historical-74d9568a8e906d3d84688a7578abc29d9a39e636.zip | |
Recomment out directory setting lines so that a Qt upgrade links properly
Diffstat (limited to 'x11-libs/qt')
| -rw-r--r-- | x11-libs/qt/ChangeLog | 5 | ||||
| -rw-r--r-- | x11-libs/qt/Manifest | 4 | ||||
| -rw-r--r-- | x11-libs/qt/qt-3.3.0.ebuild | 13 |
3 files changed, 15 insertions, 7 deletions
diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog index e14cb8ead7ff..d0182a4d50a5 100644 --- a/x11-libs/qt/ChangeLog +++ b/x11-libs/qt/ChangeLog @@ -1,6 +1,9 @@ # 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.121 2004/02/12 20:28:26 caleb Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.122 2004/02/13 13:05:15 caleb Exp $ + + 13 Feb 2004; Caleb Tennis <caleb@gentoo.org> qt-3.3.0.ebuild: + Recomment out directory setting lines so that a Qt upgrade links properly 12 Feb 2004; Caleb Tennis <caleb@gentoo.org> qt-3.3.0.ebuild: Fix postgresql include dir diff --git a/x11-libs/qt/Manifest b/x11-libs/qt/Manifest index 082843f2b6ea..9dd1fc7ac5cc 100644 --- a/x11-libs/qt/Manifest +++ b/x11-libs/qt/Manifest @@ -1,9 +1,9 @@ -MD5 65b594eb1341eccd60655b4733446386 qt-3.3.0.ebuild 5246 +MD5 8d05a411bf67762a4a71ca644741a978 qt-3.3.0.ebuild 5561 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 892467c132c4c969234986d269ce267e ChangeLog 21047 +MD5 a2e08a88df375f51d4c828296b3d3f6f ChangeLog 21188 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.ebuild b/x11-libs/qt/qt-3.3.0.ebuild index 662e87911988..9034030412ab 100644 --- a/x11-libs/qt/qt-3.3.0.ebuild +++ b/x11-libs/qt/qt-3.3.0.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.ebuild,v 1.15 2004/02/12 20:28:27 caleb Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.0.ebuild,v 1.16 2004/02/13 13:05:15 caleb Exp $ SRCTYPE="free" DESCRIPTION="QT version ${PV}" @@ -81,9 +81,14 @@ src_compile() { -system-libpng -lpthread -xft -platform ${PLATFORM} -xplatform \ ${PLATFORM} -xrender -prefix ${D}${QTBASE} -plugindir ${QTBASE}/plugins \ -docdir ${QTBASE}/doc -translationdir ${QTBASE}/translations \ - -datadir ${QTBASE} -sysconfdir ${QTBASE}/etc/settings -fast ${myconf} \ - -libdir ${QTBASE}/lib -headerdir ${QTBASE}/include \ - -bindir ${QTBASE}/bin -dlopen-opengl || die + -datadir ${QTBASE} -sysconfdir ${QTBASE}/etc/settings -fast ${myconf} || die +# -libdir ${QTBASE}/lib -headerdir ${QTBASE}/include \ +# -bindir ${QTBASE}/bin -dlopen-opengl || die +# +# The above lines should be commented out. It's more appropriate to set them, but +# the problem is that the tools built during Qt's compilation (like uic) will +# use the already installed Qt's installation instead of the newly installing +# Qt's, which may be binary incompatible and cause build problems. export QTDIR=${S} emake src-qmake src-moc sub-src sub-tools || die |