gentoo resync : 16.01.2021

4 files changed, 110 insertions, 111 deletions

diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest
index 2e54086302aa..40ba83b707b7 100644
--- a/dev-qt/qtcore/Manifest
+++ b/dev-qt/qtcore/Manifest
@@ -1,8 +1,10 @@
 AUX qtcore-5.14.1-cmake-macro-backward-compat.patch 2555 BLAKE2B 5fe2b70232722416cb85ecce8a0742b57503c520482aa0386042f43d4cf20926a874b9a92f90c656cfe0bf93883c286b6b08c0ad2568f3a6746c776dcf208995 SHA512 c7ba0bfa6d462504ba9421abfb7f502265fd8c6bd7469326612925cd7b7667daba3350f714aa5a516aa83e5352ec6d18fc02af9ebf5494af10a4b6f8f7c47d5b
 AUX qtcore-5.15.1-timezone-1.patch 9484 BLAKE2B aa36362fcc6ea1ab144e97dfa1e023e4fbad64f8702e817ee2431ac271aefd637609d14a265c2d6e58bedbdb3f635b4b979c9bf1463a29370ae05bb2610e131b SHA512 1edfe267827225279b0ecad60a5a350b825ed9bd84574d0e5470e71bac75668c0655aa0db2f001e26e331f85e0cf0a68412ba5a9541581bf39a0e954313672b2
 AUX qtcore-5.15.1-timezone-2.patch 1933 BLAKE2B 479f82c90d2132291bc298491d61d7144e08a6db8b36d7d1a89f368c894e41902ae964aaa2819010c485dc5aedd937f2dd00b4efa99d3393d11368e0ea258481 SHA512 c978ffadf15629ab562a53cc24d31e33f4df861962b927ea37061747cb74a7b677d7ae3a617b526c4f48085fe73ebb89fbf5a44748433426dd74e5691a238097
-AUX qtcore-5.15.2-fix-stack-smashing.patch 4444 BLAKE2B ecd005a59f156324b8a0da854b0635a43d30855d8f97cff4c787cdf3b8ef2d84da967a643c6a5b8008e1d53ab8089febd849ddd2da38affb6c73a142a48016fd SHA512 e781861d02f7487b93bff1a45a7e5cca82824b998b99e80bef233711557eda5107eea16562afd6fb1d57bac3790b2d7229b97430c1be94fd46d9237358550969
+DIST qtbase-5.15.2-38ad2f39.tar.gz 67969272 BLAKE2B 9071c96e8162d8141676f63aab82ca61ba29039e79066939fb74501187ae95cca34c924f1105827411f021efca2f40a62b7acde845d0d463604b234a3a8f8370 SHA512 df4f2dce732f62c797f77c266e268097f32a5d7605b3464c9a76d323d8ec069c902994df6afa28823d3c03f5d4ca0295cac47e28773b25e2f9387e3475f52f82
 DIST qtbase-5.15.2-7c6c0030.tar.gz 67967537 BLAKE2B 623b99942e9df9bc8ac436a21503060845f9e3532aa0e02ccd927762382be26091878fbe092e80c0ac68bead51d09647e40e0cf61361d62ad226ed46b221132b SHA512 eb88b21764591246c5f04f63405dbfcd39afb737e96bb29c7721644b9aba3ea95df24ed9699acfd03a8c088ee72efec1fb0267aef8d665d5ec72ee75fc08ecdc
+DIST qtbase-5.15.2-f4ac0b55.tar.gz 67967554 BLAKE2B 3e1ece861c195cdaa688f22cac7bbfdb3cce73ac575f72c8adc916face612307553d98da7b757c44980b1ed0ebf5a9ecaa2e993b41e775f511e32bd515c1ca54 SHA512 6160e02505e4d3f9fbd55f442e0a7a4d906feb576c891600232937bc212660b5c8a41072347d9f78dd0a1ca9357af514b5df2b341e181b2c823b36a912e583fa
 EBUILD qtcore-5.15.2-r11.ebuild 2325 BLAKE2B 8cbabcd9be308995f05c847446e11376bada59ef7f937fad98b906b83b1f50417fbd7cd612903c129eaa66db1fb8d835d157cc4e506c5b430ef291d710e15c26 SHA512 66e9558247d8c71bfd6d784ad4fa9e46639a50a1d073ae438062891de769cee24081b797f8c8b5d0ca915090acb1d2a52177105eed2a637702ea18761bd4c3f4
