gentoo resync : 08.08.2018

4 files changed, 0 insertions, 244 deletions

diff --git a/dev-qt/qtcore/files/qtcore-4.8.5-honor-ExcludeSocketNotifiers-in-glib-event-loop.patch b/dev-qt/qtcore/files/qtcore-4.8.5-honor-ExcludeSocketNotifiers-in-glib-event-loop.patch
deleted file mode 100644
index 0fcc1fa6561d..000000000000
--- a/dev-qt/qtcore/files/qtcore-4.8.5-honor-ExcludeSocketNotifiers-in-glib-event-loop.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-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
-
diff --git a/dev-qt/qtcore/files/qtcore-4.8.5-qeventdispatcher-recursive.patch b/dev-qt/qtcore/files/qtcore-4.8.5-qeventdispatcher-recursive.patch
deleted file mode 100644
index 6d3bf2f2cde2..000000000000
--- a/dev-qt/qtcore/files/qtcore-4.8.5-qeventdispatcher-recursive.patch
+++ /dev/null
@@ -1,94 +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()
diff --git a/dev-qt/qtcore/files/qtcore-4.8.7-libressl.patch b/dev-qt/qtcore/files/qtcore-4.8.7-libressl.patch
deleted file mode 100644
index b838c7a687b6..000000000000
--- a/dev-qt/qtcore/files/qtcore-4.8.7-libressl.patch
+++ /dev/null
@@ -1,52 +0,0 @@
---- src/network/ssl/qsslsocket_openssl_symbols.cpp.orig	2015-11-25 01:38:42.103898399 -0500
-+++ src/network/ssl/qsslsocket_openssl_symbols.cpp	2015-11-25 01:40:50.146247648 -0500
-@@ -224,13 +224,17 @@
- #ifndef OPENSSL_NO_SSL2
- DEFINEFUNC(const SSL_METHOD *, SSLv2_client_method, DUMMYARG, DUMMYARG, return 0, return)
- #endif
-+#ifndef OPENSSL_NO_SSL3
- DEFINEFUNC(const SSL_METHOD *, SSLv3_client_method, DUMMYARG, DUMMYARG, return 0, return)
-+#endif
- DEFINEFUNC(const SSL_METHOD *, SSLv23_client_method, DUMMYARG, DUMMYARG, return 0, return)
- DEFINEFUNC(const SSL_METHOD *, TLSv1_client_method, DUMMYARG, DUMMYARG, return 0, return)
- #ifndef OPENSSL_NO_SSL2
- DEFINEFUNC(const SSL_METHOD *, SSLv2_server_method, DUMMYARG, DUMMYARG, return 0, return)
- #endif
-+#ifndef OPENSSL_NO_SSL3
- DEFINEFUNC(const SSL_METHOD *, SSLv3_server_method, DUMMYARG, DUMMYARG, return 0, return)
-+#endif
- DEFINEFUNC(const SSL_METHOD *, SSLv23_server_method, DUMMYARG, DUMMYARG, return 0, return)
- DEFINEFUNC(const SSL_METHOD *, TLSv1_server_method, DUMMYARG, DUMMYARG, return 0, return)
- #else
-@@ -818,13 +822,17 @@
- #ifndef OPENSSL_NO_SSL2
-     RESOLVEFUNC(SSLv2_client_method)
- #endif
-+#ifndef OPENSSL_NO_SSL3
-     RESOLVEFUNC(SSLv3_client_method)
-+#endif
-     RESOLVEFUNC(SSLv23_client_method)
-     RESOLVEFUNC(TLSv1_client_method)
- #ifndef OPENSSL_NO_SSL2
-     RESOLVEFUNC(SSLv2_server_method)
- #endif
-+#ifndef OPENSSL_NO_SSL3
-     RESOLVEFUNC(SSLv3_server_method)
-+#endif
-     RESOLVEFUNC(SSLv23_server_method)
-     RESOLVEFUNC(TLSv1_server_method)
-     RESOLVEFUNC(X509_NAME_entry_count)
---- src/network/ssl/qsslsocket_openssl.cpp.orig	2015-11-25 01:44:55.235087906 -0500
-+++ src/network/ssl/qsslsocket_openssl.cpp	2015-11-25 01:45:45.194443818 -0500
-@@ -263,7 +263,11 @@
- #endif
-         break;
-     case QSsl::SslV3:
-+#ifndef OPENSSL_NO_SSL3
-         ctx = q_SSL_CTX_new(client ? q_SSLv3_client_method() : q_SSLv3_server_method());
-+#else
-+        ctx = 0; // SSL 3 not supported by the system, but chosen deliberately -> error
-+#endif
-         break;
-     case QSsl::SecureProtocols: // SslV2 will be disabled below
-     case QSsl::TlsV1SslV3: // SslV2 will be disabled below
diff --git a/dev-qt/qtcore/files/qtcore-4.8.7-moc.patch b/dev-qt/qtcore/files/qtcore-4.8.7-moc.patch
deleted file mode 100644
index 7660dedc1630..000000000000
--- a/dev-qt/qtcore/files/qtcore-4.8.7-moc.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -up qt-everywhere-opensource-src-4.8.7/src/tools/moc/main.cpp.QTBUG-22829 qt-everywhere-opensource-src-4.8.7/src/tools/moc/main.cpp
---- qt-everywhere-opensource-src-4.8.7/src/tools/moc/main.cpp.QTBUG-22829	2015-05-07 09:14:44.000000000 -0500
-+++ qt-everywhere-opensource-src-4.8.7/src/tools/moc/main.cpp	2016-03-16 13:20:43.145899869 -0500
-@@ -188,8 +188,12 @@ int runMoc(int _argc, char **_argv)
-     pp.macros["Q_MOC_RUN"];
-     pp.macros["__cplusplus"];
- 
--    // Workaround a bug while parsing the boost/type_traits/has_operator.hpp header. See QTBUG-22829
-+    // Workaround a bug while parsing some boost headers. See QTBUG-22829
-     pp.macros["BOOST_TT_HAS_OPERATOR_HPP_INCLUDED"];
-+    pp.macros["BOOST_LEXICAL_CAST_INCLUDED"];
-+    pp.macros["BOOST_NEXT_PRIOR_HPP_INCLUDED"];
-+    pp.macros["BOOST_TYPE_TRAITS_HPP"];
-+    pp.macros["_SYS_SYSMACROS_H_OUTER"];
- 
-     QByteArray filename;
-     QByteArray output;