+# $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 <pesa@gentoo.org>

+ +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.

+AUX qtcore-4.8.5-honor-ExcludeSocketNotifiers-in-glib-event-loop.patch 3410 SHA256 9dbb9be4dfefc00711058b99fe2425bb43c811a1b36a6f046336e13c666d40ea SHA512 6770959ba01756d6a3fa9e03edd5f6c1df0d8625f4add65f7fef55a93b7b52c555a0ce749984938fb7ab905c2e0875cec0cb5d07f45c1b447fbc9e2d0ec678bb WHIRLPOOL d06e33e4d6545b99d930212f6ad767a6c59cb241cb0b28fe3401853700c26c9fd9a5dc0eb5cfaef62ed8f7874eccf906c7c39c469c6725e9db3836c8982422d8

+AUX qtcore-4.8.5-moc-boost-lexical-cast.patch 584 SHA256 dadd3eab516ee26f1c19f17dbcb7be46e7c9efba49924fa1d53cc0176491736a SHA512 ed2cc3d36ac8576cee42d1586b99913ce060a47e72c82890e7b5fe4fc500e857693f2348f4446ce7dfbd1bbdf6e51b99b57f2fc09d6c15f9075f10c4b5459fa6 WHIRLPOOL d4ee64605ad9dacd371519a9c08582c25ea891480c79795822cfe74e6bafb332d558dca5d024c6f369e3674fde5a89a15a7d79042093295ac9d0a0d516493583

+AUX qtcore-4.8.5-qeventdispatcher-recursive.patch 4017 SHA256 5db36cbb0686b8a503941779c821febc4a0330dc260e51d603f7aa1e4d8860ad SHA512 bd63961bcb695beebe8686142b84bff7702db4d85d737f5c2da927252b931700d03602f80048223cbbb05d85a5ddb9cb818321d756577f84843690b318f0c413 WHIRLPOOL f981bf3c3d1a62b486788433cabb2880b7f361ccdf99e502fb595608195168d72ba14018c93273f2726c60bae61a44cba3244026009823e832109a1f7418e773

+EBUILD qtcore-4.8.5-r1.ebuild 5012 SHA256 d60d5a468721e3a5cfea31a918d2cc8164212932e17c8dc12595a1698e9fd3ff SHA512 caf60b3c861a412f464fbedb9cc56df53690a5b9decd7455506b38cc99b871fe8fdf1d6d2616fc7feaa2c391836a47537a783afef057053ddb61614611ee1b76 WHIRLPOOL c90eb4c64f46c2f2be9909d09fa9f89217688f35c2bd0cb39234edd413a06a007c668c4097aa613f91e3c3cbc173bd12c728053ab77f7eba93345e65f04c3ba2

+EBUILD qtcore-4.8.5-r2.ebuild 5187 SHA256 98507cfe4857ccafba85d7546e63bdb13bc0d0141fe300fc10ce90e7cf9bab70 SHA512 f666508a41349c552c1e7b21720bc57ac4909e3f4d14cc75ddc99078e2d3f62433652bae95a712f90eaf33066e421125645975b1ad5cfaea39c2d560c9d38aae WHIRLPOOL 27ddcf6d201d85f702ada87c0fdc13f41844f34c072c5ba1903c48644b0527b24ad5394d817903adcadfe25886d8b608006e649b376d3ea6dbdf0273e5d1b131

+MISC ChangeLog 35139 SHA256 ff02f7a19a1dbc351e5968c384e1ff5922fa4534a4ea50b8fdac07912ca926f0 SHA512 bebceb87b34a32c4faf89d412666add3dcae5e67ec011620bdaad29e0f86c5a4ce8ec85e656d69acedf6f6daad34a6301b7b87cdda535e884d0824aeb921b7f9 WHIRLPOOL d5eff5a76a5fa439e0af74319f731684b313adc5ba6f0016945a92505ef8562d21c76a30f6a126953ef4644fd906e04435660a9b98461eefb386131c96562a5d

+Version: GnuPG v2.0

+iQJ8BAEBCABmBQJTuv0xXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w

+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE

+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9sOYQALXKae56ASwKKTJE1xt0XnhM

+iDPsi2+NLEFzDNec7tHms/em2DmgdTvQT64Cui6Ytaa8CVQtUDAcwvk2qvpe8xMR

+IpDDaRcZ25PptofSfbU+Mn6IC+4b3NEG00MVs1gbSj9XnViIl3Z9XSj4xAeOSYpm

+JWVVZ9pFlgf3EE0YCVqAGJZ8wS1Mm6sTIRVUf9Hpj8taYO3EdTSnzIsb/JP86akT

+CllNo5mLusclhEz5akjsBh5l8nuL/2y18V/JVEymmHzJLY8WJ2Y6WkOCjAdxGDXi

+jcAZyen/QmtEUkbHvT4Qs+SIb+NjUOh2wadLJdk/l1OaZ8JTN4fcnfLI7I9rHylo

+xq0Du6I6xQjJx6OlxPAOjkz7QbQ7Sc9Jsf9y9tBbUMLqexRac/2ExG1ZY8Qv4LfX

