summaryrefslogtreecommitdiff
path: root/dev-qt
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2023-08-06 15:22:56 +0100
committerV3n3RiX <venerix@koprulu.sector>2023-08-06 15:22:56 +0100
commit564f8bfdb74759f8e95ec50a16419425e8ba8f25 (patch)
tree2738b2fbae70ae5b251665eb6da25467f5db050d /dev-qt
parent9b81b8a93760fc1c7d79561adbd7a62c82f334db (diff)
gentoo auto-resync : 06:08:2023 - 15:22:56
Diffstat (limited to 'dev-qt')
-rw-r--r--dev-qt/Manifest.gzbin11219 -> 11223 bytes
-rw-r--r--dev-qt/qtcore/Manifest4
-rw-r--r--dev-qt/qtcore/qtcore-5.15.10-r1.ebuild5
-rw-r--r--dev-qt/qtcore/qtcore-5.15.10.ebuild7
4 files changed, 8 insertions, 8 deletions
diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index 2538d4b35069..6483df4237cc 100644
--- a/dev-qt/Manifest.gz
+++ b/dev-qt/Manifest.gz
Binary files differ
diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest
index 448f9a2d731b..929496f9a6ca 100644
--- a/dev-qt/qtcore/Manifest
+++ b/dev-qt/qtcore/Manifest
@@ -2,6 +2,6 @@ DIST qtbase-5.15-gentoo-patchset-4.tar.xz 4884 BLAKE2B ef1f11ea63084b834e19a9bd4
DIST qtbase-5.15.10-gentoo-kde-1.tar.xz 725208 BLAKE2B 14e82b0f26d0e0de47e9e3c4c54dd6649f983b9468c9f5790fb206a823a77ef22fc02546e39ff0ba68aa589ba811629bb4c4615223af9e8bec7c7b96ae13bef6 SHA512 efc93c451577f6389ffd58690ce2e1a2d2f3b85072cb8d542c5db0ddee2b60e80f2f937fb815a63db9973cc88ef35f8adc47a5ec98c2ec0b01ac5320ac635a5b
DIST qtbase-5.15.10-gentoo-kde-2.tar.xz 740184 BLAKE2B 0b76c6515425b45de65993a54e6b72afc620300c711e75720fd1283b964aee564a780845f52c033794f6fdca9a13ca863e52a91f7eda5d436f9a668356af82b2 SHA512 474fd27c13cd1b58c688c063ca119769cda9a5de8c97ae04fba81cba9e176126ac71107c6536cf825617c27aadcaf53732d4181c772fbae3c04988f85490fd74
DIST qtbase-everywhere-opensource-src-5.15.10.tar.xz 50422688 BLAKE2B 2a625296967bef17d491a3ec8fbb4a3beaf00180a2cda728e485f796c801241798bd85dd06d57ca9fef26c591fe9910a2fcb83a67bbc17640b7393d280b9ce53 SHA512 94ac739d76dd9fff54cde46e818fee6c6763f8b207b759108455febff84c9dfeb48ea7807451d7248cbfd8af24c2a1263c34dcbd2be055136e39325e32725eef
-EBUILD qtcore-5.15.10-r1.ebuild 2981 BLAKE2B f99598299bcfb6eb125ac0f652571dcb326070344d624d28eef509894f250f77c75d2170c6c3acd134606f7dd09c277837a196bf258b5fe8fbcc8bc146e6af59 SHA512 211270cc6f6e9773a79eed1d6b707c9c874394fa0b6410dd68bb7cd97c12c2bb7965687f183da00d7f38e3a4b8a2b4d75559f7a3000b2c564bb3fe2dbdc62f94
-EBUILD qtcore-5.15.10.ebuild 2975 BLAKE2B 436e6eaef560c409acb5c2c489ff7c8539020bd0b296c1f18c19769edf245d069f249c526490b6455710b2714d55bdff4bf4df4637c163816d5913741ce71a7f SHA512 0056e42266ec7107c8c3ab637c0fe6234d34ddea5c83ed58508b2c1847e94fdad4ad89a1278342323a6f5093afb53bf25dba4e706741cb53b3c975223f086d6a
+EBUILD qtcore-5.15.10-r1.ebuild 2987 BLAKE2B 0430945f26e3376e824a2efad7b3580fc83b987ba6f68726b813b9ecf43d19eebbae9035d21a17f11bea308d427c406ee59a5f288ed90a9d70896a0e042920b9 SHA512 bb06f3322456c49cb8b51e8ae3cc67f138989256d35093afcbee7bc779453707552838df99fa1c1ed5fa86f854f25a58b2dcfd1068ee89dbba8a964ac556a3c5
+EBUILD qtcore-5.15.10.ebuild 2891 BLAKE2B 0031f98f7c3e6ce30d21cef70a94e47d83f4cb800482d999dafe71daab1a867a09a3bca23bc324037e92e2312136351cde16c92a5d0592b8ddfca944ef15d41b SHA512 79f67f2eefcf504d70fa13a05d867945de57d84487d1b27457eaf80b07bf02744e271ef55c223b899a844f4d173994cd057b3985e97bc48228c7c8c65dca9e81
MISC metadata.xml 833 BLAKE2B 79b441c34e55017f23dd85cdb062ef4cbcfce05dff74936de887256ba8b9b596632b570b55b7014c38467829751771bb116f067cd6a246a11309f20b67fb55f0 SHA512 f1ffedc2ad17d198ba14a9a93e6c8dd35a7709e6f1e07dae606c16c05868f2f8e696f25fa5cf2602ed50f41eb5a914ff0d652b9ac37163e5130ddbfb475a1ff5
diff --git a/dev-qt/qtcore/qtcore-5.15.10-r1.ebuild b/dev-qt/qtcore/qtcore-5.15.10-r1.ebuild
index f42cc15498c0..8153d9098fae 100644
--- a/dev-qt/qtcore/qtcore-5.15.10-r1.ebuild
+++ b/dev-qt/qtcore/qtcore-5.15.10-r1.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} != *9999* ]]; then
fi
QT5_MODULE="qtbase"
-inherit linux-info flag-o-matic qt5-build
+inherit linux-info flag-o-matic toolchain-funcs qt5-build
DESCRIPTION="Cross-platform application development framework"
SLOT=5/${QT5_PV}
@@ -60,6 +60,7 @@ src_prepare() {
sed -i -e 's/^gcc:ltcg/gcc/' src/corelib/global/global.pri || die
# Broken with FORTIFY_SOURCE=3
+ #
# Our toolchain sets F_S=2 by default w/ >= -O2, so we need
# to unset F_S first, then explicitly set 2, to negate any default
# and anything set by the user if they're choosing 3 (or if they've
@@ -70,7 +71,7 @@ src_prepare() {
# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105709
# https://bugreports.qt.io/browse/QTBUG-103782
# bug #847145
- if is-flagq '-O[23]' || is-flagq '-Ofast' ; then
+ if tc-enables-fortify-source ; then
# We can't unconditionally do this b/c we fortify needs
# some level of optimisation.
filter-flags -D_FORTIFY_SOURCE=3
diff --git a/dev-qt/qtcore/qtcore-5.15.10.ebuild b/dev-qt/qtcore/qtcore-5.15.10.ebuild
index 4964d74eb06f..606b3ffff929 100644
--- a/dev-qt/qtcore/qtcore-5.15.10.ebuild
+++ b/dev-qt/qtcore/qtcore-5.15.10.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} != *9999* ]]; then
fi
QT5_MODULE="qtbase"
-inherit linux-info flag-o-matic qt5-build
+inherit linux-info flag-o-matic toolchain-funcs qt5-build
DESCRIPTION="Cross-platform application development framework"
SLOT=5/${QT5_PV}
@@ -60,6 +60,7 @@ src_prepare() {
sed -i -e 's/^gcc:ltcg/gcc/' src/corelib/global/global.pri || die
# Broken with FORTIFY_SOURCE=3
+ #
# Our toolchain sets F_S=2 by default w/ >= -O2, so we need
# to unset F_S first, then explicitly set 2, to negate any default
# and anything set by the user if they're choosing 3 (or if they've
@@ -70,9 +71,7 @@ src_prepare() {
# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105709
# https://bugreports.qt.io/browse/QTBUG-103782
# bug #847145
- if is-flagq '-O[23]' || is-flagq '-Ofast' ; then
- # We can't unconditionally do this b/c we fortify needs
- # some level of optimisation.
+ if tc-enables-fortify-source ; then
filter-flags -D_FORTIFY_SOURCE=3
# (Qt doesn't seem to respect CPPFLAGS?)
append-flags -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2