diff --git a/x11-libs/qt-core/ChangeLog b/x11-libs/qt-core/ChangeLog index 44eea6b7..1644f625 100644 --- a/x11-libs/qt-core/ChangeLog +++ b/x11-libs/qt-core/ChangeLog @@ -1,7 +1,12 @@ # ChangeLog for x11-libs/qt-core -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 # $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/ChangeLog,v 1.116 2010/12/05 21:45:43 wired Exp $ +*qt-core-4.7.2-r1 (13 Mar 2011) + + 13 Mar 2011; Mario Fetka +qt-core-4.7.2-r1.ebuild: + bump hack + 05 Dec 2010; Alex Alexander -qt-core-4.5.3-r2.ebuild, -files/qt-4.5.3-glib-event-loop.patch: removed 4.5.3 diff --git a/x11-libs/qt-core/Manifest b/x11-libs/qt-core/Manifest index d331c017..0899db97 100644 --- a/x11-libs/qt-core/Manifest +++ b/x11-libs/qt-core/Manifest @@ -6,6 +6,8 @@ AUX qt-4.6.2-alpha.patch 2913 RMD160 52ca59388d88c8e0ea2a40fd8d9d6721d324664e SH AUX rcc.pro 3440 RMD160 42e65efa8dc027f8a2b6c933243a91c1cac96092 SHA1 017ea0aea74a27012608f8be8f301d3cda3dd2b7 SHA256 b09c74046a97ec87b19a05abfe08d959040b737430e498269fb0d0c00bf0a38d AUX uic.pro 3671 RMD160 b6d3c392a67b66f6996134975e99db03a9987baf SHA1 f87fff37256b5c966e4d21b0fb6cb64b717f3d07 SHA256 904084b6d936fb9bab33d3592ec69dc9872708a74834f0cb498e8153f784c7fc DIST qt-everywhere-opensource-src-4.7.1.tar.gz 211768512 RMD160 de6998948eb9f51a9193b9020ba80cfd52d50899 SHA1 fcf764d39d982c7f84703821582bd10c3192e341 SHA256 8cb5277c41f824cfc6dcee0e95e0bf23a9ad2c8d18d245105137481d092b124a +DIST qt-everywhere-opensource-src-4.7.2.tar.gz 213663032 RMD160 de3d1c172c23c33681a0945c331db179c84cb7b5 SHA1 84414f82bbc9e8d356b986d5d1ebee89d06e4f2e SHA256 d4783b524b90bcd270ccf6e7a30d5fb51696c47eb5de49ebc2d553cd3eb49336 EBUILD qt-core-4.7.1-r1.ebuild 5175 RMD160 5b7c3b231ebf316202715e0d2e1586f912dd1f7e SHA1 8f262eeb47049c72f836e93e8455559113de035e SHA256 aac3eb99cc4f8819140ea43dedfd9da0411aa29009a87b748ab880a0d8fea57a -MISC ChangeLog 15622 RMD160 88b29517686f501f38ee39186a036c84faba9b4b SHA1 bb733e98605a6fabd9c2cfe52e5f6d9e67db5fab SHA256 65b9b9946728be7c11c7da5a7857b9ffb71bf112f9da7d901d0e12b94dd9d896 +EBUILD qt-core-4.7.2-r1.ebuild 5203 RMD160 ef00277f4725f9ff97110b566ee3c26958b9b16a SHA1 edcaf77293beacab174fcc280f5ba75d150f9a31 SHA256 637334415e491866a5f1699dc8da548063a40610f2e1d4f9f62fc1b8d8b68bc3 +MISC ChangeLog 15745 RMD160 7fafb90ea56f73dbacc44da83ba4a8b6af8a1823 SHA1 1c34436a63e183c2e8c0cd37907d51f4c8b19bed SHA256 8daa35d03746ab2f653b30bf4da2ea1c28e8dfd23673123d76e4b3ccc39a8d23 MISC metadata.xml 802 RMD160 0341afae262322299759a5a33bae9a42e5b7801c SHA1 b564551c1b4a7902e09200255c6c0a6ede646a23 SHA256 a84f88402ece782e8ac52ad0b90eea94e5bd563ca0a7956e1d89f1263d7f2925 diff --git a/x11-libs/qt-core/qt-core-4.7.2-r1.ebuild b/x11-libs/qt-core/qt-core-4.7.2-r1.ebuild new file mode 100644 index 00000000..4ee6a54c --- /dev/null +++ b/x11-libs/qt-core/qt-core-4.7.2-r1.ebuild @@ -0,0 +1,183 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/qt-core-4.7.2.ebuild,v 1.1 2011/03/01 19:06:22 tampakrap Exp $ + +EAPI="3" +inherit qt4-build + +DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework" +SLOT="4" +KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" +IUSE="+glib iconv +jit optimized-qmake private-headers qt3support ssl" + +RDEPEND="sys-libs/zlib + glib? ( dev-libs/glib ) + ssl? ( dev-libs/openssl ) + !> "${S}"/src/plugins/codecs/${i}/${i}.pro + done + + qt4-build_src_prepare + + # bug 172219 + sed -i -e "s:CXXFLAGS.*=:CXXFLAGS=${CXXFLAGS} :" \ + "${S}/qmake/Makefile.unix" || die "sed qmake/Makefile.unix CXXFLAGS failed" + sed -i -e "s:LFLAGS.*=:LFLAGS=${LDFLAGS} :" \ + "${S}/qmake/Makefile.unix" || die "sed qmake/Makefile.unix LDFLAGS failed" +} + +src_configure() { + unset QMAKESPEC + + myconf="${myconf} + $(qt_use glib) + $(qt_use iconv) + $(qt_use optimized-qmake) + $(qt_use ssl openssl) + $(qt_use qt3support) + $(qt_use jit javascript-jit)" + + myconf="${myconf} -no-xkb -no-fontconfig -no-xrender -no-xrandr + -no-xfixes -no-xcursor -no-xinerama -no-xshape -no-sm -no-opengl + -no-nas-sound -no-dbus -no-cups -no-gif -no-libpng + -no-libmng -no-libjpeg -system-zlib -no-webkit -no-phonon -no-xmlpatterns + -no-freetype -no-libtiff -no-accessibility -no-fontconfig -no-opengl + -no-svg -no-gtkstyle -no-phonon-backend -no-script -no-scripttools + -no-cups -no-xsync -no-xinput -no-multimedia" + + if [ "$ABI" = "x86" ] ; then + myconf="${myconf} -little-endian -host-little-endian -continue" + fi + + qt4-build_src_configure +} + +src_compile() { + # bug 259736 + unset QMAKESPEC + qt4-build_src_compile +} + +src_install() { + dobin "${S}"/bin/{qmake,moc,rcc,uic,lconvert,lrelease,lupdate} || die "dobin failed" + + install_directories src/{corelib,xml,network,plugins/codecs} + + emake INSTALL_ROOT="${D}" install_mkspecs || die "emake install_mkspecs failed" + + #install private headers + if use private-headers; then + insinto "${QTHEADERDIR#${EPREFIX}}"/QtCore/private + find "${S}"/src/corelib -type f -name "*_p.h" -exec doins {} \; + fi + # use freshly built libraries + local DYLD_FPATH= + [[ -d "${S}"/lib/QtCore.framework ]] \ + && DYLD_FPATH=$(for x in "${S}/lib/"*.framework; do echo -n ":$x"; done) + DYLD_LIBRARY_PATH="${S}/lib${DYLD_FPATH}" \ + LD_LIBRARY_PATH="${S}/lib" "${S}"/bin/lrelease translations/*.ts \ + || die "generating translations faied" + insinto ${QTTRANSDIR#${EPREFIX}} + doins translations/*.qm || die "doins translations failed" + + setqtenv + fix_library_files + + # List all the multilib libdirs + local libdirs= + for libdir in $(get_all_libdirs); do + libdirs+=:${EPREFIX}/usr/${libdir}/qt4 + done + + cat <<-EOF > "${T}/44qt4" + LDPATH="${libdirs:1}" + EOF + doenvd "${T}/44qt4" + + dodir ${QTDATADIR#${EPREFIX}}/mkspecs/gentoo || die "dodir failed" + mv "${D}"/${QTDATADIR}/mkspecs/qconfig.pri "${D}${QTDATADIR}"/mkspecs/gentoo \ + || die "Failed to move qconfig.pri" + + # Framework hacking + if use aqua && [[ ${CHOST#*-darwin} -ge 9 ]] ; then + #TODO do this better + sed -i -e '2a#include \n' \ + "${D}${QTLIBDIR}"/QtCore.framework/Headers/qconfig.h \ + || die "sed for qconfig.h failed." + dosym "${QTHEADERDIR#${EPREFIX}}"/Gentoo "${QTLIBDIR#${EPREFIX}}"/QtCore.framework/Headers/Gentoo || + die "dosym failed" + else + sed -i -e '2a#include \n' \ + "${D}${QTHEADERDIR}"/QtCore/qconfig.h \ + "${D}${QTHEADERDIR}"/Qt/qconfig.h \ + || die "sed for qconfig.h failed" + fi + + if use glib; then + QCONFIG_DEFINE="$(use glib && echo QT_GLIB) + $(use ssl && echo QT_OPENSSL)" + install_qconfigs + fi + # remove .la files + find "${D}"${QTLIBDIR} -name "*.la" -print0 | xargs -0 rm + # remove some unnecessary headers + rm -f "${D}${QTHEADERDIR}"/{Qt,QtCore}/{\ +qatomic_windows.h,\ +qatomic_windowsce.h,\ +qt_windows.h} + + keepdir "${QTSYSCONFDIR#${EPREFIX}}" + + # Framework magic + fix_includes +}