gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 04:59:14 -07:00
Code Issues Projects Releases Wiki Activity

dev-qt/qtwebengine: workaround gcc17 ICE in 6.11+

Browse Source 
Not adding to patchset yet given sounds like issue may not be long
lived (already partially fixed), guess there's even chances it'll
be fixed before 6.11.1 releases due to delays.

Leaving stable 6.10.3 alone.

Bug: https://bugs.gentoo.org/973445
Signed-off-by: Ionen Wolkens <ionen@gentoo.org>
This commit is contained in:
Ionen Wolkens
2026-05-03 21:59:28 -04:00
parent e815cc4e67
commit 0f7ab4dee7
4 changed files with 32 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
dev-qt/qtwebengine/files/qtwebengine-6.11.0-gcc17.patch Normal file
View File

@@ -0,0 +1,29 @@
https://bugs.gentoo.org/973445
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=125064
--- a/src/3rdparty/chromium/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/compiler_specific.h
+++ b/src/3rdparty/chromium/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/compiler_specific.h
@@ -352,5 +352,5 @@
// struct PA_TRIVIAL_ABI S { ~S(); }
// ```
-#if PA_HAS_CPP_ATTRIBUTE(clang::trivial_abi)
+#if PA_HAS_CPP_ATTRIBUTE(clang::trivial_abi) && defined(__clang__)
#define PA_TRIVIAL_ABI [[clang::trivial_abi]]
#else
--- a/src/3rdparty/chromium/base/compiler_specific.h
+++ b/src/3rdparty/chromium/base/compiler_specific.h
@@ -575,5 +575,5 @@
// struct TRIVIAL_ABI S { ~S(); }
// ```
-#if __has_cpp_attribute(clang::trivial_abi)
+#if __has_cpp_attribute(clang::trivial_abi) && defined(__clang__)
#define TRIVIAL_ABI [[clang::trivial_abi]]
#else
--- a/src/3rdparty/chromium/skia/config/SkUserConfig.h
+++ b/src/3rdparty/chromium/skia/config/SkUserConfig.h
@@ -104,5 +104,5 @@
#if defined(__has_attribute)
-#if __has_attribute(trivial_abi)
+#if __has_attribute(trivial_abi) && defined(__clang__)
#define SK_TRIVIAL_ABI [[clang::trivial_abi]]
#else

1
dev-qt/qtwebengine/qtwebengine-6.11.0.ebuild
View File

@@ -110,6 +110,7 @@ PATCHES+=(
# add extras as needed here, may merge in set if carries across versions
"${FILESDIR}"/${PN}-6.10.2-clang-22.patch
"${FILESDIR}"/${PN}-6.10.3-climits.patch
"${FILESDIR}"/${PN}-6.11.0-gcc17.patch
)
python_check_deps() {

1
dev-qt/qtwebengine/qtwebengine-6.11.9999.ebuild
View File

@@ -111,6 +111,7 @@ PATCHES+=(
# add extras as needed here, may merge in set if carries across versions
"${FILESDIR}"/${PN}-6.10.2-clang-22.patch
"${FILESDIR}"/${PN}-6.10.3-climits.patch
"${FILESDIR}"/${PN}-6.11.0-gcc17.patch
)
python_check_deps() {

1
dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
View File

@@ -110,6 +110,7 @@ PATCHES=( "${WORKDIR}"/patches/${PN} )
PATCHES+=(
# add extras as needed here, may merge in set if carries across versions
"${FILESDIR}"/${PN}-6.10.3-climits.patch
"${FILESDIR}"/${PN}-6.11.0-gcc17.patch
)
python_check_deps() {