aboutsummaryrefslogtreecommitdiff
path: root/dev-qt
diff options
context:
space:
mode:
authorAric Belsito <lluixhi@gmail.com>2016-12-14 13:01:04 -0800
committerAric Belsito <lluixhi@gmail.com>2016-12-14 13:01:04 -0800
commit07cc0b0a7903ab0743095b6e4120f3c11efe9190 (patch)
treec2b76b25fc66c1ccb1f5179959464150ddbebac1 /dev-qt
parentapp-misc/pax-utils: Add latest version (diff)
downloadmusl-07cc0b0a7903ab0743095b6e4120f3c11efe9190.tar.gz
musl-07cc0b0a7903ab0743095b6e4120f3c11efe9190.tar.bz2
musl-07cc0b0a7903ab0743095b6e4120f3c11efe9190.zip
dev-qt/qtcore: Bump to 5.7.1
Sync with tree.
Diffstat (limited to 'dev-qt')
-rw-r--r--dev-qt/qtcore/Manifest7
-rw-r--r--dev-qt/qtcore/files/qtcore-5.6.2-plugins.patch81
-rw-r--r--dev-qt/qtcore/qtcore-5.6.2-r1.ebuild (renamed from dev-qt/qtcore/qtcore-5.6.2.ebuild)3
-rw-r--r--dev-qt/qtcore/qtcore-5.7.1.ebuild (renamed from dev-qt/qtcore/qtcore-5.7.0.ebuild)1
4 files changed, 88 insertions, 4 deletions
diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest
index 311cab35..3b0f5b13 100644
--- a/dev-qt/qtcore/Manifest
+++ b/dev-qt/qtcore/Manifest
@@ -4,14 +4,15 @@ AUX qtcore-4.8.6-QNAM-corruptions-fix.patch 17586 SHA256 5309c0f1ed0fc54799537b6
AUX qtcore-4.8.6-moc-boost-1.60.patch 884 SHA256 cf7417eb14641c0e4f65148f67cab2af74ef2f20cb245ef9e21b8a0b2d8f0c0d SHA512 f7375b444291cd0abf5324aa9150e3eb49e110713826e2aa03d8a149d6727c1ff2fe6f6b2e159f3a9e41c628a6d5f3e6ea161050722f58ca0e9ad269a27c052d WHIRLPOOL 7d86baf0ceeb2259fc319d7908f47d2c64f98e490e9bda3930137db5808c9cd0fb2877ac3731bfaaba7ed19a8c014904054b08545642588650b58504ec52e378
AUX qtcore-4.8.7-fix-socklent-for-musl.patch 3982 SHA256 2d3065b3a372ae03a58ee76a4a24e676abc36a16f5c564b4b25c537d2520700d SHA512 d578fa49270ae8d18ff4de3a15b6f4c485503c1de61e9732e6e55d0bd3db5a0c2e68d37327e500b71a85efe05b187f435d2e4c62f23481c73a9d593803ca345c WHIRLPOOL e95016f372dc7cfff32609b838774a339320073fde9c90aa92b0ee8003bbf740a545cb500518bdd611553016bc8d9f21ea060b97742478105474561d6f3ae3d4
AUX qtcore-5.5.1-musl-iconv.patch 672 SHA256 fcf5db5f11197079725bbd2ce3ef2b6e53db0ed0b73514a11c831605f7ae0226 SHA512 ee32f08044f0f247e901209ef8e72868bf856cf7b4a490ae05d621eba931b9b37d088dd90700cc83929b5331a7452e5daa046b145076a9e7499180919560e4ed WHIRLPOOL e1d6496703ede9db343df8afdef1276cbbd4eabf9cc5929c26cb267b01fd801bdac8847de8040a57fc3cb9533f8ab308f0176bb5389640ac9b73ad0677c5c107
+AUX qtcore-5.6.2-plugins.patch 3264 SHA256 2e0e863830f457d597e608815e92c25e4e0924a7c13c80649547e8a9be6bb420 SHA512 0d50ba6cd94fc29158931e2e09ec21c48780ecfaa75443efd842cce05cc3030f81a02385714b42d5cede3b0cbf8efc24d3c660ac4438cdd428a24bf8a624bb2d WHIRLPOOL 9ea062360162c636f43d7b490a3ee3931496b05001f9f0c99d588494d344f0a7a9d0e989b5695e468ec754e7bc789b2c2961db221701d8adf984efd691ee2a92
DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84
DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 SHA256 e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 WHIRLPOOL ad8f01172f5bdb3a3a69fe7b03862c4c411bc8d95211053ad66ed1d60a3c0577d073d1075a1e0a80b25d9b2721addda55a2967e6ccf5e194cec8d08770ac5fc2
DIST qtbase-opensource-src-5.6.1-1.tar.xz 46788436 SHA256 329678347ec5ebb404225345300a8deb1e7c991322a4c50584be550c69be7c39 SHA512 e9660bee2e0acd91c3232831e4f1a99ad30b82b8ff26850494efec89a525499b721adfb63f7ede586408489d3ebf727b842cd12eab665c58769001454e7f661d WHIRLPOOL e26cf72d9644dbcb08d1269bdaa633be2e24de813deb62a1c77e448b6578f6761769664fc95c4131c342f077c092a777af8fed62ea35e5fdb0f2576d82b3c499
DIST qtbase-opensource-src-5.6.2.tar.xz 46825164 SHA256 2f6eae93c5d982fe0a387a01aeb3435571433e23e9d9d9246741faf51f1ee787 SHA512 ff55204e6f0b046ccb03430ac6a22bd743bc2f3822625f0c23a481a8a7acb5d93f5b8e900815c70f10554887fbe26b3ee79f6d702acfa5c370e4e3cbd1f2b321 WHIRLPOOL 4a68aae4e471b0cfac3abf3652bb18cac8ffce17c941c8589a154bf07eb8d26945fab535f2e1acb866a584584c1811e953aa19fb1b3709831d85a620f0b6dc5a
-DIST qtbase-opensource-src-5.7.0.tar.xz 43993020 SHA256 3e7b6d123cab23a587ccbc45173296b33786faa409dba0494e4658fda3ede646 SHA512 c082b835839ff23ce10463ccc364a0ee6255b4f48409c485181be8e039f5cdf00efa41ec220ddbd9b41e5c8a9fa29327af0e3450e10294b64bb729053eb7c63d WHIRLPOOL 2ba79ed2717ac7876228d9ab6455f97e0689f5d297dfc2fa7d089bde6b1c6bc38f30a467477482bb3af9e19afe95f5f5dbd76bcc835281ce473564cf45a77a92
+DIST qtbase-opensource-src-5.7.1.tar.xz 44992616 SHA256 edcdf549d94d98aff08e201dcb3ca25bc3628a37b1309e320d5f556b6b66557e SHA512 0506a3a856f76e5ba182e3382a515282b6096f3900fbdc14cd5aec425105ab61922e0ada0361234387335ceb80b3c69e39cd34d75476c2946c4371e7b8c0827f WHIRLPOOL de5ff1380b3fd9cbcca741d212ac516e3f8a31366219605730cf5525a04e4efc9965a9b3cf8e99f50a2912bc7add83f61e7f90a85e176ad2830e4c1422b5d682
EBUILD qtcore-4.8.6-r2.ebuild 2806 SHA256 be80c0b1aaaa62e915d9c5c3472d4670a48aad668261bc6ba3d062ee6c7504df SHA512 b486015c9685475000ded203996295215c30667aff62e5d09e394cb565d96246b3ec8d47d78e5d4178d99257429d0efb81ac08ee50283aeb75da65396e322cff WHIRLPOOL 18de319600a5f0e76d3dfa0b7ed2e6d1c77137344d42deb86d31a33275a252a84136effa69d60d648ed7c7f6e4488e5fc8db19e22a61b00513e38e561c78dc79
EBUILD qtcore-4.8.7-r2.ebuild 2880 SHA256 8bd194a4c096217136a594e0ba24e7a2e1df13a6f485e6e132860a14aec3655b SHA512 f7434e86c037ba3957ec3472841e12b2ddeba6e21dbb776590ed3ac9eab24074fecd822d1cd7b226bd14d5fd4cfe25020eebc830f04438014a410bb5cebd7795 WHIRLPOOL e27ff515b43a2bb29ec24424948b0e53013e52b29f2910378163721b7bb9c4a342165782ff48194b933a894293853e5df9874d28d30f5711f0923bd85b5b99e2
EBUILD qtcore-5.6.1.ebuild 801 SHA256 75fb1db3e435b710e1ab449285eec2b686cb64a725748555b8ac52ee79a1c0d9 SHA512 983320395fefdb0a5a5148e1555c9bb76759e388e2475822ed5cb5ff7c46b8c9e7a680c0fa4f4faeada32a230ceb5076f640c22a7dda2c5f16fb0364c7695c73 WHIRLPOOL 5e9f40c3e01eec002707fd7c62e73e6a21669b1214865498ef8a886701eca5d85bd3e74eb054cb018a75d7774d0d9c3e9eb3de60c4f5b2c09c1e6cde49a03dbd
-EBUILD qtcore-5.6.2.ebuild 807 SHA256 414fcd42f535a7eecc71037373c343d7d683875d085b48a65e4eae0a9373659a SHA512 b8a2f291e0b838bd4b559629e4001fd0e8e5d38abbc27f9d4e979a114122e5ffe1cf7c44029731c59d3b90d4cf1d95204ff08ded12c384d777122004599cc950 WHIRLPOOL c51faffa1bebc71cc537148c74623639ccc420c8f33f4d848319b97b40cb0688042356d681a263d87a60f3fc8435844231c1e580eaa5f69faa8b4e8a022b7b19
-EBUILD qtcore-5.7.0.ebuild 861 SHA256 25840ff9ef465bb40f3d46e10cc45159699a4d29f647f1f184b230e0f509f1de SHA512 2480f409de9b4e41bc6fe45ab076f31dc0aefadfeaa2dc71ed2d1f7dcd6a54044b6c93b6e4a64d9a8421708a72f215b9c802de9625347fa3dc754522321f935d WHIRLPOOL e8793ec772efb92b558bafa28916623ccd8a23ea9511744896da9973c286997ef98b84af47d14dde217aaa919322b466c80eb39e85b22e00794c3d0162e852ad
+EBUILD qtcore-5.6.2-r1.ebuild 839 SHA256 442865d61167a573b9988416cc89035d99e2a05c61373fe6edc86ed93ecf37c4 SHA512 f83180dd5ac8ef9a52569bd27269489a7f082cf4ed7153d5d21ebe9a663ca4bf68e35e833b899cef8e59b216fc311916255929aa806c164278e86b9024001f05 WHIRLPOOL cd7b6c0a05f6eb640e7359863b3626cf6b5d7073cf845edb1b9d4d50f0522ef880bee002b4b5c2d283ccbaac0083557f3c584a92398593334d2d67524fa6807b
+EBUILD qtcore-5.7.1.ebuild 866 SHA256 4c643944854b7095f6ce863f9f951aeb12aa042413cacf7b3859f5abe5d15439 SHA512 3f1ca16b47c2f379e91977bb9a79d8be9c9556f1cabc9b1d4f43692dde427d034fdb3c230ccfbaa0ac9a94e3d4ff5564f27e33b3d6419fee4806332f0dd39939 WHIRLPOOL 69018723ae56d43b70eed4fbe6d4e726597d698a4d4629afa6abf549458ad184d930d7eb93742b974c4105e437b69092c2e1c326221fe48c690892fdccfcb397
MISC metadata.xml 923 SHA256 22b0c054608f0f06da6d5e08acca625e153346ef3c0281dd93a89bc3f9efc7e1 SHA512 c3cc5ea943e59fd44ffded076df311a62dd5fb7ff2ab197f6118604a0e26e30f44377e0b8bb3edcddbda19ea52c0a26cf6451625dd17185c511d5d051e3ad915 WHIRLPOOL 7061ff30ae1b083e1328c0080d08631a3e9ffc1986f729f9e1ae269d7ba243345859a87cdb020a3eaabd40c78c9fcaa159adfc53a3729e87ae82bf49d7530f59
diff --git a/dev-qt/qtcore/files/qtcore-5.6.2-plugins.patch b/dev-qt/qtcore/files/qtcore-5.6.2-plugins.patch
new file mode 100644
index 00000000..d969869c
--- /dev/null
+++ b/dev-qt/qtcore/files/qtcore-5.6.2-plugins.patch
@@ -0,0 +1,81 @@
+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
+
diff --git a/dev-qt/qtcore/qtcore-5.6.2.ebuild b/dev-qt/qtcore/qtcore-5.6.2-r1.ebuild
index e405b9e0..bf44921e 100644
--- a/dev-qt/qtcore/qtcore-5.6.2.ebuild
+++ b/dev-qt/qtcore/qtcore-5.6.2-r1.ebuild
@@ -9,7 +9,7 @@ inherit qt5-build
DESCRIPTION="Cross-platform application development framework"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86"
fi
IUSE="icu systemd"
@@ -25,6 +25,7 @@ DEPEND="
RDEPEND="${DEPEND}"
PATCHES=(
+ "${FILESDIR}/${P}-plugins.patch"
"${FILESDIR}/${PN}-5.5.1-musl-iconv.patch"
)
diff --git a/dev-qt/qtcore/qtcore-5.7.0.ebuild b/dev-qt/qtcore/qtcore-5.7.1.ebuild
index 859da9c3..14c96ee0 100644
--- a/dev-qt/qtcore/qtcore-5.7.0.ebuild
+++ b/dev-qt/qtcore/qtcore-5.7.1.ebuild
@@ -35,6 +35,7 @@ QT5_TARGET_SUBDIRS=(
src/tools/rcc
src/corelib
src/tools/qlalr
+ doc
)
src_configure() {