gentoo resync : 13.05.2018

2 files changed, 0 insertions, 82 deletions

diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest
index 991bcb392e82..25139314e231 100644
--- a/dev-qt/qtcore/Manifest
+++ b/dev-qt/qtcore/Manifest
@@ -2,7 +2,6 @@ AUX qtcore-4.8.5-honor-ExcludeSocketNotifiers-in-glib-event-loop.patch 3410 BLAK
 AUX qtcore-4.8.5-qeventdispatcher-recursive.patch 4017 BLAKE2B 13b105b166613516a1f86a5eb50317f0c674d2612f0c39c3e46b4f24fe924f953491f1cd56991fcbd693761075500d7c86b45c70ba213e7bd5856f1833bd1fc9 SHA512 bd63961bcb695beebe8686142b84bff7702db4d85d737f5c2da927252b931700d03602f80048223cbbb05d85a5ddb9cb818321d756577f84843690b318f0c413
 AUX qtcore-4.8.7-libressl.patch 2161 BLAKE2B e6c5c494fe76840c0c3d1c7e91c72a825dd595194368af35ed824552e6e851b961a4f7242acc7982cc7b80331e4190d0544052a5aad29c3beea726306ee19c38 SHA512 c84b827fd5f0c504c9ab95352677dc2cfe926c81aa012b454d8260385215b510835ba693830b3a3a6fa374b299995ec14cbb07711f41031788fc6c3bec396021
 AUX qtcore-4.8.7-moc.patch 926 BLAKE2B 1fd7a9b6d7d69aa110761a587bbe1d13910f4537c0dd60e6f681c8242b150fc23a476d2011211565412f855bc1fb90a58e363d349bb18b40e6e299261e0a5a7a SHA512 cb64e3e2271d3031c11d2c8afe1bcfd5263bcf8b8c787d03059b4bca25f3dd2d8a092c80cb396a1a466d2ef667697c31856c7c675aa7c48b5680f5e91db95f86
-AUX qtcore-5.6.2-plugins.patch 3264 BLAKE2B 232cbd215d8c93475c08f614c74ce0227d23f2cbcfb0e5475295d37a6ee9bc4ed1e7fea8a53a3fc3daa27dc5bcd8e60b72c991048b45234153f549875663f34b SHA512 0d50ba6cd94fc29158931e2e09ec21c48780ecfaa75443efd842cce05cc3030f81a02385714b42d5cede3b0cbf8efc24d3c660ac4438cdd428a24bf8a624bb2d
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125
 DIST qtbase-everywhere-src-5.11.0-rc.tar.xz 46807012 BLAKE2B 76bcc9c71470f09ddb119e0098b58e5f505eb985e39a131100e4b7ddfaa8f5785e534296052631ae1407398e548a8fbf4ce23e05d6d1b5242d35c9ba7d1d08cc SHA512 3cd738f7f3179703275a8604709af70fba4148132ef6f2f8d13f8ea7c767c5f9ae3a11fd96cce49f090ecdf85fa04df0a8551d31d9d05c9efca50ab21ebcfd36
 DIST qtbase-opensource-src-5.9.4.tar.xz 45182168 BLAKE2B 39ecddf2b767c68a9b91e0af10ff3b94ea6074803d22a2fdd3802d32a001ebc302e323b5012fb14b881bf89d031f011d383d3f76f6d28bdeaed61a5bac4f9ce0 SHA512 82be3af6cbe83458a17a5dc53b9f57e56d9c1dbc1bae11e36c5a44e11b1f4cf62ef609cb775f55bfad7be38fbfeffc9cf12dd557bf7c64cbd26634c024a394dd