+iJIRqWVhFCV0qABKFHneRXrBb92yORPwxsAErJjdC0BwA1HE8Xl7W8Lwp6uA+2Dc

+g0cchqa2Q4cRky5VvAa0WSb7uCYMdivYArs7cfnhySvOWwFeViukVyUVLbTOgzQ9

+2Hl/g6kC4LSPepNUz6PeXmCN7XfpQ0A2FtoZxWuOu5l5qSjUwM3zkRXH2wFsYnXg

+10NManGa3fJ0T/YHU+Z0a4OzetxD/Hm0hWzaDJ8FPwJKKMvAPbmUB0Q70lVtvsDT

+tYoLll1FYOwImWOYw9PC

+=YXiM

+From 267feb2de49eed0823ca0c29f1cd5238537c7116 Mon Sep 17 00:00:00 2001

+From: Jan-Marek Glogowski <glogow@fbihome.de>

+Date: Thu, 6 Mar 2014 18:44:43 +0100

+Subject: Honor ExcludeSocketNotifiers in glib event loop

+

+Implements QEventLoop::ExcludeSocketNotifiers in the same way

+QEventLoop::X11ExcludeTimers is already implemented for the glib

+event loop.

+

+This prevents crashes when QClipboard checks for clipboard events

+and

+ qApp->clipboard()->setProperty( "useEventLoopWhenWaiting", true );

+is set.

+

+Task-number: QTBUG-34614

+Task-number: QTBUG-37380

+

+Change-Id: Id4e2a74c6bdf8c3b439a4e3813d24d11368b607d

+---

+ src/corelib/kernel/qeventdispatcher_glib.cpp | 10 ++++++++++

+ 1 file changed, 10 insertions(+)

+

+diff --git a/src/corelib/kernel/qeventdispatcher_glib.cpp b/src/corelib/kernel/qeventdispatcher_glib.cpp

+index 0b0e308..ba522fa 100644

+--- a/src/corelib/kernel/qeventdispatcher_glib.cpp

++++ b/src/corelib/kernel/qeventdispatcher_glib.cpp

+@@ -65,6 +65,7 @@ struct GPollFDWithQSocketNotifier

+ struct GSocketNotifierSource

+ {

+ GSource source;

++ QEventLoop::ProcessEventsFlags processEventsFlags;

+ QList<GPollFDWithQSocketNotifier *> pollfds;

+ };

+

+@@ -80,6 +81,9 @@ static gboolean socketNotifierSourceCheck(GSource *source)

+ GSocketNotifierSource *src = reinterpret_cast<GSocketNotifierSource *>(source);

+

+ bool pending = false;

++ if (src->processEventsFlags & QEventLoop::ExcludeSocketNotifiers)

++ return pending;

++

