Add 3.3.4-r8 which forces the build to use the system zlib instead of the internal...
authorCaleb Tennis <caleb@gentoo.org>
Mon, 19 Sep 2005 14:06:03 +0000 (14:06 +0000)
committerCaleb Tennis <caleb@gentoo.org>
Mon, 19 Sep 2005 14:06:03 +0000 (14:06 +0000)
Package-Manager: portage-2.0.52-r1

x11-libs/qt/ChangeLog
x11-libs/qt/Manifest
x11-libs/qt/files/digest-qt-3.3.4-r8 [new file with mode: 0644]
x11-libs/qt/qt-3.3.4-r8.ebuild [new file with mode: 0644]
x11-libs/qt/qt-4.0.1.ebuild

index ab375b4cacb250636df225042d78aa9e284e27cd..ae574b98b29901d81f012aa1316e7b9e7eb27530 100644 (file)
@@ -1,6 +1,15 @@
 # ChangeLog for x11-libs/qt
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.246 2005/09/17 16:35:57 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.247 2005/09/19 14:06:03 caleb Exp $
+
+*qt-3.3.4-r8 (19 Sep 2005)
+
+  19 Sep 2005; Caleb Tennis <caleb@gentoo.org> +qt-3.3.4-r8.ebuild,
+  qt-4.0.1.ebuild:
+  Adding 3.3.4-r8 which is the same as -r7 except we force the build to use
+  the system zlib instead of allowing the option via the use flag, as this
+  gets us past the zlib error, which is fixed in 3.3.5 but which isn't ready
+  to go stable yet (see bug #105695)
 
 *qt-3.3.5 (17 Sep 2005)
 
index dcb719d81c12f42da2d96d66bd823b37764bef9d..34ac861cdc7c9165cece7d9cbcf0b732f22c7e63 100644 (file)
@@ -1,10 +1,11 @@
-MD5 61c42aae7200acf2c43d12e30b80a50d qt-4.0.1.ebuild 5558
+MD5 c30c3dcb479450775e6b471e1960a9e6 qt-4.0.1.ebuild 5613
 MD5 20c9b273d559aebcc6aa71b28f47fcbd qt-3.3.5.ebuild 9940
+MD5 6870b094eb68bedb4ede8c3ee333fed3 qt-3.3.4-r8.ebuild 9996
 MD5 a242233fb1072c5cfbe5ebbab1443e8d qt-3.3.4-r3.ebuild 9049
 MD5 cf386ea22e4be00ea893fecf5a6220ba qt-4.0.0.ebuild 5721
 MD5 29eb571b78b63bccc11984b19cd7153b qt-3.3.4-r7.ebuild 9966
 MD5 98c2c897d6bb5fd3f7c6af49cd8decb7 qt-3.3.4-r2.ebuild 8565
-MD5 6dcbf3545b5fe3ed7261ada416404813 ChangeLog 657
+MD5 c96e6d6c209788462cccdcfd93bb2dc5 ChangeLog 1038
 MD5 512150b47a904b0240101e319856aab1 metadata.xml 156
 MD5 8a3143b4c6b3ed6f9407e6dad3887482 qt-3.3.4-r6.ebuild 9052
 MD5 74acd4c098f2c4bd70bdea585f0cb096 files/qt-no-rpath.patch 352
@@ -22,6 +23,7 @@ MD5 c115b4205c2a2eab0a547375e2f62460 files/digest-qt-3.3.4-r2 166
 MD5 c115b4205c2a2eab0a547375e2f62460 files/digest-qt-3.3.4-r3 166
 MD5 c115b4205c2a2eab0a547375e2f62460 files/digest-qt-3.3.4-r6 166
 MD5 c115b4205c2a2eab0a547375e2f62460 files/digest-qt-3.3.4-r7 166
+MD5 c115b4205c2a2eab0a547375e2f62460 files/digest-qt-3.3.4-r8 166
 MD5 7e6cdd22e2c697769754db9d6b3ae963 files/qt-3.3.4-macos.patch 18798
 MD5 f23686dab01383c584bb16c69e36b68e files/qt-3.3.4-gcc4-volatile.patch 2480
 MD5 7dc4f78d52452c28ba797ffc7db34f23 files/50qtdir3 16
diff --git a/x11-libs/qt/files/digest-qt-3.3.4-r8 b/x11-libs/qt/files/digest-qt-3.3.4-r8
new file mode 100644 (file)
index 0000000..d12b1ee
--- /dev/null
@@ -0,0 +1,2 @@
+MD5 027f4e82fbe592b39d2f160bfb3a73af qt-x11-free-3.3.4.tar.bz2 14439722
+MD5 85fdf8ac3264a8849ebae74aa9c37a9b qt-x11-immodule-unified-qt3.3.4-20041203.diff.bz2 113389
diff --git a/x11-libs/qt/qt-3.3.4-r8.ebuild b/x11-libs/qt/qt-3.3.4-r8.ebuild
new file mode 100644 (file)
index 0000000..63783bd
--- /dev/null
@@ -0,0 +1,335 @@
+# 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-3.3.4-r8.ebuild,v 1.1 2005/09/19 14:06:03 caleb Exp $
+
+inherit eutils flag-o-matic toolchain-funcs
+
+SRCTYPE="free"
+DESCRIPTION="QT version ${PV}"
+HOMEPAGE="http://www.trolltech.com/"
+
+IMMQT_P="qt-x11-immodule-unified-qt3.3.4-20041203"
+
+SRC_URI="ftp://ftp.trolltech.com/qt/source/qt-x11-${SRCTYPE}-${PV}.tar.bz2
+       immqt? ( http://freedesktop.org/~daisuke/${IMMQT_P}.diff.bz2 )
+       immqt-bc? ( http://freedesktop.org/~daisuke/${IMMQT_P}.diff.bz2 )"
+LICENSE="|| ( QPL-1.0 GPL-2 )"
+
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~sparc ~x86"
+IUSE="cups debug doc examples firebird gif ipv6 mysql nas odbc opengl postgres sqlite xinerama immqt immqt-bc"
+
+DEPEND="virtual/x11 virtual/xft
+       media-libs/libpng
+       media-libs/jpeg
+       media-libs/libmng
+       >=media-libs/freetype-2
+       nas? ( >=media-libs/nas-1.5 )
+       mysql? ( dev-db/mysql )
+       firebird? ( dev-db/firebird )
+       opengl? ( virtual/opengl virtual/glu )
+       postgres? ( dev-db/postgresql )
+       cups? ( net-print/cups )"
+#      zlib? ( sys-libs/zlib )"
+PDEPEND="odbc? ( ~dev-db/qt-unixODBC-$PV )"
+
+S=${WORKDIR}/qt-x11-${SRCTYPE}-${PV}
+
+QTBASE=/usr/qt/3
+
+pkg_setup() {
+       if use immqt && use immqt-bc ; then
+               ewarn
+               ewarn "immqt and immqt-bc are exclusive. You cannot set both."
+               ewarn "Please specify either immqt or immqt-bc."
+               ewarn
+               die
+       elif use immqt ; then
+               ewarn
+               ewarn "You are going to compile binary imcompatible immodule for Qt. This means"
+               ewarn "you have to recompile everything depending on Qt after you install it."
+               ewarn "Be aware."
+               ewarn
+       fi
+
+       export QTDIR=${S}
+
+       CXX=$(tc-getCXX)
+       if [[ ${CXX/g++/} != ${CXX} ]]; then
+               PLATCXX="g++"
+       elif [[ ${CXX/icc/} != ${CXX} ]]; then
+               PLATCXX="icc"
+       else
+               die "Unknown compiler ${CXX}."
+       fi
+
+       if use kernel_linux; then
+               PLATNAME="linux"
+       elif use kernel_FreeBSD && use elibc_FreeBSD; then
+               PLATNAME="freebsd"
+       elif use kernel_Darwin && use elibc_Darwin; then
+               PLATNAME="darwin"
+       else
+               die "Unknown platform."
+       fi
+
+       # probably this should be '*-64' for 64bit archs
+       # in a fully multilib environment (no compatibility symlinks)
+       export PLATFORM="${PLATNAME}-${PLATCXX}"
+}
+
+src_unpack() {
+       unpack ${A}
+       cd ${S}
+
+       sed -i -e 's:read acceptance:acceptance=yes:' configure
+
+       # Do not link with -rpath. See bug #75181.
+       find ${S}/mkspecs -name qmake.conf | xargs \
+               sed -i -e 's:QMAKE_RPATH.*:QMAKE_RPATH =:'
+
+       # fix freeze caused by bad interaction with kde klipper (kde bug 80072)
+       epatch ${FILESDIR}/${P}-qclipboard-hack.patch
+
+       # KDE related patches
+       epatch ${FILESDIR}/0001-dnd_optimization.patch
+       epatch ${FILESDIR}/0002-dnd_active_window_fix.patch
+       epatch ${FILESDIR}/0037-dnd-timestamp-fix.patch
+       epatch ${FILESDIR}/0038-dragobject-dont-prefer-unknown.patch
+       epatch ${FILESDIR}/${P}-0051-qtoolbar_77047.patch
+       epatch ${FILESDIR}/${P}-0047-fix-kmenu-widget.diff
+
+       # patches for gcc4
+       epatch "${FILESDIR}/${P}-gcc4.patch"
+       epatch "${FILESDIR}/${P}-gcc4-volatile.patch"
+
+       if use immqt || use immqt-bc ; then
+               epatch ../${IMMQT_P}.diff
+               epatch ${FILESDIR}/${P}-immodule-focus.patch
+               sh make-symlinks.sh || die "make symlinks failed"
+       fi
+
+       if use ppc-macos ; then
+               epatch ${FILESDIR}/${P}-macos.patch
+       fi
+
+       # known working flags wrt #77623
+       use sparc && export CFLAGS="-O1" && export CXXFLAGS="${CFLAGS}"
+       # 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}:" \
+               ${S}/mkspecs/${PLATFORM}/qmake.conf || die
+
+       if [ $(get_libdir) != "lib" ] ; then
+               sed -i -e "s:/lib$:/$(get_libdir):" \
+                       ${S}/mkspecs/${PLATFORM}/qmake.conf || die
+       fi
+}
+
+src_compile() {
+       export SYSCONF=${D}${QTBASE}/etc/settings
+
+       # Let's just allow writing to these directories during Qt emerge
+       # as it makes Qt much happier.
+       addwrite "${QTBASE}/etc/settings"
+       addwrite "${HOME}/.qt"
+
+       [ $(get_libdir) != "lib" ] && myconf="${myconf} -L/usr/$(get_libdir)"
+
+       # unixODBC support is now a PDEPEND on dev-db/qt-unixODBC; see bug 14178.
+       use nas         && myconf="${myconf} -system-nas-sound"
+       use gif         && myconf="${myconf} -qt-gif" || myconf="${myconf} -no-gif"
+       use mysql       && myconf="${myconf} -plugin-sql-mysql -I/usr/include/mysql -L/usr/$(get_libdir)/mysql" || myconf="${myconf} -no-sql-mysql"
+       use postgres    && myconf="${myconf} -plugin-sql-psql -I/usr/include/postgresql/server -I/usr/include/postgresql/pgsql -I/usr/include/postgresql/pgsql/server" || myconf="${myconf} -no-sql-psql"
+       use firebird    && myconf="${myconf} -plugin-sql-ibase" || myconf="${myconf} -no-sql-ibase"
+       use sqlite      && myconf="${myconf} -plugin-sql-sqlite" || myconf="${myconf} -no-sql-sqlite"
+       use cups        && myconf="${myconf} -cups" || myconf="${myconf} -no-cups"
+       use opengl      && myconf="${myconf} -enable-module=opengl" || myconf="${myconf} -disable-opengl"
+       use debug       && myconf="${myconf} -debug" || myconf="${myconf} -release -no-g++-exceptions"
+       use xinerama    && myconf="${myconf} -xinerama" || myconf="${myconf} -no-xinerama"
+#      use zlib        && myconf="${myconf} -system-zlib" || myconf="${myconf} -qt-zlib"
+       myconf="${myconf} -system-zlib"
+       use ipv6        && myconf="${myconf} -ipv6" || myconf="${myconf} -no-ipv6"
+       use immqt-bc    && myconf="${myconf} -inputmethod"
+       use immqt       && myconf="${myconf} -inputmethod -inputmethod-ext"
+
+       if use ppc-macos ; then
+               myconf="${myconf} -no-sql-ibase -no-sql-mysql -no-sql-psql -no-cups -lresolv -shared"
+               myconf="${myconf} -I/usr/X11R6/include -L/usr/X11R6/lib"
+               myconf="${myconf} -L${S}/lib -I${S}/include"
+               sed -i -e "s,#define QT_AOUT_UNDERSCORE,," mkspecs/${PLATFORM}/qplatformdefs.h || die
+       fi
+
+       export YACC='byacc -d'
+
+       ./configure -sm -thread -stl -system-libjpeg -verbose -largefile \
+               -qt-imgfmt-{jpeg,mng,png} -tablet -system-libmng \
+               -system-libpng -xft -platform ${PLATFORM} -xplatform \
+               ${PLATFORM} -xrender -prefix ${QTBASE} -libdir ${QTBASE}/$(get_libdir) \
+               -fast -no-sql-odbc ${myconf} -dlopen-opengl || die
+
+       emake src-qmake src-moc sub-src || die
+
+       export DYLD_LIBRARY_PATH="${S}/lib:/usr/X11R6/lib:${DYLD_LIBRARY_PATH}"
+       export LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}"
+
+       emake sub-tools || die
+
+       if use examples; then
+               emake sub-tutorial sub-examples || die
+       fi
+
+       # Make the msg2qm utility (not made by default)
+       cd ${S}/tools/msg2qm
+       ../../bin/qmake
+       emake
+
+}
+
+src_install() {
+       # binaries
+       into ${QTBASE}
+       dobin bin/*
+       dobin tools/msg2qm/msg2qm
+
+       # libraries
+       if use ppc-macos; then
+               # dolib is broken on BSD because of missing readlink(1)
+               dodir ${QTBASE}/$(get_libdir)
+               cp -fR lib/*.{dylib,la,a} ${D}/${QTBASE}/$(get_libdir) || die
+
+               cd ${D}/${QTBASE}/$(get_libdir)
+               for lib in libqt-mt* ; do
+                       ln -s ${lib} ${lib/-mt/}
+               done
+       else
+               dolib lib/lib{editor,qassistantclient,designercore}.a
+               dolib lib/libqt-mt.la
+               dolib lib/libqt-mt.so.3.3.4 lib/libqui.so.1.0.0
+               cd ${D}/${QTBASE}/$(get_libdir)
+
+               for x in libqui.so ; do
+                       ln -s $x.1.0.0 $x.1.0
+                       ln -s $x.1.0 $x.1
+                       ln -s $x.1 $x
+               done
+
+               # version symlinks - 3.3.4->3.3->3->.so
+               ln -s libqt-mt.so.3.3.4 libqt-mt.so.3.3
+               ln -s libqt-mt.so.3.3 libqt-mt.so.3
+               ln -s libqt-mt.so.3 libqt-mt.so
+
+               # libqt -> libqt-mt symlinks
+               ln -s libqt-mt.so.3.3.4 libqt.so.3.3.4
+               ln -s libqt-mt.so.3.3 libqt.so.3.3
+               ln -s libqt-mt.so.3 libqt.so.3
+               ln -s libqt-mt.so libqt.so
+       fi
+
+       # plugins
+       cd ${S}
+       local plugins=$(find plugins -name "lib*.so" -print)
+       for x in ${plugins}; do
+               exeinto ${QTBASE}/$(dirname ${x})
+               doexe ${x}
+       done
+
+       # Past this point just needs to be done once
+       is_final_abi || return 0
+
+       # includes
+       cd ${S}
+       dodir ${QTBASE}/include/private
+       cp include/* ${D}/${QTBASE}/include/
+       cp include/private/* ${D}/${QTBASE}/include/private/
+
+       # prl files
+       sed -i -e "s:${S}:${QTBASE}:g" ${S}/lib/*.prl
+       insinto ${QTBASE}/$(get_libdir)
+       doins ${S}/lib/*.prl
+
+       # pkg-config file
+       insinto ${QTBASE}/$(get_libdir)/pkgconfig
+       doins ${S}/lib/*.pc
+
+       # List all the multilib libdirs
+       local libdirs
+       for libdir in $(get_all_libdirs); do
+               libdirs="${libdirs}:${QTBASE}/${libdir}"
+       done
+
+       # environment variables
+       if use ppc-macos; then
+               cat <<EOF > ${T}/45qt3
+PATH=${QTBASE}/bin
+ROOTPATH=${QTBASE}/bin
+DYLD_LIBRARY_PATH=${libdirs:1}
+QMAKESPEC=${PLATFORM}
+MANPATH=${QTBASE}/doc/man
+EOF
+       else
+               cat <<EOF > ${T}/45qt3
+PATH=${QTBASE}/bin
+ROOTPATH=${QTBASE}/bin
+LDPATH=${libdirs:1}
+QMAKESPEC=${PLATFORM}
+MANPATH=${QTBASE}/doc/man
+EOF
+       fi
+       cat <<EOF > ${T}/50qtdir3
+QTDIR=${QTBASE}
+EOF
+       insinto /etc/env.d
+       doins ${T}/45qt3 ${T}/50qtdir3
+
+       if [ "${SYMLINK_LIB}" = "yes" ]; then
+               dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) ${QTBASE}/lib
+       fi
+
+       insinto ${QTBASE}/tools/designer
+       doins -r tools/designer/templates
+
+       insinto ${QTBASE}
+       doins -r translations
+
+       keepdir ${QTBASE}/etc/settings
+
+       if use doc; then
+               insinto ${QTBASE}
+               doins -r ${S}/doc
+       fi
+
+       if use examples; then
+               find ${S}/examples ${S}/tutorial -name Makefile | \
+                       xargs sed -i -e "s:${S}:${QTBASE}:g"
+
+               cp -r ${S}/examples ${D}${QTBASE}/
+               cp -r ${S}/tutorial ${D}${QTBASE}/
+       fi
+
+       # misc build reqs
+       insinto ${QTBASE}/mkspecs
+       doins -r ${S}/mkspecs/${PLATFORM}
+
+       sed -e "s:${S}:${QTBASE}:g" \
+               ${S}/.qmake.cache > ${D}${QTBASE}/.qmake.cache
+
+       dodoc FAQ README README-QT.TXT changes*
+       if use immqt || use immqt-bc ; then
+               dodoc ${S}/README.immodule
+       fi
+}
+
+pkg_postinst() {
+       echo
+       einfo "After a rebuild of Qt, it can happen that Qt plugins (such as Qt/KDE styles,"
+       einfo "or widgets for the Qt designer) are no longer recognized.  If this situation"
+       einfo "occurs you should recompile the packages providing these plugins,"
+       einfo "and you should also make sure that Qt and its plugins were compiled with the"
+       einfo "same version of gcc.  Packages that may need to be rebuilt are, for instance,"
+       einfo "kde-base/kdelibs, kde-base/kdeartwork and kde-base/kdeartwork-styles."
+       einfo "See http://doc.trolltech.com/3.3/plugins-howto.html for more infos."
+       echo
+}
index cc2b89645d0d4babc7363a57f51cd7a2ffe32f5e..61712a183daee93df0f7135af271335bc5a1552a 100644 (file)
@@ -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.3 2005/08/23 23:12:58 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.0.1.ebuild,v 1.4 2005/09/19 14:06:03 caleb Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -63,6 +63,10 @@ qt_mkspecs_dir() {
 }
 
 src_unpack() {
+       echo "S: .$S."
+       echo "D: .$D."
+       echo "L: .$QTLIBDIR."
+
        unpack ${A}
        cd ${S}