diff options
| -rw-r--r-- | x11-libs/qt/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-libs/qt/Manifest | 4 | ||||
| -rw-r--r-- | x11-libs/qt/qt-4.0.1.ebuild | 10 |
3 files changed, 13 insertions, 7 deletions
diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog index ef58aafb0287..66ac083467a8 100644 --- a/x11-libs/qt/ChangeLog +++ b/x11-libs/qt/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-libs/qt # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.241 2005/08/22 13:13:47 greg_g Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.242 2005/08/22 13:22:01 greg_g Exp $ + + 22 Aug 2005; Gregorio Guidi <greg_g@gentoo.org> qt-4.0.1.ebuild: + Fix bug #75181 in a more generic way, that does not make assumptions on the + build spec. 22 Aug 2005; Gregorio Guidi <greg_g@gentoo.org> +files/qt-3.3.4-gcc4-volatile.patch, qt-3.3.4-r7.ebuild: diff --git a/x11-libs/qt/Manifest b/x11-libs/qt/Manifest index 878aa236b85c..8e4cf6f54912 100644 --- a/x11-libs/qt/Manifest +++ b/x11-libs/qt/Manifest @@ -1,11 +1,11 @@ MD5 512150b47a904b0240101e319856aab1 metadata.xml 156 MD5 8a3143b4c6b3ed6f9407e6dad3887482 qt-3.3.4-r6.ebuild 9052 MD5 0b2185dc5083c6626071d26ef79383f5 qt-3.3.4-r3.ebuild 9050 -MD5 f931ba3260942ff74fd7fb79a064c3fc ChangeLog 40109 +MD5 ba3a2b6a9fa873f33e1fd8dce0168c6a ChangeLog 40269 MD5 cf386ea22e4be00ea893fecf5a6220ba qt-4.0.0.ebuild 5721 MD5 98c2c897d6bb5fd3f7c6af49cd8decb7 qt-3.3.4-r2.ebuild 8565 MD5 29eb571b78b63bccc11984b19cd7153b qt-3.3.4-r7.ebuild 9966 -MD5 05cdf5304052e0b6986764b2cbeaa718 qt-4.0.1.ebuild 5716 +MD5 d3c53cc908c90a6e6a93a404c744febd qt-4.0.1.ebuild 5744 MD5 7dc4f78d52452c28ba797ffc7db34f23 files/50qtdir3 16 MD5 b9689fa9461944ba25ebf0acde5fb70b files/qt-3.3.4-flickerfree_qiconview_buffered.patch 3347 MD5 33975d39870dca02e85664411a93eae1 files/qt-3.3.4-gcc4.patch 1002 diff --git a/x11-libs/qt/qt-4.0.1.ebuild b/x11-libs/qt/qt-4.0.1.ebuild index 38412c0071f4..e4e0f60c44e1 100644 --- a/x11-libs/qt/qt-4.0.1.ebuild +++ b/x11-libs/qt/qt-4.0.1.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/x11-libs/qt/qt-4.0.1.ebuild,v 1.1 2005/08/19 14:52:16 caleb Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.0.1.ebuild,v 1.2 2005/08/22 13:22:01 greg_g Exp $ inherit eutils flag-o-matic toolchain-funcs @@ -67,8 +67,7 @@ src_unpack() { cd ${S} - cp configure configure.orig - sed -e 's:read acceptance:acceptance=yes:' configure.orig > configure + sed -i -e 's:read acceptance:acceptance=yes:' configure cd mkspecs/$(qt_mkspecs_dir) # set c/xxflags and ldflags @@ -82,9 +81,12 @@ src_unpack() { -e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}:" \ -e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=${LDFLAGS}:" \ qmake.conf + + # Do not link with -rpath. See bug #75181. + sed -i -e "s:QMAKE_RPATH.*=.*:QMAKE_RPATH=:" \ + qmake.conf cd ${S} - epatch ${FILESDIR}/qt4-rpath.patch epatch ${FILESDIR}/qt4-nomkdir.patch if [[ $(gcc-major-version = "4") ]]; then |