-EBUILD qtcore-5.15.2-r12.ebuild 2474 BLAKE2B 607f1c9bf4e232cc378d42d857cf84f18ddbf6c2a15035c95828b0ce05d7ea51a52ce978610378367535471252033e150b109fdb5a675e30057ac41d9181da3d SHA512 7cc1dec37b123d47ec2cdea4ffeb9a7dc0967f6f12d17b29a55a44c80f61551f3264b58988e03b8d548bbced227ec3202bc4e8750c52fc04597bce5a207a85ef
+EBUILD qtcore-5.15.2-r13.ebuild 2331 BLAKE2B 387048a47070b5c741421931677a981c0f972417128f37a828a7e5ebad19542875199caad87d9587ee58c7b1ab546aa22c5259125c3592064518292b10becbac SHA512 23739928c09ee359908ec1297ad7844dc653925d2e9b978da22aedab95e41a17940b4b858445e0865550e48e86176f6552862c333818cfa9ad349fc17652d178
+EBUILD qtcore-5.15.2-r14.ebuild 2331 BLAKE2B 03110db1e78f93a0a996ff478559fc2553df761af5badc924378a18a7464f35f09153f37e1923b377cd014a25486193e074ae418218419bdba86bf323bbdf0a4 SHA512 0fde78d3b88edda574734fb98217af5de5977f0803d8f78b103468497af99dff1e6c91490aa2c0550969ee67a8ecdd59f443fdb34c903eefa18c2963d55ea395
 MISC metadata.xml 833 BLAKE2B 79b441c34e55017f23dd85cdb062ef4cbcfce05dff74936de887256ba8b9b596632b570b55b7014c38467829751771bb116f067cd6a246a11309f20b67fb55f0 SHA512 f1ffedc2ad17d198ba14a9a93e6c8dd35a7709e6f1e07dae606c16c05868f2f8e696f25fa5cf2602ed50f41eb5a914ff0d652b9ac37163e5130ddbfb475a1ff5
