* [gentoo-commits] proj/musl:master commit in: dev-qt/qtcore/, dev-qt/qtcore/files/
@ 2016-11-09 19:49 Aric Belsito
0 siblings, 0 replies; 4+ messages in thread
From: Aric Belsito @ 2016-11-09 19:49 UTC (permalink / raw
To: gentoo-commits
commit: ea2738ac9f004cb142c780d2e669c6681853ce4b
Author: Aric Belsito <lluixhi <AT> gmail <DOT> com>
AuthorDate: Wed Nov 9 19:39:04 2016 +0000
Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Wed Nov 9 19:39:04 2016 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=ea2738ac
dev-qt/qtcore: Add qtcore 5.x
These versions of qtcore require a patch that disables byte-order-marks, because
musl does not have them in UTF16
dev-qt/qtcore/Manifest | 7 ++++
dev-qt/qtcore/files/qtcore-5.5.1-musl-iconv.patch | 12 ++++++
dev-qt/qtcore/qtcore-5.6.1.ebuild | 45 ++++++++++++++++++++++
dev-qt/qtcore/qtcore-5.6.2.ebuild | 45 ++++++++++++++++++++++
dev-qt/qtcore/qtcore-5.7.0.ebuild | 46 +++++++++++++++++++++++
5 files changed, 155 insertions(+)
diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest
index 00d6d55..311cab3 100644
--- a/dev-qt/qtcore/Manifest
+++ b/dev-qt/qtcore/Manifest
@@ -3,8 +3,15 @@ AUX qtcore-4.8.5-qeventdispatcher-recursive.patch 4017 SHA256 5db36cbb0686b8a503
AUX qtcore-4.8.6-QNAM-corruptions-fix.patch 17586 SHA256 5309c0f1ed0fc54799537b6d0a51b9682f52b4b40cc76e6fa71afc7273120e40 SHA512 4367974513b230d0395d0d0ebff5007255c257126309b614c37e8297981b833b397792fe9dede1960e0027a87d3fbc5eb252253a7ed73f4f9383531ea39cc874 WHIRLPOOL 8eded4f95d00f2ce572cf1956745d5a06e07f54a6ed6e67578914c0d2c9be63994cbf9177212d25c3c2678bf7328b2364b5977ebb8e8d7b8e4ad79009be6a7ae
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
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
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
MISC metadata.xml 923 SHA256 22b0c054608f0f06da6d5e08acca625e153346ef3c0281dd93a89bc3f9efc7e1 SHA512 c3cc5ea943e59fd44ffded076df311a62dd5fb7ff2ab197f6118604a0e26e30f44377e0b8bb3edcddbda19ea52c0a26cf6451625dd17185c511d5d051e3ad915 WHIRLPOOL 7061ff30ae1b083e1328c0080d08631a3e9ffc1986f729f9e1ae269d7ba243345859a87cdb020a3eaabd40c78c9fcaa159adfc53a3729e87ae82bf49d7530f59
diff --git a/dev-qt/qtcore/files/qtcore-5.5.1-musl-iconv.patch b/dev-qt/qtcore/files/qtcore-5.5.1-musl-iconv.patch
new file mode 100644
index 0000000..fe11d1d
--- /dev/null
+++ b/dev-qt/qtcore/files/qtcore-5.5.1-musl-iconv.patch
@@ -0,0 +1,12 @@
+diff -Naurw qtbase-opensource-src-5.5.1.orig/src/corelib/codecs/qiconvcodec.cpp qtbase-opensource-src-5.5.1/src/corelib/codecs/qiconvcodec.cpp
+--- qtbase-opensource-src-5.5.1.orig/src/corelib/codecs/qiconvcodec.cpp 2016-01-25 14:23:16.960351969 -0800
++++ qtbase-opensource-src-5.5.1/src/corelib/codecs/qiconvcodec.cpp 2016-01-25 14:24:52.743350254 -0800
+@@ -56,7 +56,7 @@
+ #elif defined(Q_OS_AIX)
+ # define NO_BOM
+ # define UTF16 "UCS-2"
+-#elif defined(Q_OS_FREEBSD) || defined(Q_OS_MAC)
++#elif defined(Q_OS_FREEBSD) || defined(Q_OS_MAC) || (defined(Q_OS_LINUX) && !defined(__GLIBC__))
+ # define NO_BOM
+ # if Q_BYTE_ORDER == Q_BIG_ENDIAN
+ # define UTF16 "UTF-16BE"
diff --git a/dev-qt/qtcore/qtcore-5.6.1.ebuild b/dev-qt/qtcore/qtcore-5.6.1.ebuild
new file mode 100644
index 0000000..51ba9fa
--- /dev/null
+++ b/dev-qt/qtcore/qtcore-5.6.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+QT5_MODULE="qtbase"
+inherit qt5-build
+
+DESCRIPTION="Cross-platform application development framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+ KEYWORDS="amd64 arm ~arm64 hppa ppc ppc64 x86"
+fi
+
+IUSE="icu systemd"
+
+DEPEND="
+ dev-libs/glib:2
+ >=dev-libs/libpcre-8.38[pcre16,unicode]
+ >=sys-libs/zlib-1.2.5
+ virtual/libiconv
+ icu? ( dev-libs/icu:= )
+ systemd? ( sys-apps/systemd:= )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-5.5.1-musl-iconv.patch"
+)
+
+QT5_TARGET_SUBDIRS=(
+ src/tools/bootstrap
+ src/tools/moc
+ src/tools/rcc
+ src/corelib
+ src/tools/qlalr
+)
+
+src_configure() {
+ local myconf=(
+ $(qt_use icu)
+ $(qt_use systemd journald)
+ )
+ qt5-build_src_configure
+}
diff --git a/dev-qt/qtcore/qtcore-5.6.2.ebuild b/dev-qt/qtcore/qtcore-5.6.2.ebuild
new file mode 100644
index 0000000..e405b9e
--- /dev/null
+++ b/dev-qt/qtcore/qtcore-5.6.2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+QT5_MODULE="qtbase"
+inherit qt5-build
+
+DESCRIPTION="Cross-platform application development framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+fi
+
+IUSE="icu systemd"
+
+DEPEND="
+ dev-libs/glib:2
+ >=dev-libs/libpcre-8.38[pcre16,unicode]
+ >=sys-libs/zlib-1.2.5
+ virtual/libiconv
+ icu? ( dev-libs/icu:= )
+ systemd? ( sys-apps/systemd:= )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-5.5.1-musl-iconv.patch"
+)
+
+QT5_TARGET_SUBDIRS=(
+ src/tools/bootstrap
+ src/tools/moc
+ src/tools/rcc
+ src/corelib
+ src/tools/qlalr
+)
+
+src_configure() {
+ local myconf=(
+ $(qt_use icu)
+ $(qt_use systemd journald)
+ )
+ qt5-build_src_configure
+}
diff --git a/dev-qt/qtcore/qtcore-5.7.0.ebuild b/dev-qt/qtcore/qtcore-5.7.0.ebuild
new file mode 100644
index 0000000..859da9c
--- /dev/null
+++ b/dev-qt/qtcore/qtcore-5.7.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+QT5_MODULE="qtbase"
+inherit qt5-build
+
+DESCRIPTION="Cross-platform application development framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+fi
+
+IUSE="icu systemd"
+
+# TODO after bug 581054: dev-libs/double-conversion:=
+DEPEND="
+ dev-libs/glib:2
+ >=dev-libs/libpcre-8.38[pcre16,unicode]
+ >=sys-libs/zlib-1.2.5
+ virtual/libiconv
+ icu? ( dev-libs/icu:= )
+ systemd? ( sys-apps/systemd:= )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-5.5.1-musl-iconv.patch"
+)
+
+QT5_TARGET_SUBDIRS=(
+ src/tools/bootstrap
+ src/tools/moc
+ src/tools/rcc
+ src/corelib
+ src/tools/qlalr
+)
+
+src_configure() {
+ local myconf=(
+ $(qt_use icu)
+ $(qt_use systemd journald)
+ )
+ qt5-build_src_configure
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] proj/musl:master commit in: dev-qt/qtcore/, dev-qt/qtcore/files/
@ 2016-12-14 21:19 Aric Belsito
0 siblings, 0 replies; 4+ messages in thread
From: Aric Belsito @ 2016-12-14 21:19 UTC (permalink / raw
To: gentoo-commits
commit: 07cc0b0a7903ab0743095b6e4120f3c11efe9190
Author: Aric Belsito <lluixhi <AT> gmail <DOT> com>
AuthorDate: Wed Dec 14 21:01:04 2016 +0000
Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Wed Dec 14 21:01:04 2016 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=07cc0b0a
dev-qt/qtcore: Bump to 5.7.1
Sync with tree.
dev-qt/qtcore/Manifest | 7 +-
dev-qt/qtcore/files/qtcore-5.6.2-plugins.patch | 81 ++++++++++++++++++++++
...{qtcore-5.6.2.ebuild => qtcore-5.6.2-r1.ebuild} | 3 +-
.../{qtcore-5.7.0.ebuild => qtcore-5.7.1.ebuild} | 1 +
4 files changed, 88 insertions(+), 4 deletions(-)
diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest
index 311cab3..3b0f5b1 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 0000000..d969869
--- /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
similarity index 89%
rename from dev-qt/qtcore/qtcore-5.6.2.ebuild
rename to dev-qt/qtcore/qtcore-5.6.2-r1.ebuild
index e405b9e..bf44921 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
similarity index 99%
rename from dev-qt/qtcore/qtcore-5.7.0.ebuild
rename to dev-qt/qtcore/qtcore-5.7.1.ebuild
index 859da9c..14c96ee 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() {
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] proj/musl:master commit in: dev-qt/qtcore/, dev-qt/qtcore/files/
@ 2017-05-18 16:30 Aric Belsito
0 siblings, 0 replies; 4+ messages in thread
From: Aric Belsito @ 2017-05-18 16:30 UTC (permalink / raw
To: gentoo-commits
commit: ac4777846d68c1559dbc4bdc77df46c75648c74a
Author: Aric Belsito <lluixhi <AT> gmail <DOT> com>
AuthorDate: Thu May 18 16:27:24 2017 +0000
Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Thu May 18 16:27:24 2017 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=ac477784
dev-qt/qtcore: appease repoman
remove qtcore-5.6.1, sync 4.8.7
dev-qt/qtcore/Manifest | 5 +--
dev-qt/qtcore/files/qtcore-4.8.7-libressl.patch | 52 +++++++++++++++++++++++++
dev-qt/qtcore/qtcore-4.8.7-r2.ebuild | 5 ++-
dev-qt/qtcore/qtcore-5.6.1.ebuild | 44 ---------------------
4 files changed, 57 insertions(+), 49 deletions(-)
diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest
index 91e7a19..ae85bf7 100644
--- a/dev-qt/qtcore/Manifest
+++ b/dev-qt/qtcore/Manifest
@@ -3,6 +3,7 @@ AUX qtcore-4.8.5-qeventdispatcher-recursive.patch 4017 SHA256 5db36cbb0686b8a503
AUX qtcore-4.8.6-QNAM-corruptions-fix.patch 17586 SHA256 5309c0f1ed0fc54799537b6d0a51b9682f52b4b40cc76e6fa71afc7273120e40 SHA512 4367974513b230d0395d0d0ebff5007255c257126309b614c37e8297981b833b397792fe9dede1960e0027a87d3fbc5eb252253a7ed73f4f9383531ea39cc874 WHIRLPOOL 8eded4f95d00f2ce572cf1956745d5a06e07f54a6ed6e67578914c0d2c9be63994cbf9177212d25c3c2678bf7328b2364b5977ebb8e8d7b8e4ad79009be6a7ae
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-4.8.7-libressl.patch 2161 SHA256 c01d0225d593a87d5764993be9a53b0adbf9493487ad7c5583ef3abcb35b1c4d SHA512 c84b827fd5f0c504c9ab95352677dc2cfe926c81aa012b454d8260385215b510835ba693830b3a3a6fa374b299995ec14cbb07711f41031788fc6c3bec396021 WHIRLPOOL 26274cc870721bcbb364a3e41aa95af0d7d5561b0882ca4bf058c036a063fe3fa77072f09a0d84ffb1f0a6dab2201d03c8602a2d5f7815752cfdb9180e2689a1
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
AUX qtcore-5.7.1-qipm.patch 5915 SHA256 a5fb3bee98d797ac5e34bec02bcc1b5b0834fa1092fa6d1e1ea3d490975ae42f SHA512 807c030c2059cddcd159cb537ba2e4be68d6f612f45e1e7b844fc045f661739aea7bc35743735cee364d692d51774e17edced1aac8d444abaa4e4435117a5b3d WHIRLPOOL e13e1a24b750fe7729b1d86214491358937344b7a39c6c2941d372f5ce9077ecc1c320a0be2e5a9c772e1b01d786e55176cdad252c317bc62215c9c7acfe0d6b
@@ -10,12 +11,10 @@ AUX qtcore-5.7.1-qsfpm-1.patch 8922 SHA256 3376b4564d793e0bf3770a8ebcc474a03e7aa
AUX qtcore-5.7.1-qsfpm-2.patch 7812 SHA256 a2bb1a42df644906cacb084e579166e8229c774e2f678b8b523215d4bbffe1e7 SHA512 38b141aa7d30011d71ed9044c69f79b56698320600a64ed3cc37e8dd9d22bb9ec2f33f8348d074552a5046c2855e948e325d5421384cb4c66c0bbd566500174d WHIRLPOOL 3e65f1413ce3b3800d694b731d74026ac5d5f08f9af20b257c2b7424ec954cb1fa28067496b028c3e66680ae88e59d8ccf8c080b049fa05f31162705db1a0898
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.1.tar.xz 44992616 SHA256 edcdf549d94d98aff08e201dcb3ca25bc3628a37b1309e320d5f556b6b66557e SHA512 0506a3a856f76e5ba182e3382a515282b6096f3900fbdc14cd5aec425105ab61922e0ada0361234387335ceb80b3c69e39cd34d75476c2946c4371e7b8c0827f WHIRLPOOL de5ff1380b3fd9cbcca741d212ac516e3f8a31366219605730cf5525a04e4efc9965a9b3cf8e99f50a2912bc7add83f61e7f90a85e176ad2830e4c1422b5d682
EBUILD qtcore-4.8.6-r2.ebuild 2799 SHA256 7c971b11ea1f2eaadd8b512194825c9b20476b87a4fb30bc4aa26972e3ea22fe SHA512 f6c99ecff25ae7feba10d2290a4358cd41364b16f8a7eb816e3f7fa5c264712b0b19db1a96a136919d58ba522e2a914e521780be08b8277ddc61148ff490a536 WHIRLPOOL 774e63fb9c6feb60a7206a5e1761f1b5198c287403daa95f7324ed88ed700aab0bd109b77f8c2c73999cd2fad47c640bcc10383ff3cee9a7e527955617b12f51
-EBUILD qtcore-4.8.7-r2.ebuild 2873 SHA256 31208511c2f5a6ca50e242f6c5ecd690dce27bb8ccfa138e1a7e38577a1802ff SHA512 6d9fbdc9a0576f84f6fc1b79b7fdac9e43b9657185327e4ff49d0f73e5f0987488d3bc6b3f7ae8ee35625bc1da9daa1f7331f136ce8d2efb45f9f205375dda84 WHIRLPOOL a482554be76fa053b948de816e3db3fda0c2163b48c64c231bda4efa72e2d97b76f6d91a172017d7f8a13f07c9b8f96692dee8592abf1b8e073a946a362fe5e3
-EBUILD qtcore-5.6.1.ebuild 794 SHA256 1da435d29fa89f6638503bf2049697b39bbfb6e20e8243c2b84604aa51a6a450 SHA512 d36f7ca356e52cf78bdcb9f9e466a4369a6f9a09dc1daa889efe4df2d0c97c80c3aa6571bad6c002a45f9a1ada7ec0147b81967e661695423e68c75314809d5e WHIRLPOOL 8a0be06d6d1205cfad442278637cd9feaff92169a955b6d5d490f29753bdee28dc2d036b7b9955db16d502324a16956d89287b6d7f8f883cc84fb4231c0f2c3e
+EBUILD qtcore-4.8.7-r2.ebuild 2927 SHA256 6c9f674bf2dcc0d13f3bc7c224f6f890143e05adf650abdced3ff2334994b6dd SHA512 1d92977590e437e00be5590c9e438d455dd7b5067fc3af299e8ee7a12579d7fb9aaae1ed1b90846bfabf7deccd47c433804d93bcf850a5e9c20135077203fb34 WHIRLPOOL 75eef81f20c32aa8d4f0ee1c90bd7ec7c8e5c8c6c84bbe8d682ade309c5bc42d51e430fdb7476798dc025682b8c081434563d99605ac627c202f193c783970a5
EBUILD qtcore-5.6.2-r1.ebuild 828 SHA256 08ad65af7dfc460978f2df70e221f1c57e27ceaf7b2c44eb9782bd90c5825771 SHA512 0ce08466d7764f84f3d1c65d0f3020e62929d4021a83e7b8db1132a6b16458ee364bb74af1842b9f7b047afdba65c344b00bfa4d8a8c7231b078b278f42fc639 WHIRLPOOL 6fa267b5bf378de902c336b06ae2f28c79642ee8c707040dd3fdfea059e246bce634df6c469fa1dbedbef707d44b7e23900375635183496a3e2735a4fd686fee
EBUILD qtcore-5.7.1-r2.ebuild 876 SHA256 514dc8ff131a6d30ca5380d167a85ab0d21da5af51c2c1af362b3798e93b39f2 SHA512 b19653912ef0eac500e12d1bc1916d2a2409fde5807355859c4b0fd1c28a1093db4d20d8cdde3923435a1e86a9a2d0a9551ba8465d94ae0cfdb74e32079749dc WHIRLPOOL 924ebad6c5759bc10c5fcfac0beb78322108d7a5e18c1f5c3e05308bc195eaa0c4bd67cddaf6616f0f08015a3f203c49f9ca58cd96faf4ad1ead1dc541b9900a
EBUILD qtcore-5.7.1-r3.ebuild 945 SHA256 b3b75ec95bcd5baab735dd876db7419a649dcf7fc9ca04bfa4aad96af60d3ad2 SHA512 4d9c85f573551a9debc023f182be716f5083436ecf48fb612cb292d70de7699741f03c87ed18cd7fbbb2ed9b3dc7e9778249343f83424d5d27fbbfb211a4a1c3 WHIRLPOOL 4ec369240197ed2b72455827a808611867667a1dd03dfa1b613ce6104bd5b166238da861a32f3cc95073f319325299b5e56593a1ee69abfd657032162bf4cf22
diff --git a/dev-qt/qtcore/files/qtcore-4.8.7-libressl.patch b/dev-qt/qtcore/files/qtcore-4.8.7-libressl.patch
new file mode 100644
index 0000000..b838c7a
--- /dev/null
+++ b/dev-qt/qtcore/files/qtcore-4.8.7-libressl.patch
@@ -0,0 +1,52 @@
+--- 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/qtcore-4.8.7-r2.ebuild b/dev-qt/qtcore/qtcore-4.8.7-r2.ebuild
index 9a18e62..ea6aa16 100644
--- a/dev-qt/qtcore/qtcore-4.8.7-r2.ebuild
+++ b/dev-qt/qtcore/qtcore-4.8.7-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -7,7 +7,7 @@ inherit qt4-build-multilib
DESCRIPTION="Cross-platform application development framework"
if [[ ${QT4_BUILD_TYPE} == release ]]; then
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+ KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
fi
IUSE="+glib iconv icu libressl qt3support ssl"
@@ -37,6 +37,7 @@ PATCHES=(
"${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}/${PN}-4.8.6-moc-boost-1.60.patch" # bug 556104
+ "${FILESDIR}/${PN}-4.8.7-libressl.patch" # bug 584796
"${FILESDIR}/${PN}-4.8.7-fix-socklent-for-musl.patch"
)
diff --git a/dev-qt/qtcore/qtcore-5.6.1.ebuild b/dev-qt/qtcore/qtcore-5.6.1.ebuild
deleted file mode 100644
index 08ee254..0000000
--- a/dev-qt/qtcore/qtcore-5.6.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="Cross-platform application development framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 arm ~arm64 hppa ppc ppc64 x86"
-fi
-
-IUSE="icu systemd"
-
-DEPEND="
- dev-libs/glib:2
- >=dev-libs/libpcre-8.38[pcre16,unicode]
- >=sys-libs/zlib-1.2.5
- virtual/libiconv
- icu? ( dev-libs/icu:= )
- systemd? ( sys-apps/systemd:= )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
- "${FILESDIR}/${PN}-5.5.1-musl-iconv.patch"
-)
-
-QT5_TARGET_SUBDIRS=(
- src/tools/bootstrap
- src/tools/moc
- src/tools/rcc
- src/corelib
- src/tools/qlalr
-)
-
-src_configure() {
- local myconf=(
- $(qt_use icu)
- $(qt_use systemd journald)
- )
- qt5-build_src_configure
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] proj/musl:master commit in: dev-qt/qtcore/, dev-qt/qtcore/files/
@ 2017-11-06 13:05 Anthony G. Basile
0 siblings, 0 replies; 4+ messages in thread
From: Anthony G. Basile @ 2017-11-06 13:05 UTC (permalink / raw
To: gentoo-commits
commit: 1cc24622b0b7a02e2a6f6a190a85fa85e6c185ca
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 6 13:05:06 2017 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Mon Nov 6 13:05:06 2017 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=1cc24622
dev-qt/qtcore: sync with tree
Package-Manager: Portage-2.3.8, Repoman-2.3.3
RepoMan-Options: --force
dev-qt/qtcore/Manifest | 3 ++-
dev-qt/qtcore/files/qtcore-4.8.7-moc.patch | 17 +++++++++++++++++
.../{qtcore-4.8.7-r2.ebuild => qtcore-4.8.7-r3.ebuild} | 2 +-
3 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest
index 7deaf10..cdc2940 100644
--- a/dev-qt/qtcore/Manifest
+++ b/dev-qt/qtcore/Manifest
@@ -4,6 +4,7 @@ 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-4.8.7-libressl.patch 2161 SHA256 c01d0225d593a87d5764993be9a53b0adbf9493487ad7c5583ef3abcb35b1c4d SHA512 c84b827fd5f0c504c9ab95352677dc2cfe926c81aa012b454d8260385215b510835ba693830b3a3a6fa374b299995ec14cbb07711f41031788fc6c3bec396021 WHIRLPOOL 26274cc870721bcbb364a3e41aa95af0d7d5561b0882ca4bf058c036a063fe3fa77072f09a0d84ffb1f0a6dab2201d03c8602a2d5f7815752cfdb9180e2689a1
+AUX qtcore-4.8.7-moc.patch 926 SHA256 032978c364ed669842fc06f03f28b08ad8fd5a19afe49bd6e6f2b5b5ae262ebb SHA512 cb64e3e2271d3031c11d2c8afe1bcfd5263bcf8b8c787d03059b4bca25f3dd2d8a092c80cb396a1a466d2ef667697c31856c7c675aa7c48b5680f5e91db95f86 WHIRLPOOL 588f6fdaa43f8d65ece7ae2ec1e20d7f797d4dce6cdd67bd05d2c27d7facf28c598c7e191a118e1433cb1d1e5c7596073f552568d6683c69d07db9e9e79ebaf0
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
AUX qtcore-5.7.1-qipm.patch 5915 SHA256 a5fb3bee98d797ac5e34bec02bcc1b5b0834fa1092fa6d1e1ea3d490975ae42f SHA512 807c030c2059cddcd159cb537ba2e4be68d6f612f45e1e7b844fc045f661739aea7bc35743735cee364d692d51774e17edced1aac8d444abaa4e4435117a5b3d WHIRLPOOL e13e1a24b750fe7729b1d86214491358937344b7a39c6c2941d372f5ce9077ecc1c320a0be2e5a9c772e1b01d786e55176cdad252c317bc62215c9c7acfe0d6b
@@ -11,6 +12,6 @@ AUX qtcore-5.7.1-qsfpm-1.patch 8922 SHA256 3376b4564d793e0bf3770a8ebcc474a03e7aa
AUX qtcore-5.7.1-qsfpm-2.patch 7812 SHA256 a2bb1a42df644906cacb084e579166e8229c774e2f678b8b523215d4bbffe1e7 SHA512 38b141aa7d30011d71ed9044c69f79b56698320600a64ed3cc37e8dd9d22bb9ec2f33f8348d074552a5046c2855e948e325d5421384cb4c66c0bbd566500174d WHIRLPOOL 3e65f1413ce3b3800d694b731d74026ac5d5f08f9af20b257c2b7424ec954cb1fa28067496b028c3e66680ae88e59d8ccf8c080b049fa05f31162705db1a0898
DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 SHA256 e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 WHIRLPOOL ad8f01172f5bdb3a3a69fe7b03862c4c411bc8d95211053ad66ed1d60a3c0577d073d1075a1e0a80b25d9b2721addda55a2967e6ccf5e194cec8d08770ac5fc2
DIST qtbase-opensource-src-5.7.1.tar.xz 44992616 SHA256 edcdf549d94d98aff08e201dcb3ca25bc3628a37b1309e320d5f556b6b66557e SHA512 0506a3a856f76e5ba182e3382a515282b6096f3900fbdc14cd5aec425105ab61922e0ada0361234387335ceb80b3c69e39cd34d75476c2946c4371e7b8c0827f WHIRLPOOL de5ff1380b3fd9cbcca741d212ac516e3f8a31366219605730cf5525a04e4efc9965a9b3cf8e99f50a2912bc7add83f61e7f90a85e176ad2830e4c1422b5d682
-EBUILD qtcore-4.8.7-r2.ebuild 2862 SHA256 e888c594fc32a78f88958a62c9133df2142ef96aee2d68d653f960214ac633bb SHA512 56056bd63f63aadc1ce18c8b124ec3d2dd333f3233d2e4abefa8a580919321580b3c125dcf63c5897239fd46fd7b8e94c51233debb3814a7367fbe28c0c1b8f4 WHIRLPOOL 8922704b9e599f12ee632b2b43792a45f1fa91ee9464b911826a3586b2f3daefa4c8c5b612c3b66c5f25df4e0d3c14b3035fae15812b91087be8e2d70385c606
+EBUILD qtcore-4.8.7-r3.ebuild 2859 SHA256 b55f13a2487687c08cd1de40b904d95568f3b1c2975813d6e92f378ef0547167 SHA512 495b9fdd39d17b5dd927a7ad61928981fa792268e604324a5b6875b630df08ebb88cf2ac01d41391aa77aa7a2f4a7cb8e5ae544dd8e529bd1d6a5220d4f8dd73 WHIRLPOOL de1831be7842418a75d5395f00e4d60f651861cf6b6ade5825aaf4e78f629ab7ddba02104d584e97d2ccbcffdf8f5e6696d0642cf838522577889cf3934d6f18
EBUILD qtcore-5.7.1-r3.ebuild 927 SHA256 f2dd1d08d498def28ab9ea45de01cde57278c9677da917bed87b12df19ef1969 SHA512 bfa4daab88fdd67918ccc784a69bf140e9fa6ef77d129cc049c9965be747212da6494a4ad8520353cd6ab9f06c91030693aae4f5986146416dd7d6fae0f8a0cd WHIRLPOOL ad1b670ee90975306b038f20abff6c2836b09fe2098943ec0db82e4bce548e682c2e8ad316fd3c5fe5398f21caf4ff82d181b253286944def98868ab06e0ffb6
MISC metadata.xml 923 SHA256 22b0c054608f0f06da6d5e08acca625e153346ef3c0281dd93a89bc3f9efc7e1 SHA512 c3cc5ea943e59fd44ffded076df311a62dd5fb7ff2ab197f6118604a0e26e30f44377e0b8bb3edcddbda19ea52c0a26cf6451625dd17185c511d5d051e3ad915 WHIRLPOOL 7061ff30ae1b083e1328c0080d08631a3e9ffc1986f729f9e1ae269d7ba243345859a87cdb020a3eaabd40c78c9fcaa159adfc53a3729e87ae82bf49d7530f59
diff --git a/dev-qt/qtcore/files/qtcore-4.8.7-moc.patch b/dev-qt/qtcore/files/qtcore-4.8.7-moc.patch
new file mode 100644
index 0000000..7660ded
--- /dev/null
+++ b/dev-qt/qtcore/files/qtcore-4.8.7-moc.patch
@@ -0,0 +1,17 @@
+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;
diff --git a/dev-qt/qtcore/qtcore-4.8.7-r2.ebuild b/dev-qt/qtcore/qtcore-4.8.7-r3.ebuild
similarity index 97%
rename from dev-qt/qtcore/qtcore-4.8.7-r2.ebuild
rename to dev-qt/qtcore/qtcore-4.8.7-r3.ebuild
index 8312d9f..46a4ce6 100644
--- a/dev-qt/qtcore/qtcore-4.8.7-r2.ebuild
+++ b/dev-qt/qtcore/qtcore-4.8.7-r3.ebuild
@@ -36,8 +36,8 @@ MULTILIB_WRAPPED_HEADERS=(
PATCHES=(
"${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}/${PN}-4.8.6-moc-boost-1.60.patch" # bug 556104
"${FILESDIR}/${PN}-4.8.7-libressl.patch" # bug 584796
+ "${FILESDIR}/${PN}-4.8.7-moc.patch" # bug 556104, 635394
"${FILESDIR}/${PN}-4.8.7-fix-socklent-for-musl.patch"
)
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2017-11-06 13:05 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-05-18 16:30 [gentoo-commits] proj/musl:master commit in: dev-qt/qtcore/, dev-qt/qtcore/files/ Aric Belsito
-- strict thread matches above, loose matches on Subject: below --
2017-11-06 13:05 Anthony G. Basile
2016-12-14 21:19 Aric Belsito
2016-11-09 19:49 Aric Belsito
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox