pesa 14/07/07 20:03:53 Modified: qtcore-4.8.5-r1.ebuild ChangeLog Added: qtcore-4.8.5-r2.ebuild Log: Add fixes for libreoffice, bug 514968. (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0xDADED6B2671CB57D!)
Revision Changes Path 1.11 dev-qt/qtcore/qtcore-4.8.5-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtcore/qtcore-4.8.5-r1.ebuild?rev=1.11&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtcore/qtcore-4.8.5-r1.ebuild?rev=1.11&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtcore/qtcore-4.8.5-r1.ebuild?r1=1.10&r2=1.11 Index: qtcore-4.8.5-r1.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-qt/qtcore/qtcore-4.8.5-r1.ebuild,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- qtcore-4.8.5-r1.ebuild 26 Jan 2014 11:55:45 -0000 1.10 +++ qtcore-4.8.5-r1.ebuild 7 Jul 2014 20:03:53 -0000 1.11 @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtcore/qtcore-4.8.5-r1.ebuild,v 1.10 2014/01/26 11:55:45 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtcore/qtcore-4.8.5-r1.ebuild,v 1.11 2014/07/07 20:03:53 pesa Exp $ EAPI=5 @@ -28,7 +28,7 @@ " PATCHES=( - "${FILESDIR}/moc-boost-lexical-cast.patch" + "${FILESDIR}/${PN}-4.8.5-moc-boost-lexical-cast.patch" "${FILESDIR}/CVE-2013-4549-01-disallow-deep-or-widely-nested-entity-refs.patch" "${FILESDIR}/CVE-2013-4549-02-fully-expand-entities.patch" ) 1.45 dev-qt/qtcore/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtcore/ChangeLog?rev=1.45&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtcore/ChangeLog?rev=1.45&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtcore/ChangeLog?r1=1.44&r2=1.45 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-qt/qtcore/ChangeLog,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- ChangeLog 23 Apr 2014 10:29:02 -0000 1.44 +++ ChangeLog 7 Jul 2014 20:03:53 -0000 1.45 @@ -1,6 +1,15 @@ # ChangeLog for dev-qt/qtcore # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtcore/ChangeLog,v 1.44 2014/04/23 10:29:02 zlogene Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtcore/ChangeLog,v 1.45 2014/07/07 20:03:53 pesa Exp $ + +*qtcore-4.8.5-r2 (07 Jul 2014) + + 07 Jul 2014; Davide Pesavento <[email protected]> + +files/qtcore-4.8.5-honor-ExcludeSocketNotifiers-in-glib-event-loop.patch, + +files/qtcore-4.8.5-moc-boost-lexical-cast.patch, + +files/qtcore-4.8.5-qeventdispatcher-recursive.patch, +qtcore-4.8.5-r2.ebuild, + -files/moc-boost-lexical-cast.patch, qtcore-4.8.5-r1.ebuild: + Add fixes for libreoffice, bug 514968. 23 Apr 2014; Mikle Kolyada <[email protected]> -qtcore-5.2.1.ebuild: Drop qt5 ebuild. 1.1 dev-qt/qtcore/qtcore-4.8.5-r2.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtcore/qtcore-4.8.5-r2.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtcore/qtcore-4.8.5-r2.ebuild?rev=1.1&content-type=text/plain Index: qtcore-4.8.5-r2.ebuild =================================================================== # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/dev-qt/qtcore/qtcore-4.8.5-r2.ebuild,v 1.1 2014/07/07 20:03:53 pesa Exp $ EAPI=5 inherit qt4-build DESCRIPTION="Cross-platform application development framework" SLOT="4" if [[ ${QT4_BUILD_TYPE} == live ]]; then KEYWORDS="" else KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" fi IUSE="+glib iconv icu qt3support ssl" DEPEND=" sys-libs/zlib glib? ( dev-libs/glib:2 ) icu? ( >=dev-libs/icu-49:= ) ssl? ( dev-libs/openssl ) !<x11-libs/cairo-1.10.2-r2 " RDEPEND="${DEPEND}" PDEPEND=" qt3support? ( ~dev-qt/qtgui-${PV}[aqua=,debug=,glib=,qt3support] ) " PATCHES=( "${FILESDIR}/${PN}-4.8.5-moc-boost-lexical-cast.patch" "${FILESDIR}/${PN}-4.8.5-honor-ExcludeSocketNotifiers-in-glib-event-loop.patch" # bug 514968 "${FILESDIR}/${PN}-4.8.5-qeventdispatcher-recursive.patch" # bug 514968 "${FILESDIR}/CVE-2013-4549-01-disallow-deep-or-widely-nested-entity-refs.patch" "${FILESDIR}/CVE-2013-4549-02-fully-expand-entities.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="${QT4_TARGET_DIRECTORIES} include 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/3rdparty/zlib_dependency.pri src/declarative src/gui src/script tools/shared tools/linguist/shared translations" 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" # bug 427782 sed -i -e "/^CPPFLAGS/s/-g//" \ "${S}/qmake/Makefile.unix" || die "sed qmake/Makefile.unix CPPFLAGS failed" sed -i -e "s/setBootstrapVariable QMAKE_CFLAGS_RELEASE/QMakeVar set QMAKE_CFLAGS_RELEASE/" \ -e "s/setBootstrapVariable QMAKE_CXXFLAGS_RELEASE/QMakeVar set QMAKE_CXXFLAGS_RELEASE/" \ "${S}/configure" || die "sed configure setBootstrapVariable failed" } src_configure() { myconf+=" -no-accessibility -no-xmlpatterns -no-multimedia -no-audio-backend -no-phonon -no-phonon-backend -no-svg -no-webkit -no-script -no-scripttools -no-declarative -system-zlib -no-gif -no-libtiff -no-libpng -no-libmng -no-libjpeg -no-cups -no-dbus -no-gtkstyle -no-nas-sound -no-opengl -no-openvg -no-sm -no-xshape -no-xvideo -no-xsync -no-xinerama -no-xcursor -no-xfixes -no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype -no-xinput -no-xkb $(qt_use glib) $(qt_use iconv) $(qt_use icu) $(use ssl && echo -openssl-linked || echo -no-openssl) $(qt_use qt3support)" qt4-build_src_configure } src_install() { dobin bin/{qmake,moc,rcc,uic,lconvert,lrelease,lupdate} install_directories src/{corelib,xml,network,plugins/codecs} emake INSTALL_ROOT="${D}" install_mkspecs # install private headers insinto "${QTHEADERDIR#${EPREFIX}}"/QtCore/private find "${S}"/src/corelib -type f -name "*_p.h" -exec doins {} + # 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 failed" insinto "${QTTRANSDIR#${EPREFIX}}" doins translations/*.qm 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 QCONFIG_DEFINE="QT_ZLIB" install_qconfigs # remove .la files prune_libtool_files keepdir "${QTSYSCONFDIR#${EPREFIX}}" # Framework magic fix_includes }
