[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtbase/files/, dev-qt/qtbase/
commit: 73bec710536da954edada1cddf97a833960bfb81
Author: Ionen Wolkens gentoo org>
AuthorDate: Tue Mar 26 20:44:29 2024 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Tue Mar 26 20:47:13 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73bec710
dev-qt/qtbase: do build workaround for gcc:14 + avx512fp16
Closes: https://bugs.gentoo.org/926287
Signed-off-by: Ionen Wolkens gentoo.org>
dev-qt/qtbase/files/qtbase-6.6.3-gcc14-avx512fp16.patch | 15 +++
dev-qt/qtbase/qtbase-6.6.3.ebuild | 1 +
dev-qt/qtbase/qtbase-6.6..ebuild| 1 +
dev-qt/qtbase/qtbase-6.7.0_rc2-r1.ebuild| 1 +
dev-qt/qtbase/qtbase-6.7..ebuild| 1 +
dev-qt/qtbase/qtbase-6..ebuild | 1 +
6 files changed, 20 insertions(+)
diff --git a/dev-qt/qtbase/files/qtbase-6.6.3-gcc14-avx512fp16.patch
b/dev-qt/qtbase/files/qtbase-6.6.3-gcc14-avx512fp16.patch
new file mode 100644
index ..e7eb9dcc9209
--- /dev/null
+++ b/dev-qt/qtbase/files/qtbase-6.6.3-gcc14-avx512fp16.patch
@@ -0,0 +1,15 @@
+Simply disable the broken path rather than worry about it for now.
+
+Likely an easy fix but would rather this be handled upstream and
+reported by someone that is affected and can test.
+
+https://bugs.gentoo.org/926287
+--- a/src/gui/painting/qrgbafloat.h
b/src/gui/painting/qrgbafloat.h
+@@ -20,5 +20,5 @@
+ public:
+ using Type = F;
+-#if defined(__AVX512FP16__) && QFLOAT16_IS_NATIVE
++#if 0
+ // AVX512FP16 has multiplication instructions
+ using FastType = F;
diff --git a/dev-qt/qtbase/qtbase-6.6.3.ebuild
b/dev-qt/qtbase/qtbase-6.6.3.ebuild
index 1adebe3c5958..40a65fab575d 100644
--- a/dev-qt/qtbase/qtbase-6.6.3.ebuild
+++ b/dev-qt/qtbase/qtbase-6.6.3.ebuild
@@ -137,6 +137,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-6.5.2-no-glx.patch
"${FILESDIR}"/${PN}-6.5.2-no-symlink-check.patch
"${FILESDIR}"/${PN}-6.6.1-forkfd-childstack-size.patch
+ "${FILESDIR}"/${PN}-6.6.3-gcc14-avx512fp16.patch
)
src_prepare() {
diff --git a/dev-qt/qtbase/qtbase-6.6..ebuild
b/dev-qt/qtbase/qtbase-6.6..ebuild
index 1adebe3c5958..40a65fab575d 100644
--- a/dev-qt/qtbase/qtbase-6.6..ebuild
+++ b/dev-qt/qtbase/qtbase-6.6..ebuild
@@ -137,6 +137,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-6.5.2-no-glx.patch
"${FILESDIR}"/${PN}-6.5.2-no-symlink-check.patch
"${FILESDIR}"/${PN}-6.6.1-forkfd-childstack-size.patch
+ "${FILESDIR}"/${PN}-6.6.3-gcc14-avx512fp16.patch
)
src_prepare() {
diff --git a/dev-qt/qtbase/qtbase-6.7.0_rc2-r1.ebuild
b/dev-qt/qtbase/qtbase-6.7.0_rc2-r1.ebuild
index 87d5fb955203..016279f8fec5 100644
--- a/dev-qt/qtbase/qtbase-6.7.0_rc2-r1.ebuild
+++ b/dev-qt/qtbase/qtbase-6.7.0_rc2-r1.ebuild
@@ -138,6 +138,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-6.5.2-hppa-forkfd-grow-stack.patch
"${FILESDIR}"/${PN}-6.5.2-no-symlink-check.patch
"${FILESDIR}"/${PN}-6.6.1-forkfd-childstack-size.patch
+ "${FILESDIR}"/${PN}-6.6.3-gcc14-avx512fp16.patch
)
src_prepare() {
diff --git a/dev-qt/qtbase/qtbase-6.7..ebuild
b/dev-qt/qtbase/qtbase-6.7..ebuild
index 87d5fb955203..016279f8fec5 100644
--- a/dev-qt/qtbase/qtbase-6.7..ebuild
+++ b/dev-qt/qtbase/qtbase-6.7..ebuild
@@ -138,6 +138,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-6.5.2-hppa-forkfd-grow-stack.patch
"${FILESDIR}"/${PN}-6.5.2-no-symlink-check.patch
"${FILESDIR}"/${PN}-6.6.1-forkfd-childstack-size.patch
+ "${FILESDIR}"/${PN}-6.6.3-gcc14-avx512fp16.patch
)
src_prepare() {
diff --git a/dev-qt/qtbase/qtbase-6..ebuild
b/dev-qt/qtbase/qtbase-6..ebuild
index 87d5fb955203..016279f8fec5 100644
--- a/dev-qt/qtbase/qtbase-6..ebuild
+++ b/dev-qt/qtbase/qtbase-6..ebuild
@@ -138,6 +138,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-6.5.2-hppa-forkfd-grow-stack.patch
"${FILESDIR}"/${PN}-6.5.2-no-symlink-check.patch
"${FILESDIR}"/${PN}-6.6.1-forkfd-childstack-size.patch
+ "${FILESDIR}"/${PN}-6.6.3-gcc14-avx512fp16.patch
)
src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtbase/files/, dev-qt/qtbase/
commit: 5d91e3b73346a76fd065865bc70c4b63808e8ee3
Author: Ionen Wolkens gentoo org>
AuthorDate: Thu Feb 22 14:42:53 2024 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Thu Feb 22 15:12:56 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d91e3b7
dev-qt/qtbase: fix build with x32 abi
Closes: https://bugs.gentoo.org/925103
Thanks-to: Andrii Batyiev
Signed-off-by: Ionen Wolkens gentoo.org>
dev-qt/qtbase/files/qtbase-6.6.2-x32abi.patch | 13 +
dev-qt/qtbase/qtbase-6.6.2.ebuild | 1 +
dev-qt/qtbase/qtbase-6.6..ebuild | 1 +
dev-qt/qtbase/qtbase-6.7..ebuild | 1 +
dev-qt/qtbase/qtbase-6..ebuild| 1 +
5 files changed, 17 insertions(+)
diff --git a/dev-qt/qtbase/files/qtbase-6.6.2-x32abi.patch
b/dev-qt/qtbase/files/qtbase-6.6.2-x32abi.patch
new file mode 100644
index ..1204dcc5c25c
--- /dev/null
+++ b/dev-qt/qtbase/files/qtbase-6.6.2-x32abi.patch
@@ -0,0 +1,13 @@
+https://bugs.gentoo.org/925103
+--- a/src/corelib/thread/qthread.h
b/src/corelib/thread/qthread.h
+@@ -166,5 +166,9 @@
+ #elif defined(Q_PROCESSOR_X86_64) && ((defined(Q_OS_LINUX) &&
defined(__GLIBC__)) || defined(Q_OS_FREEBSD))
+ // x86_64 Linux, BSD uses FS
++# if defined(__ILP32__)
++__asm__("mov %%fs:%c1, %0" : "=r" (tid) : "i" (2 * sizeof(void*)) : );
++# else
+ __asm__("movq %%fs:%c1, %0" : "=r" (tid) : "i" (2 * sizeof(void*)) : );
++# endif
+ #elif defined(Q_PROCESSOR_X86_64) && defined(Q_OS_WIN)
+ // See https://en.wikipedia.org/wiki/Win32_Thread_Information_Block
diff --git a/dev-qt/qtbase/qtbase-6.6.2.ebuild
b/dev-qt/qtbase/qtbase-6.6.2.ebuild
index fe273bc5f7c9..14520bcdd35c 100644
--- a/dev-qt/qtbase/qtbase-6.6.2.ebuild
+++ b/dev-qt/qtbase/qtbase-6.6.2.ebuild
@@ -137,6 +137,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-6.5.2-no-glx.patch
"${FILESDIR}"/${PN}-6.5.2-no-symlink-check.patch
"${FILESDIR}"/${PN}-6.6.1-forkfd-childstack-size.patch
+ "${FILESDIR}"/${PN}-6.6.2-x32abi.patch
)
src_prepare() {
diff --git a/dev-qt/qtbase/qtbase-6.6..ebuild
b/dev-qt/qtbase/qtbase-6.6..ebuild
index d7b14a3f1a66..a39a20691815 100644
--- a/dev-qt/qtbase/qtbase-6.6..ebuild
+++ b/dev-qt/qtbase/qtbase-6.6..ebuild
@@ -137,6 +137,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-6.5.2-no-glx.patch
"${FILESDIR}"/${PN}-6.5.2-no-symlink-check.patch
"${FILESDIR}"/${PN}-6.6.1-forkfd-childstack-size.patch
+ "${FILESDIR}"/${PN}-6.6.2-x32abi.patch
)
src_prepare() {
diff --git a/dev-qt/qtbase/qtbase-6.7..ebuild
b/dev-qt/qtbase/qtbase-6.7..ebuild
index e2aa70f1ea9b..c2827c3f3ac9 100644
--- a/dev-qt/qtbase/qtbase-6.7..ebuild
+++ b/dev-qt/qtbase/qtbase-6.7..ebuild
@@ -138,6 +138,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-6.5.2-hppa-forkfd-grow-stack.patch
"${FILESDIR}"/${PN}-6.5.2-no-symlink-check.patch
"${FILESDIR}"/${PN}-6.6.1-forkfd-childstack-size.patch
+ "${FILESDIR}"/${PN}-6.6.2-x32abi.patch
)
src_prepare() {
diff --git a/dev-qt/qtbase/qtbase-6..ebuild
b/dev-qt/qtbase/qtbase-6..ebuild
index e2aa70f1ea9b..c2827c3f3ac9 100644
--- a/dev-qt/qtbase/qtbase-6..ebuild
+++ b/dev-qt/qtbase/qtbase-6..ebuild
@@ -138,6 +138,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-6.5.2-hppa-forkfd-grow-stack.patch
"${FILESDIR}"/${PN}-6.5.2-no-symlink-check.patch
"${FILESDIR}"/${PN}-6.6.1-forkfd-childstack-size.patch
+ "${FILESDIR}"/${PN}-6.6.2-x32abi.patch
)
src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtbase/files/, dev-qt/qtbase/
commit: 785817491b48b00f3710438c983e97aab7d23a69 Author: Ionen Wolkens gentoo org> AuthorDate: Wed Nov 15 18:01:04 2023 + Commit: Ionen Wolkens gentoo org> CommitDate: Wed Nov 15 19:27:59 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78581749 dev-qt/qtbase: drop 6.5.2-r2 Signed-off-by: Ionen Wolkens gentoo.org> dev-qt/qtbase/Manifest | 1 - .../qtbase/files/qtbase-6.5.2-CVE-2023-38197.patch | 404 - dev-qt/qtbase/files/qtbase-6.5.2-tests-gcc13.patch | 25 -- dev-qt/qtbase/qtbase-6.5.2-r2.ebuild | 351 -- 4 files changed, 781 deletions(-) diff --git a/dev-qt/qtbase/Manifest b/dev-qt/qtbase/Manifest index b6ec5a5ee2e7..50d58187908e 100644 --- a/dev-qt/qtbase/Manifest +++ b/dev-qt/qtbase/Manifest @@ -1,3 +1,2 @@ -DIST qtbase-everywhere-src-6.5.2.tar.xz 48410716 BLAKE2B 578c69ede6f45a8b21cba0a24674d5d8801722503d13ab9578b06b2446ce15e6a84bcdbd0c5d2c9aa868ec70862f0845406c959ed79b695f82bb398ecf299c63 SHA512 8d97029aae5b73a3e03624c9a8495dbf2fe54a4f5e992071c06f3d93935e64c80f2121b33eeb60a92d96ceb288cb25d74906a5bf47b45bb018d859d4a2d13f20 DIST qtbase-everywhere-src-6.5.3.tar.xz 47142456 BLAKE2B 5b4c774b7199563dc7f2aebf9b2b531d851ee49bc038212f4970eeb43a17c364710432708f82a518eee6692ab123d78b642c234d9548d5b553f689a43aa05ee6 SHA512 31c6c01d466f1e01f18d6dcee593360c08ee83ad0a6be495a8eba023faad628cf07ce7285426fabfd247db306319e9a64da329682c99a712a282e32f7493cdb9 DIST qtbase-everywhere-src-6.6.0.tar.xz 48350308 BLAKE2B 719e265dfafb4fd95f972a317acb95e2d83f8d62175c28ab97837c635435bdcd79bdca113362dea2f04dab799d4749e23056ddb9583908ee20ab23cedeca19b7 SHA512 4e85acefeddc0a3cd6ba615b4768f435c4e237a605172153a1777a10285dab83d9cf220c18ce6d723d051b8b432f3e92be94925b54c2eb972c2c1d9ace849e17 diff --git a/dev-qt/qtbase/files/qtbase-6.5.2-CVE-2023-38197.patch b/dev-qt/qtbase/files/qtbase-6.5.2-CVE-2023-38197.patch deleted file mode 100644 index 220e94d9ca2f.. --- a/dev-qt/qtbase/files/qtbase-6.5.2-CVE-2023-38197.patch +++ /dev/null @@ -1,404 +0,0 @@ -Upstream: https://codereview.qt-project.org/c/qt/qtbase/+/490550 -Upstream: https://lists.qt-project.org/pipermail/development/2023-July/044166.html - -From c216c3d9859a20b3aeec985512e89316423fc3a8 Mon Sep 17 00:00:00 2001 -From: Axel Spoerl -Date: Fri, 30 Jun 2023 12:43:59 +0200 -Subject: [PATCH] QXmlStreamReader: Raise error on unexpected tokens - -QXmlStreamReader accepted multiple DOCTYPE elements, containing DTD -fragments in the XML prolog, and in the XML body. -Well-formed but invalid XML files - with multiple DTD fragments in -prolog and body, combined with recursive entity expansions - have -caused infinite loops in QXmlStreamReader. - -This patch implements a token check in QXmlStreamReader. -A stream is allowed to start with an XML prolog. StartDocument -and DOCTYPE elements are only allowed in this prolog, which -may also contain ProcessingInstruction and Comment elements. -As soon as anything else is seen, the prolog ends. -After that, the prolog-specific elements are treated as unexpected. -Furthermore, the prolog can contain at most one DOCTYPE element. - -Update the documentation to reflect the new behavior. -Add an autotest that checks the new error cases are correctly detected, -and no error is raised for legitimate input. - -The original OSS-Fuzz files (see bug reports) are not included in this -patch for file size reasons. They have been tested manually. Each of -them has more than one DOCTYPE element, causing infinite loops in -recursive entity expansions. The newly implemented functionality -detects those invalid DTD fragments. By raising an error, it aborts -stream reading before an infinite loop occurs. - -Thanks to OSS-Fuzz for finding this. - -Fixes: QTBUG-92113 -Fixes: QTBUG-95188 -Change-Id: I0a082b9188b2eee50b396c4d5b1c9e1fd237bbdd -Reviewed-by: Volker Hilsheimer -(cherry picked from commit c4301be7d5f94852e1b17f2c2989d5ca807855d4) - src/corelib/serialization/qxmlstream.cpp | 145 +++-- - src/corelib/serialization/qxmlstream_p.h | 11 ++ - .../qxmlstream/tokenError/dtdInBody.xml| 20 +++ - .../qxmlstream/tokenError/multipleDtd.xml | 20 +++ - .../qxmlstream/tokenError/wellFormed.xml | 15 +++ - .../serialization/qxmlstream/tst_qxmlstream.cpp| 39 ++ - 6 files changed, 242 insertions(+), 8 deletions(-) - create mode 100644 tests/auto/corelib/serialization/qxmlstream/tokenError/dtdInBody.xml - create mode 100644 tests/auto/corelib/serialization/qxmlstream/tokenError/multipleDtd.xml - create mode 100644 tests/auto/corelib/serialization/qxmlstream/tokenError/wellFormed.xml - -diff --git a/src/corelib/serialization/qxmlstream.cpp b/src/corelib/serialization/qxmlstream.cpp -index 6e34d4da6e5a..cf46d690f122 100644 a/src/corelib/serialization/qxmlstream.cpp -+++ b/src/corelib/serialization/qxmlstream.cpp -@@ -185,7 +185,7 @@
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtbase/files/, dev-qt/qtbase/
commit: 9152c25f592db19e2d6f6ab0aab991a463503a34
Author: Ionen Wolkens gentoo org>
AuthorDate: Sat Oct 21 05:46:22 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Sat Oct 21 06:21:50 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9152c25f
dev-qt/qtbase: fix qsb and qmake with sandbox
Also add to 6.5.3, while the issue has been less prominent in
6.5.x, there has been users that ran into issues with older
versions, and is needed for stable users.
See bug #915695 for details, the others are essentially duplicates
which are hopefully fixed too (please report if still issues given
I could never reproduce myself and cannot confirm).
Closes: https://bugs.gentoo.org/908809
Closes: https://bugs.gentoo.org/908816
Closes: https://bugs.gentoo.org/913493
Closes: https://bugs.gentoo.org/915695
Thanks-to: vowstar
Thanks-to: Mike Gilbert gentoo.org>
Signed-off-by: Ionen Wolkens gentoo.org>
.../qtbase-6.5.3-forkfd-childstack-size.patch | 27 ++
...{qtbase-6.5.3.ebuild => qtbase-6.5.3-r1.ebuild} | 1 +
...{qtbase-6.6.0.ebuild => qtbase-6.6.0-r1.ebuild} | 1 +
3 files changed, 29 insertions(+)
diff --git a/dev-qt/qtbase/files/qtbase-6.5.3-forkfd-childstack-size.patch
b/dev-qt/qtbase/files/qtbase-6.5.3-forkfd-childstack-size.patch
new file mode 100644
index ..34cbec61895b
--- /dev/null
+++ b/dev-qt/qtbase/files/qtbase-6.5.3-forkfd-childstack-size.patch
@@ -0,0 +1,27 @@
+Avoid crash that happens for some users in qsb, qmake, and
+potentially other Qt tools when ran under sandbox leading
+to build failures for qtdeclarative and other packages.
+
+Note that this is the initial (simple) version of the patch
+to ensure no issues, a more proper fix should land upstream
+eventually.
+
+https://bugs.gentoo.org/908809
+https://bugs.gentoo.org/908816
+https://bugs.gentoo.org/913493
+https://bugs.gentoo.org/915695
+https://codereview.qt-project.org/c/qt/qtbase/+/513140
+From: Huang Rui
+Date: Fri, 20 Oct 2023 10:16:01 +0800
+Subject: [PATCH] folkfd_linux,c: set stack size to 8192
+--- a/src/3rdparty/forkfd/forkfd_linux.c
b/src/3rdparty/forkfd/forkfd_linux.c
+@@ -157,7 +157,7 @@ static int system_forkfd_pidfd_set_flags(int pidfd, int
flags)
+
+ int system_vforkfd(int flags, pid_t *ppid, int (*childFn)(void *), void
*token, int *system)
+ {
+-__attribute__((aligned(64))) char childStack[4096];
++__attribute__((aligned(64))) char childStack[8192];
+ pid_t pid;
+ int pidfd;
+ unsigned long cloneflags = CLONE_PIDFD | CLONE_VFORK | CLONE_VM | SIGCHLD;
diff --git a/dev-qt/qtbase/qtbase-6.5.3.ebuild
b/dev-qt/qtbase/qtbase-6.5.3-r1.ebuild
similarity index 99%
rename from dev-qt/qtbase/qtbase-6.5.3.ebuild
rename to dev-qt/qtbase/qtbase-6.5.3-r1.ebuild
index e58d9d0e80e4..b166e0302241 100644
--- a/dev-qt/qtbase/qtbase-6.5.3.ebuild
+++ b/dev-qt/qtbase/qtbase-6.5.3-r1.ebuild
@@ -137,6 +137,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-6.5.2-no-glx.patch
"${FILESDIR}"/${PN}-6.5.2-no-symlink-check.patch
"${FILESDIR}"/${PN}-6.5.3-xkbcommon160.patch
+ "${FILESDIR}"/${PN}-6.5.3-forkfd-childstack-size.patch
)
src_prepare() {
diff --git a/dev-qt/qtbase/qtbase-6.6.0.ebuild
b/dev-qt/qtbase/qtbase-6.6.0-r1.ebuild
similarity index 99%
rename from dev-qt/qtbase/qtbase-6.6.0.ebuild
rename to dev-qt/qtbase/qtbase-6.6.0-r1.ebuild
index d41f291526d3..044f46b80925 100644
--- a/dev-qt/qtbase/qtbase-6.6.0.ebuild
+++ b/dev-qt/qtbase/qtbase-6.6.0-r1.ebuild
@@ -137,6 +137,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-6.5.2-no-glx.patch
"${FILESDIR}"/${PN}-6.5.2-no-symlink-check.patch
"${FILESDIR}"/${PN}-6.5.3-xkbcommon160.patch
+ "${FILESDIR}"/${PN}-6.5.3-forkfd-childstack-size.patch
)
src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtbase/files/, dev-qt/qtbase/
commit: 7f6c7b9be96640df5b5e0fad5807990651ffb315
Author: Ionen Wolkens gentoo org>
AuthorDate: Tue Sep 19 02:57:21 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Tue Sep 19 02:59:48 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f6c7b9b
dev-qt/qtbase: import hppa forkfd fix from debian
Some of bug #914371's issues could (ideally) still need looking
into/attention, but believe reasonable to close for now and allow
keywording assuming did not overlook anything.
Closes: https://bugs.gentoo.org/914371
Signed-off-by: Ionen Wolkens gentoo.org>
.../qtbase-6.5.2-hppa-forkfd-grow-stack.patch | 28 ++
dev-qt/qtbase/qtbase-6.5.2-r2.ebuild | 1 +
dev-qt/qtbase/qtbase-6.5..ebuild | 1 +
dev-qt/qtbase/qtbase-6.6..ebuild | 1 +
dev-qt/qtbase/qtbase-6..ebuild | 1 +
5 files changed, 32 insertions(+)
diff --git a/dev-qt/qtbase/files/qtbase-6.5.2-hppa-forkfd-grow-stack.patch
b/dev-qt/qtbase/files/qtbase-6.5.2-hppa-forkfd-grow-stack.patch
new file mode 100644
index ..ccada9f80e34
--- /dev/null
+++ b/dev-qt/qtbase/files/qtbase-6.5.2-hppa-forkfd-grow-stack.patch
@@ -0,0 +1,28 @@
+Patch taken from Debian[1], largely broken on HPPA without and several
+tests give segmentation faults[2].
+
+Needs upstreaming if someone familiar with HPPA wants to give this
+attention. Note forkfd is essentially maintained in qtbase's repo[3]
+rather than truly third party.
+
+[1] https://bugs.debian.org/1042018
+[2] https://bugs.gentoo.org/914371
+[3] https://code.qt.io/cgit/qt/qtbase.git/tree/src/3rdparty/forkfd
+
+Description: Change how stack grows on HPPA.
+ On HPPA stack grows upwards. This patch introduces this change for
+ this 3rd party code.
+Author: John David Anglin
+--- a/src/3rdparty/forkfd/forkfd_linux.c
b/src/3rdparty/forkfd/forkfd_linux.c
+@@ -170,5 +170,10 @@
+ *system = 1;
+
++#if defined(__hppa__)
++/* Stack grows up */
++pid = clone(childFn, childStack, cloneflags, token, , NULL, NULL);
++#else
+ pid = clone(childFn, childStack + sizeof(childStack), cloneflags, token,
, NULL, NULL);
++#endif
+ if (pid < 0)
+ return pid;
diff --git a/dev-qt/qtbase/qtbase-6.5.2-r2.ebuild
b/dev-qt/qtbase/qtbase-6.5.2-r2.ebuild
index c47ffa70d566..add31f2972ab 100644
--- a/dev-qt/qtbase/qtbase-6.5.2-r2.ebuild
+++ b/dev-qt/qtbase/qtbase-6.5.2-r2.ebuild
@@ -130,6 +130,7 @@ PDEPEND="
"
PATCHES=(
+ "${FILESDIR}"/${PN}-6.5.2-hppa-forkfd-grow-stack.patch
"${FILESDIR}"/${PN}-6.5.2-no-symlink-check.patch
"${FILESDIR}"/${P}-CVE-2023-38197.patch
"${FILESDIR}"/${P}-tests-gcc13.patch
diff --git a/dev-qt/qtbase/qtbase-6.5..ebuild
b/dev-qt/qtbase/qtbase-6.5..ebuild
index a5e477d6c8c6..9511c2c54404 100644
--- a/dev-qt/qtbase/qtbase-6.5..ebuild
+++ b/dev-qt/qtbase/qtbase-6.5..ebuild
@@ -130,6 +130,7 @@ PDEPEND="
"
PATCHES=(
+ "${FILESDIR}"/${PN}-6.5.2-hppa-forkfd-grow-stack.patch
"${FILESDIR}"/${PN}-6.5.2-no-symlink-check.patch
)
diff --git a/dev-qt/qtbase/qtbase-6.6..ebuild
b/dev-qt/qtbase/qtbase-6.6..ebuild
index ba01c16ca68f..87e7e43c198a 100644
--- a/dev-qt/qtbase/qtbase-6.6..ebuild
+++ b/dev-qt/qtbase/qtbase-6.6..ebuild
@@ -130,6 +130,7 @@ PDEPEND="
"
PATCHES=(
+ "${FILESDIR}"/${PN}-6.5.2-hppa-forkfd-grow-stack.patch
"${FILESDIR}"/${PN}-6.5.2-no-symlink-check.patch
)
diff --git a/dev-qt/qtbase/qtbase-6..ebuild
b/dev-qt/qtbase/qtbase-6..ebuild
index 21e519807742..0df3665e86a0 100644
--- a/dev-qt/qtbase/qtbase-6..ebuild
+++ b/dev-qt/qtbase/qtbase-6..ebuild
@@ -132,6 +132,7 @@ PDEPEND="
"
PATCHES=(
+ "${FILESDIR}"/${PN}-6.5.2-hppa-forkfd-grow-stack.patch
"${FILESDIR}"/${PN}-6.5.2-no-symlink-check.patch
)
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtbase/files/, dev-qt/qtbase/
commit: 4d490887059ff73ebd7ad9d76348c001d02c5ef5
Author: Ionen Wolkens gentoo org>
AuthorDate: Thu Sep 14 20:08:52 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Thu Sep 14 20:14:09 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d490887
dev-qt/qtbase: skip build dir's symlink check
Closes: https://bugs.gentoo.org/914195
Signed-off-by: Ionen Wolkens gentoo.org>
dev-qt/qtbase/files/qtbase-6.5.2-no-symlink-check.patch | 5 +
dev-qt/qtbase/qtbase-6.5.2-r2.ebuild| 1 +
dev-qt/qtbase/qtbase-6.5..ebuild| 4
dev-qt/qtbase/qtbase-6.6..ebuild| 4
dev-qt/qtbase/qtbase-6..ebuild | 4
5 files changed, 18 insertions(+)
diff --git a/dev-qt/qtbase/files/qtbase-6.5.2-no-symlink-check.patch
b/dev-qt/qtbase/files/qtbase-6.5.2-no-symlink-check.patch
new file mode 100644
index ..815fd3955420
--- /dev/null
+++ b/dev-qt/qtbase/files/qtbase-6.5.2-no-symlink-check.patch
@@ -0,0 +1,5 @@
+https://bugs.gentoo.org/914195
+--- a/CMakeLists.txt
b/CMakeLists.txt
+@@ -65 +64,0 @@
+-qt_internal_check_if_path_has_symlinks("${CMAKE_BINARY_DIR}")
diff --git a/dev-qt/qtbase/qtbase-6.5.2-r2.ebuild
b/dev-qt/qtbase/qtbase-6.5.2-r2.ebuild
index fdddf8ec8f89..f0eca7d2ab6c 100644
--- a/dev-qt/qtbase/qtbase-6.5.2-r2.ebuild
+++ b/dev-qt/qtbase/qtbase-6.5.2-r2.ebuild
@@ -129,6 +129,7 @@ PDEPEND="
"
PATCHES=(
+ "${FILESDIR}"/${PN}-6.5.2-no-symlink-check.patch
"${FILESDIR}"/${P}-CVE-2023-38197.patch
"${FILESDIR}"/${P}-tests-gcc13.patch
)
diff --git a/dev-qt/qtbase/qtbase-6.5..ebuild
b/dev-qt/qtbase/qtbase-6.5..ebuild
index bf8d33b74e87..d7374a33f357 100644
--- a/dev-qt/qtbase/qtbase-6.5..ebuild
+++ b/dev-qt/qtbase/qtbase-6.5..ebuild
@@ -128,6 +128,10 @@ PDEPEND="
wayland? ( ~dev-qt/qtwayland-${PV}:6 )
"
+PATCHES=(
+ "${FILESDIR}"/${PN}-6.5.2-no-symlink-check.patch
+)
+
src_prepare() {
qt6-build_src_prepare
diff --git a/dev-qt/qtbase/qtbase-6.6..ebuild
b/dev-qt/qtbase/qtbase-6.6..ebuild
index 980755e275ba..8580c287a200 100644
--- a/dev-qt/qtbase/qtbase-6.6..ebuild
+++ b/dev-qt/qtbase/qtbase-6.6..ebuild
@@ -128,6 +128,10 @@ PDEPEND="
wayland? ( ~dev-qt/qtwayland-${PV}:6 )
"
+PATCHES=(
+ "${FILESDIR}"/${PN}-6.5.2-no-symlink-check.patch
+)
+
src_prepare() {
qt6-build_src_prepare
diff --git a/dev-qt/qtbase/qtbase-6..ebuild
b/dev-qt/qtbase/qtbase-6..ebuild
index b5545709934f..b02ce128351b 100644
--- a/dev-qt/qtbase/qtbase-6..ebuild
+++ b/dev-qt/qtbase/qtbase-6..ebuild
@@ -130,6 +130,10 @@ PDEPEND="
wayland? ( ~dev-qt/qtwayland-${PV}:6 )
"
+PATCHES=(
+ "${FILESDIR}"/${PN}-6.5.2-no-symlink-check.patch
+)
+
src_prepare() {
qt6-build_src_prepare
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtbase/files/, dev-qt/qtbase/
commit: 14516d8afc141ef1bb025e3e5fc83226136d9394
Author: Jimi Huotari gentoo org>
AuthorDate: Wed Jul 26 13:23:21 2023 +
Commit: Jimi Huotari gentoo org>
CommitDate: Wed Jul 26 13:30:57 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14516d8a
dev-qt/qtbase: drop 6.5.1-r1
Closes: https://bugs.gentoo.org/908384
Signed-off-by: Jimi Huotari gentoo.org>
dev-qt/qtbase/Manifest | 1 -
.../qtbase/files/qtbase-6.5.1-CVE-2023-34410.patch | 54 --
dev-qt/qtbase/qtbase-6.5.1-r1.ebuild | 190 -
3 files changed, 245 deletions(-)
diff --git a/dev-qt/qtbase/Manifest b/dev-qt/qtbase/Manifest
index f18d34b4b586..9476478fb0bf 100644
--- a/dev-qt/qtbase/Manifest
+++ b/dev-qt/qtbase/Manifest
@@ -1,2 +1 @@
-DIST qtbase-everywhere-src-6.5.1.tar.xz 48287392 BLAKE2B
47872492f21a936d980891c28df61591380bc236adc66b57a90fbb87dd292cdeb3c632fb1159231ba40142d25e02944e4c5e8568153f1286e0a1abc8c5b26699
SHA512
7f7b20bbc25cda65266d6067cdd68e3e077636988d67dbf5783f79a61186135fb3a36d57ac72cfe4501012035b630ab1f5849148e4817726d4f459fa1937e91a
DIST qtbase-everywhere-src-6.5.2.tar.xz 48410716 BLAKE2B
578c69ede6f45a8b21cba0a24674d5d8801722503d13ab9578b06b2446ce15e6a84bcdbd0c5d2c9aa868ec70862f0845406c959ed79b695f82bb398ecf299c63
SHA512
8d97029aae5b73a3e03624c9a8495dbf2fe54a4f5e992071c06f3d93935e64c80f2121b33eeb60a92d96ceb288cb25d74906a5bf47b45bb018d859d4a2d13f20
diff --git a/dev-qt/qtbase/files/qtbase-6.5.1-CVE-2023-34410.patch
b/dev-qt/qtbase/files/qtbase-6.5.1-CVE-2023-34410.patch
deleted file mode 100644
index 6f1264709e01..
--- a/dev-qt/qtbase/files/qtbase-6.5.1-CVE-2023-34410.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From: https://lists.qt-project.org/pipermail/development/2023-June/044031.html
-
a/src/plugins/tls/schannel/qtls_schannel.cpp
-+++ b/src/plugins/tls/schannel/qtls_schannel.cpp
-@@ -2106,6 +2106,27 @@ bool
TlsCryptographSchannel::verifyCertContext(CERT_CONTEXT *certContext)
- verifyDepth = DWORD(q->peerVerifyDepth());
-
- const auto = q->sslConfiguration().caCertificates();
-+
-+if (!rootCertOnDemandLoadingAllowed()
-+&& !(chain->TrustStatus.dwErrorStatus &
CERT_TRUST_IS_PARTIAL_CHAIN)
-+&& (q->peerVerifyMode() == QSslSocket::VerifyPeer
-+|| (isClient && q->peerVerifyMode() ==
QSslSocket::AutoVerifyPeer))) {
-+// When verifying a peer Windows "helpfully" builds a chain that
-+// may include roots from the system store. But we don't want that if
-+// the user has set their own CA certificates.
-+// Since Windows claims this is not a partial chain the root is
included
-+// and we have to check that it is one of our configured CAs.
-+CERT_CHAIN_ELEMENT *element = chain->rgpElement[chain->cElement - 1];
-+QSslCertificate certificate = getCertificateFromChainElement(element);
-+if (!caCertificates.contains(certificate)) {
-+auto error = QSslError(QSslError::CertificateUntrusted,
certificate);
-+sslErrors += error;
-+emit q->peerVerifyError(error);
-+if (q->state() != QAbstractSocket::ConnectedState)
-+return false;
-+}
-+}
-+
- QList peerCertificateChain;
- for (DWORD i = 0; i < verifyDepth; i++) {
- CERT_CHAIN_ELEMENT *element = chain->rgpElement[i];
-
a/src/network/ssl/qsslsocket.cpp
-+++ b/src/network/ssl/qsslsocket.cpp
-@@ -1973,6 +1973,10 @@ QSslSocketPrivate::QSslSocketPrivate()
- , flushTriggered(false)
- {
- QSslConfigurationPrivate::deepCopyDefaultConfiguration();
-+// If the global configuration doesn't allow root certificates to be
loaded
-+// on demand then we have to disable it for this socket as well.
-+if (!configuration.allowRootCertOnDemandLoading)
-+allowRootCertOnDemandLoading = false;
-
- const auto *tlsBackend = tlsBackendInUse();
- if (!tlsBackend) {
-@@ -2281,6 +2285,7 @@ void
QSslConfigurationPrivate::deepCopyDefaultConfiguration(QSslConfigurationPri
- ptr->sessionProtocol = global->sessionProtocol;
- ptr->ciphers = global->ciphers;
- ptr->caCertificates = global->caCertificates;
-+ptr->allowRootCertOnDemandLoading = global->allowRootCertOnDemandLoading;
- ptr->protocol = global->protocol;
- ptr->peerVerifyMode = global->peerVerifyMode;
- ptr->peerVerifyDepth = global->peerVerifyDepth;
diff --git a/dev-qt/qtbase/qtbase-6.5.1-r1.ebuild
b/dev-qt/qtbase/qtbase-6.5.1-r1.ebuild
deleted file mode 100644
index 4bcdc55ce530..
--- a/dev-qt/qtbase/qtbase-6.5.1-r1.ebuild
+++ /dev/null
@@ -1,190 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qt6-build
-
-DESCRIPTION="Cross-platform application development framework"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64"
-fi
-
-#
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtbase/files/, dev-qt/qtbase/
commit: 72e1715fd97db6b3e24ceb54efc427a9d45e5808
Author: Jimi Huotari gentoo org>
AuthorDate: Sat Apr 15 18:38:58 2023 +
Commit: Jimi Huotari gentoo org>
CommitDate: Sat Apr 15 18:38:58 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72e1715f
dev-qt/qtbase: add 6.5.0
Signed-off-by: Jimi Huotari gentoo.org>
dev-qt/qtbase/Manifest | 1 +
...-6.5.0-setActiveWindow-deprecated-version.patch | 35
dev-qt/qtbase/qtbase-6.5.0.ebuild | 188 +
3 files changed, 224 insertions(+)
diff --git a/dev-qt/qtbase/Manifest b/dev-qt/qtbase/Manifest
index 06d185fe31f1..6a809db4d6cb 100644
--- a/dev-qt/qtbase/Manifest
+++ b/dev-qt/qtbase/Manifest
@@ -1 +1,2 @@
DIST qtbase-everywhere-src-6.4.3.tar.xz 48078536 BLAKE2B
36d693535479677ca319485634c3eea9dc3c8e8870c8e3cab7693cab601f26c6f792ec056b66488db290defc771b65cdffdea16b420a24ea55e5c4f250119a70
SHA512
a2d0779ba7ee8b8b78f5dc8db06177d04d50463fea7cad0b7785721acfc33dbbbaa1a7bfc052edb90ba1d11b488c30004daa43b6924a97126b9b8f82ad1a7f43
+DIST qtbase-everywhere-src-6.5.0.tar.xz 48020636 BLAKE2B
234000eeb6e1b57a1c7561613bf437453fc2db0d23d5ddd61c38961311a7de5263c086864554aff7a0bc1e5a406af78ef8342eed3c8a5f48b9237912614f380b
SHA512
29f70b9a9650afdd8e34703a7a8191feab4c3a25d0bc3a41010ea842389335b24e2685721fdb4a03653475ebd9bf8a8e4f4a77bf5d64b1289590b5ca0e4623f3
diff --git
a/dev-qt/qtbase/files/qtbase-6.5.0-setActiveWindow-deprecated-version.patch
b/dev-qt/qtbase/files/qtbase-6.5.0-setActiveWindow-deprecated-version.patch
new file mode 100644
index ..0ba60e01e02a
--- /dev/null
+++ b/dev-qt/qtbase/files/qtbase-6.5.0-setActiveWindow-deprecated-version.patch
@@ -0,0 +1,35 @@
+Upstream commit:
https://code.qt.io/cgit/qt/qtbase.git/commit/?h=6.5=bbb330c95fd
+
+From bbb330c95fdf6161b23227cb08cec58cca31e465 Mon Sep 17 00:00:00 2001
+From: Nicolas Fella
+Date: Tue, 14 Mar 2023 19:14:41 +0100
+Subject: QApplication: Fix DEPRECATED_VERSION for setActiveWindow
+
+It's not deprecated in 6.4, only 6.5
+
+Change-Id: I86a09b9ce5a7f4d8b1d80a6e67218dfe00f93844
+Reviewed-by: Volker Hilsheimer
+(cherry picked from commit 99975ec07feb6b1a9f6be9e0d392a35e40f9550a)
+Reviewed-by: Qt Cherry-pick Bot
+---
+ src/widgets/kernel/qapplication.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/widgets/kernel/qapplication.h
b/src/widgets/kernel/qapplication.h
+index c4c73d4cf8..fd698fb69f 100644
+--- a/src/widgets/kernel/qapplication.h
b/src/widgets/kernel/qapplication.h
+@@ -79,8 +79,8 @@ public:
+
+ static QWidget *activeWindow();
+
+-#if QT_DEPRECATED_SINCE(6,4)
+-QT_DEPRECATED_VERSION_X_6_4("Use QWidget::activateWindow() instead.")
++#if QT_DEPRECATED_SINCE(6, 5)
++QT_DEPRECATED_VERSION_X_6_5("Use QWidget::activateWindow() instead.")
+ static void setActiveWindow(QWidget* act);
+ #endif
+
+--
+cgit v1.2.3
+
diff --git a/dev-qt/qtbase/qtbase-6.5.0.ebuild
b/dev-qt/qtbase/qtbase-6.5.0.ebuild
new file mode 100644
index ..38de403b3daf
--- /dev/null
+++ b/dev-qt/qtbase/qtbase-6.5.0.ebuild
@@ -0,0 +1,188 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qt6-build
+
+DESCRIPTION="Cross-platform application development framework"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+ KEYWORDS="~amd64"
+fi
+
+# Qt Modules
+IUSE="+concurrent +dbus +gui +network +sql opengl +widgets +xml zstd"
+REQUIRED_USE="
+ opengl? ( gui )
+ widgets? ( gui )
+ X? ( || ( evdev libinput ) )
+"
+
+QTGUI_IUSE="accessibility egl eglfs evdev gles2-only +jpeg +libinput tslib
tuio vulkan +X"
+QTNETWORK_IUSE="brotli gssapi libproxy sctp +ssl vnc"
+QTSQL_IUSE="freetds mysql oci8 odbc postgres +sqlite"
+IUSE+=" ${QTGUI_IUSE} ${QTNETWORK_IUSE} ${QTSQL_IUSE} cups gtk icu systemd
+udev"
+# QtPrintSupport = QtGui + QtWidgets enabled.
+# ibus = xkbcommon + dbus, and xkbcommon needs either libinput or X
+REQUIRED_USE+="
+ $(printf '%s? ( gui ) ' ${QTGUI_IUSE//+/})
+ $(printf '%s? ( network ) ' ${QTNETWORK_IUSE//+/})
+ $(printf '%s? ( sql ) ' ${QTSQL_IUSE//+/})
+ accessibility? ( dbus X )
+ cups? ( gui widgets )
+ eglfs? ( egl )
+ gtk? ( widgets )
+ gui? ( || ( eglfs X ) || ( libinput X ) )
+ libinput? ( udev )
+ sql? ( || ( freetds mysql oci8 odbc postgres sqlite ) )
+ vnc? ( gui )
+ X? ( gles2-only? ( egl ) )
+"
+
+# TODO:
+# qtimageformats: mng not done yet, qtimageformats.git upstream commit 9443239c
+# qtnetwork: connman, networkmanager
+DEPEND="
+ app-crypt/libb2
+ dev-libs/double-conversion:=
+ dev-libs/glib:2
+ dev-libs/libpcre2:=[pcre16,unicode]
+ dev-util/gtk-update-icon-cache
+ media-libs/fontconfig
+ >=media-libs/freetype-2.6.1:2
+ >=media-libs/harfbuzz-1.6.0:=
+ media-libs/tiff:=
+ >=sys-apps/dbus-1.4.20
+