diff --git a/dev-qt/qtcore/files/qtcore-5.6.2-plugins.patch b/dev-qt/qtcore/files/qtcore-5.6.2-plugins.patch
deleted file mode 100644
index d969869c0855..000000000000
--- a/dev-qt/qtcore/files/qtcore-5.6.2-plugins.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From ca4d93d85ee446c5e30ec8e7814651e45cbf1218 Mon Sep 17 00:00:00 2001
-From: Thiago Macieira <thiago.macieira@intel.com>
-Date: Thu, 12 Nov 2015 10:14:51 -0800
-Subject: Stop unloading plugins in QPluginLoader and QFactoryLoader
-
-QPluginLoader hasn't unloaded in its destructor since Qt 5.0, but we
-missed the equivalent code in QFactoryLoader (which bypasses
-QPluginLoader). Besides, QPluginLoader::unload() was still doing
-unloading, which it won't anymore.
-
-Not unloading plugins is Qt's policy, as decided during the 5.0
-development process and reaffirmed now in 5.6. This is due to static
-data in plugins leaking out and remaining in use past the unloading of
-the plugin, causing crashes.
-
-This does not affect QLibrary and QLibrary::unload(). Those are meant
-for non-Qt loadable modules, so unloading them may be safe.
-
-Task-number: QTBUG-49061
-Discussed-on: http://lists.qt-project.org/pipermail/development/2015-November/023681.html
-Change-Id: I461e9fc7199748faa187ffff1416070f138df8db
-(cherry picked from commit 494376f980e96339b6f1eff7c41336ca4d853065)
-Discussed-again-on: http://lists.qt-project.org/pipermail/development/2016-October/027476.html
-Reviewed-by: Lars Knoll <lars.knoll@qt.io>
----
- src/corelib/plugin/qfactoryloader.cpp | 6 ++++--
- src/corelib/plugin/qpluginloader.cpp  | 5 +++--
- 2 files changed, 7 insertions(+), 4 deletions(-)
-
-diff --git a/src/corelib/plugin/qfactoryloader.cpp b/src/corelib/plugin/qfactoryloader.cpp
-index dcf1b1a..b6558f5 100644
---- a/src/corelib/plugin/qfactoryloader.cpp
-+++ b/src/corelib/plugin/qfactoryloader.cpp
-@@ -208,10 +208,12 @@ void QFactoryLoader::update()
-                     ++keyUsageCount;
-                 }
-             }
--            if (keyUsageCount || keys.isEmpty())
-+            if (keyUsageCount || keys.isEmpty()) {
-+                library->setLoadHints(QLibrary::PreventUnloadHint); // once loaded, don't unload
-                 d->libraryList += library;
--            else
-+            } else {
-                 library->release();
-+            }
-         }
-     }
- #else
-diff --git a/src/corelib/plugin/qpluginloader.cpp b/src/corelib/plugin/qpluginloader.cpp
-index 37f2368..0ea8280 100644
---- a/src/corelib/plugin/qpluginloader.cpp
-+++ b/src/corelib/plugin/qpluginloader.cpp
-@@ -148,6 +148,7 @@ QPluginLoader::QPluginLoader(const QString &fileName, QObject *parent)
-     : QObject(parent), d(0), did_load(false)
- {
-     setFileName(fileName);
-+    setLoadHints(QLibrary::PreventUnloadHint);
- }
- 
- /*!
-@@ -342,7 +343,7 @@ static QString locatePlugin(const QString& fileName)
- void QPluginLoader::setFileName(const QString &fileName)
- {
- #if defined(QT_SHARED)
--    QLibrary::LoadHints lh;
-+    QLibrary::LoadHints lh = QLibrary::PreventUnloadHint;
-     if (d) {
-         lh = d->loadHints();
-         d->release();
-@@ -391,7 +392,7 @@ Q_GLOBAL_STATIC(StaticPluginList, staticPluginList)
-     \brief Give the load() function some hints on how it should behave.
- 
-     You can give hints on how the symbols in the plugin are
--    resolved. By default, none of the hints are set.
-+    resolved. By default since Qt 5.7, QLibrary::PreventUnloadHint is set.
- 
-     See the documentation of QLibrary::loadHints for a complete
-     description of how this property works.
--- 
-cgit v1.0-4-g1e03
-