diff --git a/dev-qt/qtcore/files/qtcore-5.15.2-fix-stack-smashing.patch b/dev-qt/qtcore/files/qtcore-5.15.2-fix-stack-smashing.patch
deleted file mode 100644
index cfc187251ccb..000000000000
--- a/dev-qt/qtcore/files/qtcore-5.15.2-fix-stack-smashing.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-From 463c338b09710609e0dc82f67e03c829a7b83788 Mon Sep 17 00:00:00 2001
-From: Allan Sandfeld Jensen <allan.jensen@qt.io>
-Date: Fri, 14 May 2021 10:43:11 +0200
-Subject: [PATCH] Avoid mixing atomic futex changes and QAtomic
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Either the mix of futex and atomic, or the mix of 32-bit futex and
-64-bit atomic doesn't work. In any case, the existing code leads to
-bad behavior.
-
-* asturm 2021-11-19: Also threw the typo fix from 587e3bb0 into the mix.
-
-Pick-to: 6.1 5.15
-Fixes: QTBUG-92188
-Change-Id: Icc6ba28d6e2465c373d00e84f4da2b92c037e797
-Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
-Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
-(cherry picked from commit 2d9cc639a4a7a5e97979a6034364bd67dfa10c23)
----
- src/corelib/thread/qsemaphore.cpp | 46 ++++++++++++-------------------
- 1 file changed, 17 insertions(+), 29 deletions(-)
-
-diff --git a/src/corelib/thread/qsemaphore.cpp b/src/corelib/thread/qsemaphore.cpp
-index d4fb756b94..1d01fc1b28 100644
---- a/src/corelib/thread/qsemaphore.cpp
-+++ b/src/corelib/thread/qsemaphore.cpp
-@@ -357,47 +357,31 @@ void QSemaphore::release(int n)
-         quintptr prevValue = u.fetchAndAddRelease(nn);
-         if (futexNeedsWake(prevValue)) {
- #ifdef FUTEX_OP
--            if (!futexHasWaiterCount) {
--                /*
--                   On 32-bit systems, all waiters are waiting on the same address,
--                   so we'll wake them all and ask the kernel to clear the high bit.
--
--                   atomic {
--                      int oldval = u;
--                      u = oldval & ~(1 << 31);
--                      futexWake(u, INT_MAX);
--                      if (oldval == 0)       // impossible condition
--                          futexWake(u, INT_MAX);
--                   }
--                */
--                quint32 op = FUTEX_OP_ANDN | FUTEX_OP_OPARG_SHIFT;
--                quint32 oparg = 31;
--                quint32 cmp = FUTEX_OP_CMP_EQ;
--                quint32 cmparg = 0;
--                futexWakeOp(u, INT_MAX, INT_MAX, u, FUTEX_OP(op, oparg, cmp, cmparg));
--            } else {
-+            if (futexHasWaiterCount) {
-                 /*
-                    On 64-bit systems, the single-token waiters wait on the low half
-                    and the multi-token waiters wait on the upper half. So we ask
-                    the kernel to wake up n single-token waiters and all multi-token
--                   waiters (if any), then clear the multi-token wait bit.
-+                   waiters (if any), and clear the multi-token wait bit.
- 
-                    atomic {
-                       int oldval = *upper;
--                      *upper = oldval & ~(1 << 31);
-+                      *upper = oldval | 0;
-                       futexWake(lower, n);
--                      if (oldval < 0)   // sign bit set
-+                      if (oldval != 0)   // always true
-                           futexWake(upper, INT_MAX);
-                    }
-                 */
--                quint32 op = FUTEX_OP_ANDN | FUTEX_OP_OPARG_SHIFT;
--                quint32 oparg = 31;
--                quint32 cmp = FUTEX_OP_CMP_LT;
-+                quint32 op = FUTEX_OP_OR;
-+                quint32 oparg = 0;
-+                quint32 cmp = FUTEX_OP_CMP_NE;
-                 quint32 cmparg = 0;
-+                u.fetchAndAndRelease(futexNeedsWakeAllBit - 1);
-                 futexWakeOp(*futexLow32(&u), n, INT_MAX, *futexHigh32(&u), FUTEX_OP(op, oparg, cmp, cmparg));
-+                return;
-             }
--#else
--            // Unset the bit and wake everyone. There are two possibibilies
-+#endif
-+            // Unset the bit and wake everyone. There are two possibilities
-             // under which a thread can set the bit between the AND and the
-             // futexWake:
-             // 1) it did see the new counter value, but it wasn't enough for
-@@ -405,8 +389,12 @@ void QSemaphore::release(int n)
-             // 2) it did not see the new counter value, in which case its
-             //    futexWait will fail.
-             u.fetchAndAndRelease(futexNeedsWakeAllBit - 1);
--            futexWakeAll(u);
--#endif
-+            if (futexHasWaiterCount) {
-+                futexWakeAll(*futexLow32(&u));
-+                futexWakeAll(*futexHigh32(&u));
-+            } else {
-+                futexWakeAll(u);
-+            }
-         }
-         return;
-     }
--- 
-2.34.0
-
diff --git a/dev-qt/qtcore/qtcore-5.15.2-r12.ebuild b/dev-qt/qtcore/qtcore-5.15.2-r13.ebuild
index 005fd2c6c0fd..0b8f86d5973a 100644
--- a/dev-qt/qtcore/qtcore-5.15.2-r12.ebuild
+++ b/dev-qt/qtcore/qtcore-5.15.2-r13.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-KDE_ORG_COMMIT=7c6c0030cf80ef7b9ace42996b0e0c3a72f76860
+KDE_ORG_COMMIT=38ad2f39daec09168728033969265834b6a2d924
 QT5_MODULE="qtbase"
 inherit linux-info qt5-build
 
