From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([69.77.167.62] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Jbpml-0003jd-87 for garchives@archives.gentoo.org; Wed, 19 Mar 2008 04:20:19 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7F740E09DF; Wed, 19 Mar 2008 04:20:18 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 09750E09DF for ; Wed, 19 Mar 2008 04:20:18 +0000 (UTC) Received: from stork.gentoo.org (stork.gentoo.org [64.127.104.133]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTP id 9A54A65925 for ; Wed, 19 Mar 2008 04:20:17 +0000 (UTC) Received: from ingmar by stork.gentoo.org with local (Exim 4.68) (envelope-from ) id 1Jbpmi-00045n-DX for gentoo-commits@lists.gentoo.org; Wed, 19 Mar 2008 04:20:16 +0000 From: "Ingmar Vanhassel (ingmar)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, ingmar@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in x11-libs/qt: ChangeLog qt-4.3.4-r1.ebuild X-VCS-Repository: gentoo-x86 X-VCS-Files: ChangeLog qt-4.3.4-r1.ebuild X-VCS-Directories: x11-libs/qt X-VCS-Committer: ingmar X-VCS-Committer-Name: Ingmar Vanhassel Content-Type: text/plain; charset=utf8 Message-Id: Sender: Ingmar Vanhassel Date: Wed, 19 Mar 2008 04:20:16 +0000 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 6a7b7a32-221f-4593-8feb-922bcab7c79c X-Archives-Hash: 00b99bb2aeec062bbf3aa227d14692b7 ingmar 08/03/19 04:20:16 Modified: ChangeLog Added: qt-4.3.4-r1.ebuild Log: Anti-aliasing rules are broken in qt-4.3*, causing random runtime failu= res in Qt programs. bug 213411. Fixed by appending -fno-strict-aliasing. (Portage version: 2.1.4.4) Revision Changes Path 1.526 x11-libs/qt/ChangeLog file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt/Change= Log?rev=3D1.526&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt/Change= Log?rev=3D1.526&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt/Change= Log?r1=3D1.525&r2=3D1.526 Index: ChangeLog =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v retrieving revision 1.525 retrieving revision 1.526 diff -u -r1.525 -r1.526 --- ChangeLog 16 Mar 2008 22:28:30 -0000 1.525 +++ ChangeLog 19 Mar 2008 04:20:15 -0000 1.526 @@ -1,6 +1,10 @@ # ChangeLog for x11-libs/qt # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.525 2008/03= /16 22:28:30 zlin Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.526 2008/03= /19 04:20:15 ingmar Exp $ + + 19 Mar 2008; Ingmar Vanhassel ChangeLog: + Anti-aliasing rules are broken in qt-4.3*, causing random runtime fail= ures + in Qt programs. bug 213411. Fixed by appending -fno-strict-aliasing. =20 16 Mar 2008; Bo =C3=98rsted Andresen qt-4.4.0_beta1.= ebuild: The qt meta ebuild needs to block previous versions of qt:4 too. 1.1 x11-libs/qt/qt-4.3.4-r1.ebuild file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt/qt-4.3= .4-r1.ebuild?rev=3D1.1&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt/qt-4.3= .4-r1.ebuild?rev=3D1.1&content-type=3Dtext/plain Index: qt-4.3.4-r1.ebuild =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.3.4-r1.ebuild,v 1.1 2= 008/03/19 04:20:15 ingmar Exp $ inherit eutils flag-o-matic toolchain-funcs multilib SRCTYPE=3D"opensource-src" DESCRIPTION=3D"The Qt toolkit is a comprehensive C++ application developm= ent framework." HOMEPAGE=3D"http://www.trolltech.com/" SRC_URI=3D"ftp://ftp.trolltech.com/pub/qt/source/qt-x11-${SRCTYPE}-${PV}.= tar.gz" S=3D${WORKDIR}/qt-x11-${SRCTYPE}-${PV} LICENSE=3D"|| ( QPL-1.0 GPL-2 GPL-3 )" SLOT=3D"4" KEYWORDS=3D"~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" IUSE_INPUT_DEVICES=3D"input_devices_wacom" IUSE=3D"accessibility cups dbus debug doc examples firebird gif glib jpeg= mng mysql nas nis odbc opengl pch png postgres qt3support sqlite sqlite3= ssl tiff xinerama zlib ${IUSE_INPUT_DEVICES}" RDEPEND=3D"x11-libs/libXrandr x11-libs/libXcursor x11-libs/libXfont x11-libs/libSM !x11-libs/qt-core xinerama? ( x11-libs/libXinerama ) media-libs/fontconfig >=3Dmedia-libs/freetype-2 png? ( media-libs/libpng ) jpeg? ( media-libs/jpeg ) mng? ( >=3Dmedia-libs/libmng-1.0.9 ) tiff? ( media-libs/tiff ) nas? ( >=3Dmedia-libs/nas-1.5 ) odbc? ( dev-db/unixODBC ) mysql? ( virtual/mysql ) firebird? ( dev-db/firebird ) sqlite3? ( =3Ddev-db/sqlite-3* ) sqlite? ( =3Ddev-db/sqlite-2* ) opengl? ( virtual/opengl virtual/glu ) postgres? ( dev-db/libpq ) cups? ( net-print/cups ) zlib? ( sys-libs/zlib ) glib? ( dev-libs/glib ) dbus? ( >=3Dsys-apps/dbus-1.0.2 ) ssl? ( dev-libs/openssl ) input_devices_wacom? ( x11-libs/libXi x11-drivers/linuxwacom )" DEPEND=3D"${RDEPEND} xinerama? ( x11-proto/xineramaproto ) x11-proto/xextproto x11-proto/inputproto dev-util/pkgconfig" pkg_setup() { QTBASEDIR=3D/usr/$(get_libdir)/qt4 QTPREFIXDIR=3D/usr QTBINDIR=3D/usr/bin QTLIBDIR=3D/usr/$(get_libdir)/qt4 QTPCDIR=3D/usr/$(get_libdir)/pkgconfig QTDATADIR=3D/usr/share/qt4 QTDOCDIR=3D/usr/share/doc/${P} QTHEADERDIR=3D/usr/include/qt4 QTPLUGINDIR=3D${QTLIBDIR}/plugins QTSYSCONFDIR=3D/etc/qt4 QTTRANSDIR=3D${QTDATADIR}/translations QTEXAMPLESDIR=3D${QTDATADIR}/examples QTDEMOSDIR=3D${QTDATADIR}/demos PLATFORM=3D$(qt_mkspecs_dir) } qt_use() { local flag=3D"$1" local feature=3D"$1" local enableval=3D [[ -n $2 ]] && feature=3D$2 [[ -n $3 ]] && enableval=3D"-$3" useq $flag && echo "${enableval}-${feature}" || echo "-no-${feature}" return 0 } qt_mkspecs_dir() { # Allows us to define which mkspecs dir we want to use. local spec case ${CHOST} in *-freebsd*|*-dragonfly*) spec=3D"freebsd" ;; *-openbsd*) spec=3D"openbsd" ;; *-netbsd*) spec=3D"netbsd" ;; *-darwin*) spec=3D"darwin" ;; *-linux-*|*-linux) spec=3D"linux" ;; *) die "Unknown CHOST, no platform choosed." esac CXX=3D$(tc-getCXX) if [[ ${CXX/g++/} !=3D ${CXX} ]]; then spec=3D"${spec}-g++" elif [[ ${CXX/icpc/} !=3D ${CXX} ]]; then spec=3D"${spec}-icc" else die "Unknown compiler ${CXX}." fi echo "${spec}" } src_unpack() { unpack ${A} cd "${S}" epatch "${FILESDIR}"/qt-4.2.3-hppa-ldcw-fix.patch cd "${S}"/mkspecs/$(qt_mkspecs_dir) # set c/xxflags and ldflags # Don't let the user go too overboard with flags. If you really want to= , uncomment # out the line below and give 'er a whirl. strip-flags replace-flags -O3 -O2 if [[ $( gcc-fullversion ) =3D=3D "3.4.6" && gcc-specs-ssp ]] ; then ewarn "Appending -fno-stack-protector to CFLAGS/CXXFLAGS" append-flags -fno-stack-protector fi # Bug 178652 if [[ "$(gcc-major-version)" =3D=3D "3" ]] && use amd64; then ewarn "Appending -fno-gcse to CFLAGS/CXXFLAGS" append-flags -fno-gcse fi # Anti-aliasing rules are broken in qt-4.3*, causing random runtime fail= ures # in Qt programs. bug 213411. append-flags -fno-strict-aliasing sed -i -e "s:QMAKE_CFLAGS_RELEASE.*=3D.*:QMAKE_CFLAGS_RELEASE=3D${CFLAGS= }:" \ -e "s:QMAKE_CXXFLAGS_RELEASE.*=3D.*:QMAKE_CXXFLAGS_RELEASE=3D${CXXFLAGS= }:" \ -e "s:QMAKE_LFLAGS_RELEASE.*=3D.*:QMAKE_LFLAGS_RELEASE=3D${LDFLAGS}:" \ -e "/CONFIG/s:$: nostrip:" \ qmake.conf # Do not link with -rpath. See bug #75181. sed -i -e "s:QMAKE_RPATH.*=3D.*:QMAKE_RPATH=3D:" qmake.conf # Replace X11R6/ directories, so /usr/X11R6/lib -> /usr/lib sed -i -e "s:X11R6/::" qmake.conf # The trolls moved the definitions of the above stuff for g++, so we nee= d to edit those files # separately as well. cd "${S}"/mkspecs/common sed -i -e "s:QMAKE_CFLAGS_RELEASE.*=3D.*:QMAKE_CFLAGS_RELEASE=3D${CPPFLA= GS} ${CFLAGS} ${ASFLAGS}:" \ -e "s:QMAKE_CXXFLAGS_RELEASE.*=3D.*:QMAKE_CXXFLAGS_RELEASE=3D${CPPFLAGS= } ${CXXFLAGS} ${ASFLAGS}:" \ -e "s:QMAKE_LFLAGS_RELEASE.*=3D.*:QMAKE_LFLAGS_RELEASE=3D${LDFLAGS}:" \ g++.conf # Do not link with -rpath. See bug #75181. sed -i -e "s:QMAKE_RPATH.*=3D.*:QMAKE_RPATH=3D:" g++.conf # Replace X11R6/ directories, so /usr/X11R6/lib -> /usr/lib sed -i -e "s:X11R6/::" linux.conf cd "${S}"/qmake sed -i -e "s:CXXFLAGS.*=3D:CXXFLAGS=3D${CPPFLAGS} ${CXXFLAGS} ${ASFLAGS}= :" \ -e "s:LFLAGS.*=3D:LFLAGS=3D${LDFLAGS} :" Makefile.unix cd "${S}" } src_compile() { export PATH=3D"${S}/bin:${PATH}" export LD_LIBRARY_PATH=3D"${S}/lib:${LD_LIBRARY_PATH}" [ $(get_libdir) !=3D "lib" ] && myconf=3D"${myconf} -L/usr/$(get_libdir)= " # Disable visibility explicitly if gcc version isn't 4 if [[ "$(gcc-major-version)" !=3D "4" ]]; then myconf=3D"${myconf} -no-reduce-exports" fi # Add a switch that will attempt to use recent binutils to reduce reloca= tions. Should be harmless for other # cases. From bug #178535 myconf=3D"${myconf} -reduce-relocations" myconf=3D"${myconf} $(qt_use accessibility) $(qt_use cups) $(qt_use xine= rama)" myconf=3D"${myconf} $(qt_use opengl) $(qt_use nis)" use nas && myconf=3D"${myconf} -system-nas-sound" myconf=3D"${myconf} $(qt_use gif gif qt) $(qt_use png libpng system)" myconf=3D"${myconf} $(qt_use jpeg libjpeg system) $(qt_use tiff libtiff = system)" myconf=3D"${myconf} $(qt_use zlib zlib system) $(qt_use mng libmng syste= m)" use debug && myconf=3D"${myconf} -debug -no-separate-debug-info" || myco= nf=3D"${myconf} -release -no-separate-debug-info" use mysql && myconf=3D"${myconf} -plugin-sql-mysql -I/usr/include/mysql = -L/usr/$(get_libdir)/mysql" || myconf=3D"${myconf} -no-sql-mysql" use postgres && myconf=3D"${myconf} -plugin-sql-psql -I/usr/include/post= gresql/pgsql" || myconf=3D"${myconf} -no-sql-psql" use firebird && myconf=3D"${myconf} -plugin-sql-ibase -I/opt/firebird/in= clude" || myconf=3D"${myconf} -no-sql-ibase" use sqlite3 && myconf=3D"${myconf} -plugin-sql-sqlite -system-sqlite" ||= myconf=3D"${myconf} -no-sql-sqlite" use sqlite && myconf=3D"${myconf} -plugin-sql-sqlite2" || myconf=3D"${my= conf} -no-sql-sqlite2" use odbc && myconf=3D"${myconf} -plugin-sql-odbc" || myconf=3D"${myconf}= -no-sql-odbc" use dbus && myconf=3D"${myconf} -qdbus" || myconf=3D"${myconf} -no-qdbus= " use glib && myconf=3D"${myconf} -glib" || myconf=3D"${myconf} -no-glib" use qt3support && myconf=3D"${myconf} -qt3support" || myconf=3D"${mycon= f} -no-qt3support" use ssl && myconf=3D"${myconf} -openssl" || myconf=3D"${myconf} -no-ope= nssl" use pch && myconf=3D"${myconf} -pch" || myconf=3D"${myconf} -no-pch" use input_devices_wacom && myconf=3D"${myconf} -tablet" || myconf=3D"${m= yconf} -no-tablet" myconf=3D"${myconf} -xrender -xrandr -xkb -xshape -sm" if ! use examples; then myconf=3D"${myconf} -nomake examples" fi myconf=3D"-stl -verbose -largefile -confirm-license \ -platform ${PLATFORM} -xplatform ${PLATFORM} -no-rpath \ -prefix ${QTPREFIXDIR} -bindir ${QTBINDIR} -libdir ${QTLIBDIR} -datadir= ${QTDATADIR} \ -docdir ${QTDOCDIR} -headerdir ${QTHEADERDIR} -plugindir ${QTPLUGINDIR}= \ -sysconfdir ${QTSYSCONFDIR} -translationdir ${QTTRANSDIR} \ -examplesdir ${QTEXAMPLESDIR} -demosdir ${QTDEMOSDIR} ${myconf}" echo ./configure ${myconf} ./configure ${myconf} || die emake all || die } src_install() { export PATH=3D"${S}/bin:${PATH}" export LD_LIBRARY_PATH=3D"${S}/lib:${LD_LIBRARY_PATH}" emake INSTALL_ROOT=3D"${D}" install_subtargets || die emake INSTALL_ROOT=3D"${D}" install_qmake || die emake INSTALL_ROOT=3D"${D}" install_mkspecs || die if use doc; then emake INSTALL_ROOT=3D"${D}" install_htmldocs || die fi # Install the translations. This may get use flagged later somehow emake INSTALL_ROOT=3D"${D}" install_translations || die keepdir "${QTSYSCONFDIR}" sed -i -e "s:${S}/lib:${QTLIBDIR}:g" "${D}"/${QTLIBDIR}/*.la sed -i -e "s:${S}/lib:${QTLIBDIR}:g" "${D}"/${QTLIBDIR}/*.prl sed -i -e "s:${S}/lib:${QTLIBDIR}:g" "${D}"/${QTLIBDIR}/pkgconfig/*.pc # pkgconfig files refer to WORKDIR/bin as the moc and uic locations. Fi= x: sed -i -e "s:${S}/bin:${QTBINDIR}:g" "${D}"/${QTLIBDIR}/pkgconfig/*.pc # Move .pc files into the pkgconfig directory dodir ${QTPCDIR} mv "${D}"/${QTLIBDIR}/pkgconfig/*.pc "${D}"/${QTPCDIR} # Install .desktop files, from bug #174033 insinto /usr/share/applications doins "${FILESDIR}"/qt4/*.desktop # List all the multilib libdirs local libdirs for libdir in $(get_all_libdirs); do libdirs=3D"${libdirs}:/usr/${libdir}/qt4" done cat > "${T}/44qt4" << EOF LDPATH=3D${libdirs:1} EOF doenvd "${T}/44qt4" } --=20 gentoo-commits@lists.gentoo.org mailing list