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"
)