@@ -48,8 +48,6 @@ QT5_GENTOO_PRIVATE_CONFIG=(
 PATCHES=(
 	"${FILESDIR}"/${PN}-5.14.1-cmake-macro-backward-compat.patch # bug 703306
 	"${FILESDIR}"/${PN}-5.15.1-timezone-{1,2}.patch # bug 737914
-	# See also: https://invent.kde.org/qt/qt/qtbase/-/merge_requests/81
-	"${FILESDIR}"/${P}-fix-stack-smashing.patch # bug 824286, KDE-bug 445719
 )
 
 pkg_pretend() {
diff --git a/dev-qt/qtcore/qtcore-5.15.2-r14.ebuild b/dev-qt/qtcore/qtcore-5.15.2-r14.ebuild
new file mode 100644
index 000000000000..363ceb67039c
--- /dev/null
+++ b/dev-qt/qtcore/qtcore-5.15.2-r14.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_COMMIT=f4ac0b55c37f2b594ffbe639db43dac365825c7c
+QT5_MODULE="qtbase"
+inherit linux-info qt5-build
+
+DESCRIPTION="Cross-platform application development framework"
+SLOT=5/${QT5_PV}
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+IUSE="icu old-kernel systemd"
+
+DEPEND="
+	dev-libs/double-conversion:=
+	dev-libs/glib:2
+	dev-libs/libpcre2[pcre16,unicode]
+	sys-libs/zlib:=
+	icu? ( dev-libs/icu:= )
+	!icu? ( virtual/libiconv )
+	systemd? ( sys-apps/systemd:= )
+"
+RDEPEND="${DEPEND}
+	>=dev-qt/qtchooser-66-r1
+"
+
+QT5_TARGET_SUBDIRS=(
+	src/tools/bootstrap
+	src/tools/moc
+	src/tools/rcc
+	src/corelib
+	src/tools/qlalr
+	doc
+)
+
+QT5_GENTOO_PRIVATE_CONFIG=(
+	!:network
+	!:sql
+	!:testlib
+	!:xml
+)
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.14.1-cmake-macro-backward-compat.patch # bug 703306
+	"${FILESDIR}"/${PN}-5.15.1-timezone-{1,2}.patch # bug 737914
+)
+
+pkg_pretend() {
+	use kernel_linux || return
+	get_running_version
+	if kernel_is -lt 4 11 && ! use old-kernel; then
+		ewarn "The running kernel is older than 4.11. USE=old-kernel is needed for"
+		ewarn "dev-qt/qtcore to function on this kernel properly. Bugs #669994, #672856"
+	fi
+}
+
+src_prepare() {
+	# don't add -O3 to CXXFLAGS, bug 549140
+	sed -i -e '/CONFIG\s*+=/s/optimize_full//' src/corelib/corelib.pro || die
+
+	# fix missing qt_version_tag symbol w/ LTO, bug 674382
+	sed -i -e 's/^gcc:ltcg/gcc/' src/corelib/global/global.pri || die
+
+	qt5-build_src_prepare
+}
+
+src_configure() {
+	local myconf=(
+		$(qt_use icu)
+		$(qt_use !icu iconv)
+		$(qt_use systemd journald)
+	)
+	use old-kernel && myconf+=(
+		-no-feature-renameat2 # needs Linux 3.16, bug 669994
+		-no-feature-getentropy # needs Linux 3.17, bug 669994
+		-no-feature-statx # needs Linux 4.11, bug 672856
+	)
+	qt5-build_src_configure
+}
+
+src_install() {
+	qt5-build_src_install
+
+	local flags=(
+		DBUS FREETYPE IMAGEFORMAT_JPEG IMAGEFORMAT_PNG
+		OPENGL OPENSSL SSL WIDGETS
+	)
+
+	for flag in ${flags[@]}; do
+		cat >> "${D}"/${QT5_HEADERDIR}/QtCore/qconfig.h <<- _EOF_ || die
+
+			#if defined(QT_NO_${flag}) && defined(QT_${flag})
+			# undef QT_NO_${flag}
+			#elif !defined(QT_NO_${flag}) && !defined(QT_${flag})
+			# define QT_NO_${flag}
+			#endif
+		_EOF_
+	done
+}