+ for (int i = 0; !pending && i < src->pollfds.count(); ++i) {

+ GPollFDWithQSocketNotifier *p = src->pollfds.at(i);

+

+@@ -103,6 +107,9 @@ static gboolean socketNotifierSourceDispatch(GSource *source, GSourceFunc, gpoin

+ QEvent event(QEvent::SockAct);

+

+ GSocketNotifierSource *src = reinterpret_cast<GSocketNotifierSource *>(source);

++ if (src->processEventsFlags & QEventLoop::ExcludeSocketNotifiers)

++ return true;

++

+ for (int i = 0; i < src->pollfds.count(); ++i) {

+ GPollFDWithQSocketNotifier *p = src->pollfds.at(i);

+

+@@ -331,6 +338,7 @@ QEventDispatcherGlibPrivate::QEventDispatcherGlibPrivate(GMainContext *context)

+ reinterpret_cast<GSocketNotifierSource *>(g_source_new(&socketNotifierSourceFuncs,

+ sizeof(GSocketNotifierSource)));

+ (void) new (&socketNotifierSource->pollfds) QList<GPollFDWithQSocketNotifier *>();

++ socketNotifierSource->processEventsFlags = QEventLoop::AllEvents;

+ g_source_set_can_recurse(&socketNotifierSource->source, true);

+ g_source_attach(&socketNotifierSource->source, mainContext);

+

+@@ -416,6 +424,7 @@ bool QEventDispatcherGlib::processEvents(QEventLoop::ProcessEventsFlags flags)

+ // tell postEventSourcePrepare() and timerSource about any new flags

+ QEventLoop::ProcessEventsFlags savedFlags = d->timerSource->processEventsFlags;

+ d->timerSource->processEventsFlags = flags;

++ d->socketNotifierSource->processEventsFlags = flags;

+

+ if (!(flags & QEventLoop::EventLoopExec)) {

+ // force timers to be sent at normal priority

+@@ -427,6 +436,7 @@ bool QEventDispatcherGlib::processEvents(QEventLoop::ProcessEventsFlags flags)

+ result = g_main_context_iteration(d->mainContext, canWait);

+

+ d->timerSource->processEventsFlags = savedFlags;

++ d->socketNotifierSource->processEventsFlags = savedFlags;

+

+ if (canWait)

+ emit awake();

+--

+2.0.0

+

+--- src/corelib/kernel/qeventdispatcher_glib.cpp.sav 2014-03-28 15:26:37.000000000 +0100

++++ src/corelib/kernel/qeventdispatcher_glib.cpp 2014-04-24 09:44:09.358659204 +0200

+@@ -255,22 +255,30 @@ struct GPostEventSource

+ GSource source;

+ QAtomicInt serialNumber;

+ int lastSerialNumber;

++ QEventLoop::ProcessEventsFlags processEventsFlags;

+ QEventDispatcherGlibPrivate *d;

+ };

+

+ static gboolean postEventSourcePrepare(GSource *s, gint *timeout)

+ {

++ GPostEventSource *source = reinterpret_cast<GPostEventSource *>(s);

+ QThreadData *data = QThreadData::current();

+ if (!data)

+ return false;

+

++ QEventLoop::ProcessEventsFlags excludeAllFlags

++ = QEventLoop::ExcludeUserInputEvents

++ | QEventLoop::ExcludeSocketNotifiers

++ | QEventLoop::X11ExcludeTimers;

++ if ((source->processEventsFlags & excludeAllFlags) == excludeAllFlags)

++ return false;

++

+ gint dummy;

+ if (!timeout)

+ timeout = &dummy;

+ const bool canWait = data->canWaitLocked();

+ *timeout = canWait ? -1 : 0;

+

+- GPostEventSource *source = reinterpret_cast<GPostEventSource *>(s);

+ return (!canWait

+ || (source->serialNumber != source->lastSerialNumber));

+ }

+@@ -284,8 +292,14 @@ static gboolean postEventSourceDispatch(

+ {

+ GPostEventSource *source = reinterpret_cast<GPostEventSource *>(s);

+ source->lastSerialNumber = source->serialNumber;

+- QCoreApplication::sendPostedEvents();

+- source->d->runTimersOnceWithNormalPriority();

++ QEventLoop::ProcessEventsFlags excludeAllFlags

++ = QEventLoop::ExcludeUserInputEvents

++ | QEventLoop::ExcludeSocketNotifiers

++ | QEventLoop::X11ExcludeTimers;

++ if ((source->processEventsFlags & excludeAllFlags) != excludeAllFlags) {

++ QCoreApplication::sendPostedEvents();

++ source->d->runTimersOnceWithNormalPriority();

++ }

+ return true; // i dunno, george...

+ }

+

+@@ -329,6 +343,7 @@ QEventDispatcherGlibPrivate::QEventDispa

+ postEventSource = reinterpret_cast<GPostEventSource *>(g_source_new(&postEventSourceFuncs,

+ sizeof(GPostEventSource)));

+ postEventSource->serialNumber = 1;

++ postEventSource->processEventsFlags = QEventLoop::AllEvents;

+ postEventSource->d = this;

+ g_source_set_can_recurse(&postEventSource->source, true);

+ g_source_attach(&postEventSource->source, mainContext);

+@@ -423,6 +438,7 @@ bool QEventDispatcherGlib::processEvents

+

+ // tell postEventSourcePrepare() and timerSource about any new flags

+ QEventLoop::ProcessEventsFlags savedFlags = d->timerSource->processEventsFlags;

++ d->postEventSource->processEventsFlags = flags;

+ d->timerSource->processEventsFlags = flags;

+ d->socketNotifierSource->processEventsFlags = flags;

+

+@@ -435,6 +451,7 @@ bool QEventDispatcherGlib::processEvents

+ while (!result && canWait)

+ result = g_main_context_iteration(d->mainContext, canWait);

+

++ d->postEventSource->processEventsFlags = savedFlags;

+ d->timerSource->processEventsFlags = savedFlags;

+ d->socketNotifierSource->processEventsFlags = savedFlags;

+

+--- src/corelib/kernel/qeventdispatcher_unix.cpp.sav 2013-06-07 07:16:52.000000000 +0200

++++ src/corelib/kernel/qeventdispatcher_unix.cpp 2014-04-24 09:43:06.927589535 +0200

+@@ -905,7 +905,15 @@ bool QEventDispatcherUNIX::processEvents

+

+ // we are awake, broadcast it

+ emit awake();

+- QCoreApplicationPrivate::sendPostedEvents(0, 0, d->threadData);

++

++ QEventLoop::ProcessEventsFlags excludeAllFlags

++ = QEventLoop::ExcludeUserInputEvents

++ | QEventLoop::ExcludeSocketNotifiers

++ | QEventLoop::X11ExcludeTimers;

++ if ((flags & excludeAllFlags) == excludeAllFlags)

++ return false;

++ if(( flags & excludeAllFlags ) != excludeAllFlags )

++ QCoreApplicationPrivate::sendPostedEvents(0, 0, d->threadData);

+

+ int nevents = 0;

+ const bool canWait = (d->threadData->canWaitLocked()

+# $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 $

+ "${FILESDIR}/${PN}-4.8.5-moc-boost-lexical-cast.patch"

+# 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

+}