From: Daniel Goller Date: Sun, 31 Oct 2004 05:39:12 +0000 (+0000) Subject: Closing bug25551 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=871ccf6fcbc419b618016f4abd461d115ccb3dd0;p=gentoo.git Closing bug25551 --- diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog index 9e7305a02f01..0e9bcc9c6c7a 100644 --- a/x11-libs/qt/ChangeLog +++ b/x11-libs/qt/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for x11-libs/qt # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.174 2004/10/25 17:29:58 danarmak Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.175 2004/10/31 05:39:12 morfic Exp $ + + 31 Oct 2004; Daniel Goller qt-3.3.3-r1.ebuild, + qt-3.3.3.ebuild: + Fixing qt to allow CFLAGS to close bug 25551 + using strip-flags to keep things sane 25 Oct 2004; Dan Armak qt-2.3.2-r1.ebuild, qt-3.2.3-r1.ebuild, qt-3.3.1-r2.ebuild, qt-3.3.2.ebuild, diff --git a/x11-libs/qt/Manifest b/x11-libs/qt/Manifest index 2501a790b34b..e7ef364160bd 100644 --- a/x11-libs/qt/Manifest +++ b/x11-libs/qt/Manifest @@ -1,10 +1,10 @@ -MD5 e33147091e31dcc39606b59566b03a99 qt-3.3.3-r1.ebuild 6310 +MD5 00bfbdc33d86ef1fe41eda4c3910524b qt-3.3.3-r1.ebuild 6622 MD5 a5c51d879fff01b6f6b8128088bbe3c4 qt-3.3.2.ebuild 6893 MD5 f769105ec9340901a442a9e9880f504d qt-2.3.2-r1.ebuild 2287 MD5 5d82c6565d0f7cd22378670d038b92fb qt-3.3.1-r2.ebuild 5743 -MD5 899308105181d43ccb6e64a2978eb818 ChangeLog 29382 +MD5 bd5dac94c11a298eda0692af405732ad ChangeLog 29556 MD5 512150b47a904b0240101e319856aab1 metadata.xml 156 -MD5 02dec99f5f3f938a53845183873c5111 qt-3.3.3.ebuild 6575 +MD5 a54448a25492c487c981cc145901ad25 qt-3.3.3.ebuild 6888 MD5 12029b56d726aef8a419006508cdf7da qt-3.2.3-r1.ebuild 5125 MD5 9ac22fe721162a565a7507763f785ab5 files/qt-3.2.3-qpsprinter-useFreeType2-20031128.patch 9972 MD5 c7f65a0625242eccf159e2b8ee74976d files/45qt3 109 diff --git a/x11-libs/qt/qt-3.3.3-r1.ebuild b/x11-libs/qt/qt-3.3.3-r1.ebuild index 06d605e0cd9b..716b22618efa 100644 --- a/x11-libs/qt/qt-3.3.3-r1.ebuild +++ b/x11-libs/qt/qt-3.3.3-r1.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.3-r1.ebuild,v 1.5 2004/10/25 17:29:58 danarmak Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.3-r1.ebuild,v 1.6 2004/10/31 05:39:12 morfic Exp $ -inherit eutils +inherit eutils flag-o-matic SRCTYPE="free" DESCRIPTION="QT version ${PV}" @@ -16,7 +16,7 @@ SRC_URI="ftp://ftp.trolltech.com/qt/source/qt-x11-${SRCTYPE}-${PV}.tar.bz2 LICENSE="|| ( QPL-1.0 GPL-2 )" SLOT="3" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~x86 ~alpha ~ppc ~amd64 ~sparc ~hppa ~mips ~ppc64" IUSE="cups debug doc firebird gif icc ipv6 mysql nas odbc opengl postgres sqlite xinerama zlib immqt immqt-bc" DEPEND="virtual/x11 virtual/xft @@ -71,6 +71,15 @@ src_unpack() { sh make-symlinks.sh || die "make symlinks failed" fi + cd mkspecs/linux-g++ + # set c/xxflags and ldflags + strip-flags + sed -i -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CFLAGS}:" \ + -e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}:" \ + -e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=${LDFLAGS}:" \ + qmake.conf + cd ${S} + # use icc && export PLATFORM=linux-icc } diff --git a/x11-libs/qt/qt-3.3.3.ebuild b/x11-libs/qt/qt-3.3.3.ebuild index 5d19f463a44e..6435a34200f5 100644 --- a/x11-libs/qt/qt-3.3.3.ebuild +++ b/x11-libs/qt/qt-3.3.3.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.3.ebuild,v 1.16 2004/10/25 17:29:58 danarmak Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.3.ebuild,v 1.17 2004/10/31 05:39:12 morfic Exp $ -inherit eutils +inherit eutils flag-o-matic SRCTYPE="free" DESCRIPTION="QT version ${PV}" @@ -16,7 +16,7 @@ SRC_URI="ftp://ftp.trolltech.com/qt/source/qt-x11-${SRCTYPE}-${PV}.tar.bz2 LICENSE="|| ( QPL-1.0 GPL-2 )" SLOT="3" -KEYWORDS="alpha amd64 hppa ia64 mips ppc ppc64 sparc x86" +KEYWORDS="x86 alpha ppc amd64 sparc hppa mips ppc64" IUSE="cups debug doc firebird gif icc ipv6 mysql nas odbc opengl postgres sqlite xinerama zlib immqt immqt-bc" DEPEND="virtual/x11 virtual/xft @@ -75,6 +75,15 @@ src_unpack() { sh make-symlinks.sh || die "make symlinks failed" fi + cd mkspecs/linux-g++ + # set c/xxflags and ldflags + strip-flags + sed -i -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CFLAGS}:" \ + -e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}:" \ + -e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=${LDFLAGS}:" \ + qmake.conf + cd ${S} + # use icc && export PLATFORM=linux-icc }