From 79f195ccbf9137dbe4405b01f2086202b75566b4 Mon Sep 17 00:00:00 2001 From: Caleb Tennis Date: Mon, 26 Mar 2007 18:34:33 +0000 Subject: [PATCH] Revbump to include a crash patch (Bug #171883) Package-Manager: portage-2.1.2.2 --- x11-libs/qt/ChangeLog | 8 +- x11-libs/qt/Manifest | 19 +- x11-libs/qt/files/digest-qt-3.3.8-r1 | 6 + .../qt/files/qt-3.3.8-mysql-unload-crash.diff | 47 +++ x11-libs/qt/qt-3.3.8-r1.ebuild | 384 ++++++++++++++++++ 5 files changed, 459 insertions(+), 5 deletions(-) create mode 100644 x11-libs/qt/files/digest-qt-3.3.8-r1 create mode 100644 x11-libs/qt/files/qt-3.3.8-mysql-unload-crash.diff create mode 100644 x11-libs/qt/qt-3.3.8-r1.ebuild diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog index c05e3ad1a2f2..5178ba190dc4 100644 --- a/x11-libs/qt/ChangeLog +++ b/x11-libs/qt/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for x11-libs/qt # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.417 2007/03/21 11:41:48 caleb Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.418 2007/03/26 18:34:33 caleb Exp $ + +*qt-3.3.8-r1 (26 Mar 2007) + + 26 Mar 2007; Caleb Tennis + +files/qt-3.3.8-mysql-unload-crash.diff, +qt-3.3.8-r1.ebuild: + Revbump to include a crash patch (Bug #171883) 21 Mar 2007; Caleb Tennis qt-3.3.8.ebuild: Update to the latest immqt patch from bug #169852 diff --git a/x11-libs/qt/Manifest b/x11-libs/qt/Manifest index 061829431625..8e01d4a33879 100644 --- a/x11-libs/qt/Manifest +++ b/x11-libs/qt/Manifest @@ -74,6 +74,10 @@ AUX qt-3.3.6-visibility.patch 5554 RMD160 db15a594a913fd1c1837a731e168b1197d19da MD5 49aad9f3e7911c03c9e5da8824ed71d5 files/qt-3.3.6-visibility.patch 5554 RMD160 db15a594a913fd1c1837a731e168b1197d19da62 files/qt-3.3.6-visibility.patch 5554 SHA256 b33b2415f280ef25f070bbe7308659ee3e5a5c1999e2ef419271f11e59160407 files/qt-3.3.6-visibility.patch 5554 +AUX qt-3.3.8-mysql-unload-crash.diff 1150 RMD160 02f9d2c720503ec851be2c5488b0153823ab8a62 SHA1 bb6aad81cce143c23ff7840b1d79f6b2007a0c04 SHA256 d494e386cab40f7f7a1803745c220c6104b56b73419981b20d49fc0750996076 +MD5 7d40ed1bd40d33d8b9b27a2076a5d22a files/qt-3.3.8-mysql-unload-crash.diff 1150 +RMD160 02f9d2c720503ec851be2c5488b0153823ab8a62 files/qt-3.3.8-mysql-unload-crash.diff 1150 +SHA256 d494e386cab40f7f7a1803745c220c6104b56b73419981b20d49fc0750996076 files/qt-3.3.8-mysql-unload-crash.diff 1150 AUX qt-3.3.8-seli-xinerama.patch 1960 RMD160 ce0163c9a47f5417f957e1d1ad0c574357c01cc7 SHA1 60b9c0a323d598aacca089d677c4b1c9709e70db SHA256 ec72679b69148af1b687a9cf7992e20ee85f4a0f3a33f3c05c8d2174f6f43503 MD5 5a809da59debd0d8242c25c1f5ae7697 files/qt-3.3.8-seli-xinerama.patch 1960 RMD160 ce0163c9a47f5417f957e1d1ad0c574357c01cc7 files/qt-3.3.8-seli-xinerama.patch 1960 @@ -135,6 +139,10 @@ EBUILD qt-3.3.6-r5.ebuild 11117 RMD160 464d1a225f2ba385cc80e662046de4998c720ced MD5 9e4b234be100199e8a74f09e748ecd52 qt-3.3.6-r5.ebuild 11117 RMD160 464d1a225f2ba385cc80e662046de4998c720ced qt-3.3.6-r5.ebuild 11117 SHA256 0f6a74ff4f067f7a68a3629548258ef027514d97f7cf52ab864f8b21f39e6225 qt-3.3.6-r5.ebuild 11117 +EBUILD qt-3.3.8-r1.ebuild 11217 RMD160 b6e7a08c232be33e7320f722ca3b4a1d5eb816c9 SHA1 1c982a78c2ae7c7bc3a0879c14a508906fb4e98b SHA256 7081dc6d843c917f8202fd67b5c2823eea32cb922eedaf7d3157d9a434c3c830 +MD5 40f5c3af3297b40987597d07aa2ac1a8 qt-3.3.8-r1.ebuild 11217 +RMD160 b6e7a08c232be33e7320f722ca3b4a1d5eb816c9 qt-3.3.8-r1.ebuild 11217 +SHA256 7081dc6d843c917f8202fd67b5c2823eea32cb922eedaf7d3157d9a434c3c830 qt-3.3.8-r1.ebuild 11217 EBUILD qt-3.3.8.ebuild 11118 RMD160 1e80a4582ce8411767493eeea30352e3ce8c3a72 SHA1 bf9e754f45c40982e03e745151b48c5b1d49a879 SHA256 b2ee8433a55b84917f50146bb752d7198d94fd0bd242caf224466cf378128ea6 MD5 eeca010d7b7224053404f56eba9a0ba6 qt-3.3.8.ebuild 11118 RMD160 1e80a4582ce8411767493eeea30352e3ce8c3a72 qt-3.3.8.ebuild 11118 @@ -151,10 +159,10 @@ EBUILD qt-4.2.3.ebuild 7699 RMD160 27a70efaa57f9d5eff3d38205a11b60df3034807 SHA1 MD5 371dc767bce4f830b97bc0155280eb95 qt-4.2.3.ebuild 7699 RMD160 27a70efaa57f9d5eff3d38205a11b60df3034807 qt-4.2.3.ebuild 7699 SHA256 a675cd447e7b4b2edb3eef719d022c08b6316341b2bff6ba250df8374ff59ed9 qt-4.2.3.ebuild 7699 -MISC ChangeLog 25032 RMD160 d665940f38560a603ea3627a0ad885183a9292d2 SHA1 4ca1369294cd7c463b8435ee9f0c633059364476 SHA256 968f7342c12d161714c938b1fe83e746f21802a1f88d822034dfe6f8ff238435 -MD5 84b309355a15732045931500d113aafb ChangeLog 25032 -RMD160 d665940f38560a603ea3627a0ad885183a9292d2 ChangeLog 25032 -SHA256 968f7342c12d161714c938b1fe83e746f21802a1f88d822034dfe6f8ff238435 ChangeLog 25032 +MISC ChangeLog 25221 RMD160 bdac622098303dbf6e2e3d26e82a361f83cd8e76 SHA1 24eaa6b2017134188f7096adabde7befa1d31308 SHA256 79e0426d4ea4cab4a7eddc2ca7d147c13b2b423c435f5cbe070813b8703c13e1 +MD5 fafc346dc9e9d6faad6cf3fc6f5185d6 ChangeLog 25221 +RMD160 bdac622098303dbf6e2e3d26e82a361f83cd8e76 ChangeLog 25221 +SHA256 79e0426d4ea4cab4a7eddc2ca7d147c13b2b423c435f5cbe070813b8703c13e1 ChangeLog 25221 MISC metadata.xml 156 RMD160 d76590850d56864c8d99e6877ed15841b55ef1fc SHA1 e872bab086832a9db3f0fa9b1897c70577d3af21 SHA256 94c4f580c1a55f8a5e1a1dcdd6dedfea0b8bd78c1d7137c354938d73c49e4448 MD5 512150b47a904b0240101e319856aab1 metadata.xml 156 RMD160 d76590850d56864c8d99e6877ed15841b55ef1fc metadata.xml 156 @@ -171,6 +179,9 @@ SHA256 f0db2f527947c400fd2407bedb02a4463e0baa0c448fe35bffe46d2de070a1f0 files/di MD5 e3af140e5246f4590438a272ec5f4fea files/digest-qt-3.3.8 608 RMD160 5c3ab7ee4a6ee1e30eec67f98def2173fa603ad9 files/digest-qt-3.3.8 608 SHA256 eae58d862519afc74261a63ab18ed1b5a72f0d6e33895cf10a6ee916b2ddb5d5 files/digest-qt-3.3.8 608 +MD5 e3af140e5246f4590438a272ec5f4fea files/digest-qt-3.3.8-r1 608 +RMD160 5c3ab7ee4a6ee1e30eec67f98def2173fa603ad9 files/digest-qt-3.3.8-r1 608 +SHA256 eae58d862519afc74261a63ab18ed1b5a72f0d6e33895cf10a6ee916b2ddb5d5 files/digest-qt-3.3.8-r1 608 MD5 b9b9bc9b7b1b1958eb7763599b4e0855 files/digest-qt-4.1.4-r2 289 RMD160 4556fe65639da69c4df58db22e9fa1e31415a8bb files/digest-qt-4.1.4-r2 289 SHA256 69249cbc9d21c3f1b247fb5f3b0bbf222ae2b506786f73f636a6506bd421cb26 files/digest-qt-4.1.4-r2 289 diff --git a/x11-libs/qt/files/digest-qt-3.3.8-r1 b/x11-libs/qt/files/digest-qt-3.3.8-r1 new file mode 100644 index 000000000000..5cda06f7046f --- /dev/null +++ b/x11-libs/qt/files/digest-qt-3.3.8-r1 @@ -0,0 +1,6 @@ +MD5 37aec12c8c7b0e164957ec1aa3fd0189 qt-x11-free-3.3.8.tar.gz 17393124 +RMD160 65188370f6aa7093c9601783264825cf66b74eb4 qt-x11-free-3.3.8.tar.gz 17393124 +SHA256 975fa7b0c1e02f84d9013a9cde2123695fdd512ff4394ba89f530f4ee8597139 qt-x11-free-3.3.8.tar.gz 17393124 +MD5 7f056a1fa246004cb3ec19fc11a88dc1 qt-x11-immodule-unified-qt3.3.8-20070321-gentoo.diff.bz2 137387 +RMD160 7f4f79c95faa2b8e71a78308af8feae5f6a6b06a qt-x11-immodule-unified-qt3.3.8-20070321-gentoo.diff.bz2 137387 +SHA256 06994304d2b7c699c4b6ea4183877652e261170f74282e89a3700ce6d4a98918 qt-x11-immodule-unified-qt3.3.8-20070321-gentoo.diff.bz2 137387 diff --git a/x11-libs/qt/files/qt-3.3.8-mysql-unload-crash.diff b/x11-libs/qt/files/qt-3.3.8-mysql-unload-crash.diff new file mode 100644 index 000000000000..5f61edc672bc --- /dev/null +++ b/x11-libs/qt/files/qt-3.3.8-mysql-unload-crash.diff @@ -0,0 +1,47 @@ +--- src/sql/drivers/mysql/qsql_mysql.cpp ++++ src/sql/drivers/mysql/qsql_mysql.cpp +@@ -37,7 +37,6 @@ + #include "qsql_mysql.h" + #include + +-#include + #include + #include + #include +@@ -341,14 +340,6 @@ int QMYSQLResult::numRowsAffected() + } + + ///////////////////////////////////////////////////////// +-static void qServerEnd() +-{ +-#ifndef Q_NO_MYSQL_EMBEDDED +-# if MYSQL_VERSION_ID >= 40000 +- mysql_server_end(); +-# endif // MYSQL_VERSION_ID +-#endif // Q_NO_MYSQL_EMBEDDED +-} + + static void qServerInit() + { +@@ -366,9 +357,7 @@ static void qServerInit() + qWarning( "QMYSQLDriver::qServerInit: unable to start server." ); + # endif + } +- qAddPostRoutine(qServerEnd); + init = TRUE; +- + # endif // MYSQL_VERSION_ID + #endif // Q_NO_MYSQL_EMBEDDED + } +@@ -411,6 +400,11 @@ QMYSQLDriver::~QMYSQLDriver() + QSqlOpenExtension *ext = qSqlOpenExtDict()->take( this ); + delete ext; + } ++#ifndef Q_NO_MYSQL_EMBEDDED ++# if MYSQL_VERSION_ID > 40000 ++ mysql_server_end(); ++# endif ++#endif + } + + bool QMYSQLDriver::hasFeature( DriverFeature f ) const diff --git a/x11-libs/qt/qt-3.3.8-r1.ebuild b/x11-libs/qt/qt-3.3.8-r1.ebuild new file mode 100644 index 000000000000..9c051f3dfc72 --- /dev/null +++ b/x11-libs/qt/qt-3.3.8-r1.ebuild @@ -0,0 +1,384 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.8-r1.ebuild,v 1.1 2007/03/26 18:34:33 caleb Exp $ + +inherit eutils flag-o-matic toolchain-funcs + +SRCTYPE="free" +DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework." +HOMEPAGE="http://www.trolltech.com/" + +IMMQT_P="qt-x11-immodule-unified-qt3.3.8-20070321-gentoo" + +SRC_URI="ftp://ftp.trolltech.com/qt/source/qt-x11-${SRCTYPE}-${PV}.tar.gz + immqt? ( mirror://gentoo/${IMMQT_P}.diff.bz2 ) + immqt-bc? ( mirror://gentoo/${IMMQT_P}.diff.bz2 )" +LICENSE="|| ( QPL-1.0 GPL-2 )" + +SLOT="3" +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +IUSE="cups debug doc examples firebird gif ipv6 mysql nas nis odbc opengl postgres sqlite xinerama immqt immqt-bc" + +DEPEND="|| ( ( x11-libs/libXcursor + x11-libs/libXi + x11-libs/libXrandr + x11-libs/libSM + x11-proto/inputproto + x11-proto/xextproto + xinerama? ( x11-proto/xineramaproto x11-libs/libXinerama ) + + ) + =media-libs/libmng-1.0.9 + >=media-libs/freetype-2 + sys-libs/zlib + nas? ( >=media-libs/nas-1.5 ) + mysql? ( virtual/mysql ) + firebird? ( dev-db/firebird ) + opengl? ( virtual/opengl virtual/glu ) + postgres? ( dev-db/libpq ) + cups? ( net-print/cups )" +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/icpc/} != ${CXX} ]]; then + PLATCXX="icc" + else + die "Unknown compiler ${CXX}." + fi + + case ${CHOST} in + *-freebsd*|*-dragonfly*) + PLATNAME="freebsd" ;; + *-openbsd*) + PLATNAME="openbsd" ;; + *-netbsd*) + PLATNAME="netbsd" ;; + *-darwin*) + PLATNAME="darwin" ;; + *-linux-*|*-linux) + PLATNAME="linux" ;; + *) + die "Unknown CHOST, no platform choosed." + esac + + # 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 =:' + + # Patch for uic includehint errors (aseigo patch) + epatch ${FILESDIR}/${P}-uic-fix.patch + + # Patch for mysql unload crash (Bug #171883) + epatch ${FILESDIR}/${P}-mysql-unload-crash.diff + + # KDE related patches + epatch ${FILESDIR}/0001-dnd_optimization.patch + epatch ${FILESDIR}/0002-dnd_active_window_fix.patch + epatch ${FILESDIR}/0038-dragobject-dont-prefer-unknown.patch + epatch ${FILESDIR}/0044-qscrollview-windowactivate-fix.diff + epatch ${FILESDIR}/0047-fix-kmenu-widget.diff + epatch ${FILESDIR}/0048-qclipboard_hack_80072.patch + + # ulibc patch (bug #100246) + epatch ${FILESDIR}/qt-ulibc.patch + + # xinerama patch: http://ktown.kde.org/~seli/xinerama/ + epatch "${FILESDIR}/${P}-seli-xinerama.patch" + + # Visibility patch, apply only on GCC 4.1 and later for safety + # [[ $(gcc-major-version)$(gcc-minor-version) -ge 41 ]] && \ + epatch "${FILESDIR}/${P}-visibility.patch" + + if use immqt || use immqt-bc ; then + epatch ../${IMMQT_P}.diff + sh make-symlinks.sh || die "make symlinks failed" + fi + + if use ppc-macos ; then + epatch "${FILESDIR}/${PN}-3.3.5-macos.patch" + fi + + # known working flags wrt #77623 + use sparc && export CFLAGS="-O1" && export CXXFLAGS="${CFLAGS}" + # set c/xxflags and ldflags + strip-flags + append-flags -fno-strict-aliasing + 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}:" \ + -e "s:\.*=.*:QMAKE_CC=$(tc-getCC):" \ + -e "s:\.*=.*:QMAKE_CXX=$(tc-getCXX):" \ + -e "s:\.*=.*:QMAKE_LINK=$(tc-getCXX):" \ + -e "s:\.*=.*:QMAKE_LINK_SHLIB=$(tc-getCXX):" \ + ${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 nis && myconf="${myconf} -nis" || myconf="${myconf} -no-nis" + 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" + + 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' + tc-export CC CXX + export LINK="$(tc-getCXX)" + + ./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 + + # Make the qembed utility (not made by default) + cd ${S}/tools/qembed + ../../bin/qmake + emake + +} + +src_install() { + # binaries + into ${QTBASE} + dobin bin/* + dobin tools/msg2qm/msg2qm + dobin tools/qembed/qembed + + # 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.so lib/lib{editor,qassistantclient,designercore}.a + dolib.so lib/libqt-mt.la + dolib.so lib/libqt-mt.so.${PV} 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.5->3.3->3->.so + ln -s libqt-mt.so.${PV} 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.${PV} libqt.so.${PV} + 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 < ${T}/45qt3 +PATH=${QTBASE}/bin +ROOTPATH=${QTBASE}/bin +DYLD_LIBRARY_PATH=${libdirs:1} +QMAKESPEC=${PLATFORM} +MANPATH=${QTBASE}/doc/man +PKG_CONFIG_PATH=${QTBASE}/$(get_libdir)/pkgconfig +EOF + else + cat < ${T}/45qt3 +PATH=${QTBASE}/bin +ROOTPATH=${QTBASE}/bin +LDPATH=${libdirs:1} +QMAKESPEC=${PLATFORM} +MANPATH=${QTBASE}/doc/man +PKG_CONFIG_PATH=${QTBASE}/$(get_libdir)/pkgconfig +EOF + fi + cat < ${T}/50qtdir3 +QTDIR=${QTBASE} +EOF + + cat < ${T}/50-qt3-revdep +SEARCH_DIRS="${QTBASE}" +EOF + + insinto /etc/revdep-rebuild + doins ${T}/50-qt3-revdep + + 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 + elog "After a rebuild of Qt, it can happen that Qt plugins (such as Qt/KDE styles," + elog "or widgets for the Qt designer) are no longer recognized. If this situation" + elog "occurs you should recompile the packages providing these plugins," + elog "and you should also make sure that Qt and its plugins were compiled with the" + elog "same version of gcc. Packages that may need to be rebuilt are, for instance," + elog "kde-base/kdelibs, kde-base/kdeartwork and kde-base/kdeartwork-styles." + elog "See http://doc.trolltech.com/3.3/plugins-howto.html for more infos." + echo +} -- 2.26.2