diff options
author | Markos Chandras <hwoarang@gentoo.org> | 2010-06-08 12:15:06 +0000 |
---|---|---|
committer | Markos Chandras <hwoarang@gentoo.org> | 2010-06-08 12:15:06 +0000 |
commit | 366567f09f3f27912663e8e074ef5654964cd9b2 (patch) | |
tree | 75e0da19fb3264301cbae675707be2be22374433 /x11-libs/qt-core | |
parent | Qt release version bump (diff) | |
download | gentoo-2-366567f09f3f27912663e8e074ef5654964cd9b2.tar.gz gentoo-2-366567f09f3f27912663e8e074ef5654964cd9b2.tar.bz2 gentoo-2-366567f09f3f27912663e8e074ef5654964cd9b2.zip |
Qt release version bump
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'x11-libs/qt-core')
-rw-r--r-- | x11-libs/qt-core/ChangeLog | 7 | ||||
-rw-r--r-- | x11-libs/qt-core/qt-core-4.6.3.ebuild | 187 |
2 files changed, 193 insertions, 1 deletions
diff --git a/x11-libs/qt-core/ChangeLog b/x11-libs/qt-core/ChangeLog index 3750bb2293a3..28b7e1de7cc6 100644 --- a/x11-libs/qt-core/ChangeLog +++ b/x11-libs/qt-core/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for x11-libs/qt-core # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/ChangeLog,v 1.96 2010/05/22 09:26:00 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/ChangeLog,v 1.97 2010/06/08 12:15:06 hwoarang Exp $ + +*qt-core-4.6.3 (08 Jun 2010) + + 08 Jun 2010; Markos Chandras <hwoarang@gentoo.org> +qt-core-4.6.3.ebuild: + Version bump 22 May 2010; Raúl Porcel <armin76@gentoo.org> qt-core-4.6.2-r1.ebuild, +files/qt-4.6.2-alpha.patch: diff --git a/x11-libs/qt-core/qt-core-4.6.3.ebuild b/x11-libs/qt-core/qt-core-4.6.3.ebuild new file mode 100644 index 000000000000..aff52d0c0d49 --- /dev/null +++ b/x11-libs/qt-core/qt-core-4.6.3.ebuild @@ -0,0 +1,187 @@ +# Copyright 1999-2010 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.6.3.ebuild,v 1.1 2010/06/08 12:15:06 hwoarang Exp $ + +EAPI="2" +inherit qt4-build + +DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework" +SLOT="4" +KEYWORDS="~alpha ~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="doc +glib iconv optimized-qmake qt3support ssl" + +RDEPEND="sys-libs/zlib + glib? ( dev-libs/glib ) + ssl? ( dev-libs/openssl ) + !<x11-libs/qt-4.4.0:4" +DEPEND="${RDEPEND} + dev-util/pkgconfig" +PDEPEND="qt3support? ( ~x11-libs/qt-gui-${PV}[aqua=,qt3support] )" + +PATCHES=( + "${FILESDIR}/qt-4.6-nolibx11.patch" + "${FILESDIR}/qt-4.6-nox11r6.patch" +) + +pkg_setup() { + QT4_TARGET_DIRECTORIES=" + src/tools/bootstrap + src/tools/moc + src/tools/rcc + src/tools/uic + src/corelib + src/xml + src/network + src/plugins/codecs + tools/linguist/lconvert + tools/linguist/lrelease + tools/linguist/lupdate" + + QT4_EXTRACT_DIRECTORIES=" + include/Qt + include/QtCore + include/QtNetwork + include/QtScript + include/QtXml + src/plugins/plugins.pro + src/plugins/qpluginbase.pri + src/src.pro + src/3rdparty/des + src/3rdparty/harfbuzz + src/3rdparty/md4 + src/3rdparty/md5 + src/3rdparty/sha1 + src/3rdparty/easing + src/script + tools/shared + tools/linguist/shared + translations" + + if use doc; then + QT4_EXTRACT_DIRECTORIES="${QT4_EXTRACT_DIRECTORIES} + doc/" + QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} + tools/qdoc3" + fi + QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} + ${QT4_EXTRACT_DIRECTORIES}" + + qt4-build_pkg_setup +} + +src_prepare() { + # Don't pre-strip, bug 235026 + for i in kr jp cn tw ; do + echo "CONFIG+=nostrip" >> "${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)" + + 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 ! use doc; then + myconf="${myconf} -nomake docs" + 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" + + if use doc; then + emake INSTALL_ROOT="${D}" install_htmldocs || die "emake install_htmldocs failed" + 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 + 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 <QtCore/Gentoo/gentoo-qconfig.h>\n' \ + "${D}${QTLIBDIR}"/QtCore.framework/Headers/qconfig.h \ + || die "sed for qconfig.h failed." + dosym "${QTHEADERDIR#${EPREFIX}}"/Gentoo "${QTLIBDIR#${EPREFIX}}"/QtCore.framework/Headers/Gentoo + else + sed -i -e '2a#include <Gentoo/gentoo-qconfig.h>\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 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 +} |