commit:     7f983f82c666d8b0f677109569c9b88e1701889d
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 18 12:51:50 2023 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon Dec 18 18:18:34 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f983f82

dev-qt/qtwebengine: fix 6.6.x build with gcc14

Closes: https://bugs.gentoo.org/920257
Thanks-to: Sam James <sam <AT> gentoo.org>
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 dev-qt/qtwebengine/files/qtwebengine-6.6.1-gcc14.patch | 18 ++++++++++++++++++
 dev-qt/qtwebengine/qtwebengine-6.6.1.ebuild            |  1 +
 dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild         |  1 +
 3 files changed, 20 insertions(+)

diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.6.1-gcc14.patch 
b/dev-qt/qtwebengine/files/qtwebengine-6.6.1-gcc14.patch
new file mode 100644
index 000000000000..928e9b8f6e43
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-6.6.1-gcc14.patch
@@ -0,0 +1,18 @@
+Patch status: fixed in >=qtwebengine-6.7
+
+https://bugs.gentoo.org/920257
+https://chromium-review.googlesource.com/c/v8/v8/+/4583222
+From: Sam James <s...@gentoo.org>
+Date: Sun, 4 Jun 2023 04:15:16 +0100
+Subject: [PATCH] heap: Add missing <algorithm> include for std::remove
+
+GCC 14 changes some internal includes within libstdc++ so this transient
+include gets lost. Include <algorithm> explicitly for std::remove.
+--- a/src/3rdparty/chromium/v8/src/heap/cppgc/stats-collector.h
++++ b/src/3rdparty/chromium/v8/src/heap/cppgc/stats-collector.h
+@@ -9,4 +9,5 @@
+ #include <stdint.h>
+ 
++#include <algorithm>
+ #include <atomic>
+ #include <vector>

diff --git a/dev-qt/qtwebengine/qtwebengine-6.6.1.ebuild 
b/dev-qt/qtwebengine/qtwebengine-6.6.1.ebuild
index e6288297bd1a..3d763cf8f931 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.6.1.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.6.1.ebuild
@@ -111,6 +111,7 @@ PATCHES=( "${WORKDIR}"/patches/${PN} )
 
 PATCHES+=(
        # add extras as needed here, may merge in set if carries across versions
+       "${FILESDIR}"/${PN}-6.6.1-gcc14.patch
 )
 
 python_check_deps() {

diff --git a/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild 
b/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild
index 891fd475a802..dfbb26ef419e 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild
@@ -111,6 +111,7 @@ PATCHES=( "${WORKDIR}"/patches/${PN} )
 
 PATCHES+=(
        # add extras as needed here, may merge in set if carries across versions
+       "${FILESDIR}"/${PN}-6.6.1-gcc14.patch
 )
 
 python_check_deps() {

Reply via email to