diff options
Diffstat (limited to 'x11-libs')
-rw-r--r-- | x11-libs/qt/ChangeLog | 7 | ||||
-rw-r--r-- | x11-libs/qt/Manifest | 4 | ||||
-rw-r--r-- | x11-libs/qt/qt-3.3.8b.ebuild | 364 |
3 files changed, 373 insertions, 2 deletions
diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog index 41da17ab01ed..d3cbffed9b67 100644 --- a/x11-libs/qt/ChangeLog +++ b/x11-libs/qt/ChangeLog @@ -1,6 +1,11 @@ # 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.542 2008/05/30 04:38:21 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.543 2008/07/26 21:01:44 carlo Exp $ + +*qt-3.3.8b (26 Jul 2008) + + 26 Jul 2008; Carsten Lohrke <carlo@gentoo.org> +qt-3.3.8b.ebuild: + Version bump. License change, quoting issues and other minor cleaning. 30 May 2008; Jeroen Roovers <jer@gentoo.org> qt-4.4.0.ebuild: Marked ~hppa (bug #223557). diff --git a/x11-libs/qt/Manifest b/x11-libs/qt/Manifest index 598240aca7ef..0ed0d8650b05 100644 --- a/x11-libs/qt/Manifest +++ b/x11-libs/qt/Manifest @@ -29,12 +29,14 @@ AUX qt4/Designer.desktop 374 RMD160 bdd36d944e2549649cd0a51382296d86d5c2ac37 SHA AUX qt4/Linguist.desktop 362 RMD160 ce7f588d57300eb859634cabdccd5331da572c76 SHA1 ba914198e37fbf94a8bcbcbfb33bf0f5b45aec8b SHA256 3c527616f52bf533256150dab7f5f6e94bc4f73e2193fae20314cf3d70c4b1f7 AUX utf8-bug-qt3.diff 2670 RMD160 f5db1461cd82ac98417ab641228e15816d160724 SHA1 ca5ecb29c7f1c826d48703339a3371038e306bb7 SHA256 aab526bcff76ccf981ce3095bf6f26b26823f9078a672c89fe78331b6d975aa0 DIST qt-x11-free-3.3.8.tar.gz 17393124 RMD160 65188370f6aa7093c9601783264825cf66b74eb4 SHA1 919e470beb32ec5d8e96c4dd1b6a10a2c79511a1 SHA256 975fa7b0c1e02f84d9013a9cde2123695fdd512ff4394ba89f530f4ee8597139 +DIST qt-x11-free-3.3.8b.tar.gz 17313883 RMD160 4e3cbd9c5d4719b5d33e961e6595d7b215788c8b SHA1 745def6250dc7f337dbb265e20bf38dcb41fd854 SHA256 1b7a1ff62ec5a9cb7a388e2ba28fda6f960b27f27999482ebeceeadb72ac9f6e DIST qt-x11-immodule-unified-qt3.3.8-20070321-gentoo.diff.bz2 137387 RMD160 7f4f79c95faa2b8e71a78308af8feae5f6a6b06a SHA1 230cc532f1a3023967c5aee4cce87d1b9351b73d SHA256 06994304d2b7c699c4b6ea4183877652e261170f74282e89a3700ce6d4a98918 DIST qt-x11-opensource-src-4.3.3.tar.gz 42341802 RMD160 410daca03b6802ba5cc6662219c2ba7a190bd292 SHA1 77d00e2438efa793f6c16c54b64c8ba440ee3228 SHA256 89934bacc5cee5cb35a231275b0f9948f29483faf9082bed0e7255ce41751570 DIST qt-x11-opensource-src-4.3.4.tar.gz 43988710 RMD160 eb081e599e61bcaa126981aecbe2db480be35eca SHA1 639f6469d5aa07c51c2aa6795f8e3de3aab8cd25 SHA256 8864dd80f3456be70a3be60364502a0ca3f46125b2f156860ad880ff55fcabd2 EBUILD qt-3.3.8-r4.ebuild 11750 RMD160 c915200401f99e7ba12bc0520f7b887eca9de211 SHA1 c334e7b1deb529d50f247c454d1a9c64a6da67d5 SHA256 10abb17a9d0caae073a9fd5ab7ebaccdce3273b4fd9a6cda2db4b822e3ebb476 +EBUILD qt-3.3.8b.ebuild 10484 RMD160 46703b1bbe55ce60ecef0a0a260f93ffad097994 SHA1 9e5ad511f1e47ab2655c217cea31e55aae58af32 SHA256 d249465e2f6b67e93273297848fa29a70becde58f7b28c862883f559e76d6dd7 EBUILD qt-4.3.3.ebuild 8735 RMD160 d88fef9502378541a5a507cdd5df9f0ede7c1562 SHA1 38c376e15aa7622028dc4ed328b46ef64fb21245 SHA256 5c7448a5f680a3f9b3a3241530e867294779062bcf96a506004b7a4253ac3683 EBUILD qt-4.3.4-r1.ebuild 9048 RMD160 660d5dc591cc6e3eeeed055dd9bab3567e8ad4f9 SHA1 39b2ffcff5bfedc3967f7b232d3ef2be72882c9c SHA256 bd7004cecfbea02cf9f1c5c75bc375e252f71e68519226fa2580ad5e72cdbff4 EBUILD qt-4.4.0.ebuild 789 RMD160 b889401d8bf84836e16019b16cc2a52d7181e027 SHA1 861a558ad077d3d93c0ce94c81231b2b435e1314 SHA256 0ef086ccf20921d18de73ec6394f86899dc6fd6fcbe782a925be86838324b30d -MISC ChangeLog 41758 RMD160 a2f3f405cbe391b52352aa231e51cd5b35aee1e8 SHA1 89af363e1364588357dc1c9f6c0c1e5aa3c7a2b4 SHA256 445c40ebd08cdec81274f8741a59ea8c57a0c83470d81ed94d6ab5d6aa784d98 +MISC ChangeLog 41928 RMD160 4c5a88f5ea68c9bb09fac204382f98bb18091b00 SHA1 fc55818dc5d7777430b622227c3b212d7d96753d SHA256 792b82ff93b75c0d57d5a03438953e3872850905f2556bcd0ccc4de762d36b1d MISC metadata.xml 156 RMD160 d76590850d56864c8d99e6877ed15841b55ef1fc SHA1 e872bab086832a9db3f0fa9b1897c70577d3af21 SHA256 94c4f580c1a55f8a5e1a1dcdd6dedfea0b8bd78c1d7137c354938d73c49e4448 diff --git a/x11-libs/qt/qt-3.3.8b.ebuild b/x11-libs/qt/qt-3.3.8b.ebuild new file mode 100644 index 000000000000..720ebd160a36 --- /dev/null +++ b/x11-libs/qt/qt-3.3.8b.ebuild @@ -0,0 +1,364 @@ +# 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-3.3.8b.ebuild,v 1.1 2008/07/26 21:01:44 carlo Exp $ + +# *** Please remember to update qt3.eclass when revbumping this *** + +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 GPL-3 )" + +SLOT="3" +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +IUSE="cups debug doc examples firebird ipv6 mysql nas nis odbc opengl postgres sqlite xinerama immqt immqt-bc" + +RDEPEND=" + media-libs/jpeg + >=media-libs/freetype-2 + >=media-libs/libmng-1.0.9 + media-libs/libpng + sys-libs/zlib + virtual/xft + x11-libs/libXcursor + x11-libs/libXi + x11-libs/libXrandr + x11-libs/libSM + cups? ( net-print/cups ) + firebird? ( dev-db/firebird ) + mysql? ( virtual/mysql ) + nas? ( >=media-libs/nas-1.5 ) + opengl? ( virtual/opengl virtual/glu ) + postgres? ( virtual/postgresql-base ) + xinerama? ( x11-libs/libXinerama )" +DEPEND="${RDEPEND} + x11-proto/inputproto + x11-proto/xextproto + xinerama? ( x11-proto/xineramaproto ) + immqt? ( x11-proto/xineramaproto ) + immqt-bc? ( x11-proto/xineramaproto )" +PDEPEND="odbc? ( ~dev-db/qt-unixODBC-$PV )" + +S="${WORKDIR}/qt-x11-${SRCTYPE}-${PV}" + +QTBASE="/usr/qt/3" + +libdir="$(get_libdir)" + +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}"/qt-3.3.8-uic-fix.patch + + # 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}"/qt-3.3.8-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}"/qt-3.3.8-visibility.patch + + if use immqt || use immqt-bc ; then + epatch ../${IMMQT_P}.diff + sh make-symlinks.sh || die "make symlinks failed" + + epatch "${FILESDIR}"/qt-3.3.8-immqt+gcc-4.3.patch + fi + + if use mips; then + epatch "${FILESDIR}"/qt-3.3.8-mips.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 + + if [[ $( gcc-fullversion ) == "3.4.6" && gcc-specs-ssp ]] ; then + ewarn "Appending -fno-stack-protector to CFLAGS/CXXFLAGS" + append-flags -fno-stack-protector + fi + + 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\>.*=.*:QMAKE_CC=$(tc-getCC):" \ + -e "s:\<QMAKE_CXX\>.*=.*:QMAKE_CXX=$(tc-getCXX):" \ + -e "s:\<QMAKE_LINK\>.*=.*:QMAKE_LINK=$(tc-getCXX):" \ + -e "s:\<QMAKE_LINK_SHLIB\>.*=.*:QMAKE_LINK_SHLIB=$(tc-getCXX):" \ + "${S}"/mkspecs/${PLATFORM}/qmake.conf || die + + if [ ${libdir} != "lib" ] ; then + sed -i -e "s:/lib$:/${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" + + [ "${libdir}" != "lib" ] && myconf="${myconf} -L/usr/${libdir}" + + # unixODBC support is now a PDEPEND on dev-db/qt-unixODBC; see bug 14178. + use nas && myconf+=" -system-nas-sound" + use nis && myconf+=" -nis" || myconf+=" -no-nis" + use mysql && myconf+=" -plugin-sql-mysql -I/usr/include/mysql -L/usr/${libdir}/mysql" || myconf+=" -no-sql-mysql" + use postgres && myconf+=" -plugin-sql-psql -I/usr/include/postgresql/server -I/usr/include/postgresql/pgsql -I/usr/include/postgresql/pgsql/server" || myconf+=" -no-sql-psql" + use firebird && myconf+=" -plugin-sql-ibase -I/opt/firebird/include" || myconf+=" -no-sql-ibase" + use sqlite && myconf+=" -plugin-sql-sqlite" || myconf+=" -no-sql-sqlite" + use cups && myconf+=" -cups" || myconf+=" -no-cups" + use opengl && myconf+=" -enable-module=opengl" || myconf+=" -disable-opengl" + use debug && myconf+=" -debug" || myconf+=" -release -no-g++-exceptions" + use xinerama && myconf+=" -xinerama" || myconf+=" -no-xinerama" + + myconf="${myconf} -system-zlib -qt-gif" + + use ipv6 && myconf+=" -ipv6" || myconf+=" -no-ipv6" + use immqt-bc && myconf+=" -inputmethod" + use immqt && myconf+=" -inputmethod -inputmethod-ext" + + 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}/${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 + dolib.so lib/lib{editor,qassistantclient,designercore}.a + dolib.so lib/libqt-mt.la + dolib.so lib/libqt-mt.so.${PV/b} lib/libqui.so.1.0.0 + cd "${D}"/${QTBASE}/${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/b} 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/b} libqt.so.${PV/b} + 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 + + # 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/*\.h "${D}"/${QTBASE}/include/ + cp include/private/*\.h "${D}"/${QTBASE}/include/private/ + + # prl files + sed -i -e "s:${S}:${QTBASE}:g" "${S}"/lib/*.prl + insinto ${QTBASE}/${libdir} + doins "${S}"/lib/*.prl + + # pkg-config file + insinto ${QTBASE}/${libdir}/pkgconfig + doins "${S}"/lib/*.pc + + # List all the multilib libdirs + local libdirs + for alibdir in $(get_all_libdirs); do + libdirs="${libdirs}:${QTBASE}/${alibdir}" + done + + # environment variables + cat <<EOF > "${T}"/45qt3 +PATH=${QTBASE}/bin +ROOTPATH=${QTBASE}/bin +LDPATH=${libdirs:1} +QMAKESPEC=${PLATFORM} +MANPATH=${QTBASE}/doc/man +PKG_CONFIG_PATH=${QTBASE}/${libdir}/pkgconfig +EOF + + cat <<EOF > "${T}"/50qtdir3 +QTDIR=${QTBASE} +EOF + + cat <<EOF > "${T}"/50-qt3-revdep +SEARCH_DIRS="${QTBASE}" +EOF + + insinto /etc/revdep-rebuild + doins "${T}"/50-qt3-revdep + + doenvd "${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 +} |