[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/

["Ionen Wolkens" <ionen@gentoo.org>]

commit:     e6920d286d96437a8ae1bddcf1068b403a3a3db2
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Thu Jan  2 14:05:03 2025 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Fri Jan  3 02:53:59 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6920d28

dev-qt/qtwebengine: workaround -D_GLIBCXX_ASSERTIONS issues in 6.8

...which is default on hardened profiles, and unfortunately cannot
revbump only for hardened, so will cause unnecessary rebuilds.

Ideally would backport the proper fix, but have not tried to identify
what fixes this and, given workaround is temporary (should be fixed in
6.9), it may not be worth the trouble meanwhile.

On a side-note, was able to reproduce with qutebrowser by visiting some
specific websites.

Closes: https://bugs.gentoo.org/947356
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 .../{qtwebengine-6.8.1.ebuild => qtwebengine-6.8.1-r1.ebuild}        | 5 ++++-
 dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild                       | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/dev-qt/qtwebengine/qtwebengine-6.8.1.ebuild b/dev-qt/qtwebengine/qtwebengine-6.8.1-r1.ebuild
similarity index 98%
rename from dev-qt/qtwebengine/qtwebengine-6.8.1.ebuild
rename to dev-qt/qtwebengine/qtwebengine-6.8.1-r1.ebuild
index b0261e05d1d0..0ae70e897de7 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.8.1.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.8.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021-2024 Gentoo Authors
+# Copyright 2021-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -236,6 +236,9 @@ src_configure() {
 	if use !custom-cflags; then
 		strip-flags # fragile
 
+		# temporary workaround for bug #947356, should be fixed in Qt 6.9.x
+		append-cppflags -U_GLIBCXX_ASSERTIONS
+
 		if is-flagq '-g?(gdb)?([2-9])'; then #914475
 			replace-flags '-g?(gdb)?([2-9])' -g1
 			ewarn "-g2+/-ggdb* *FLAGS replaced with -g1 (enable USE=custom-cflags to keep)"

diff --git a/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild
index 5272dee74a6a..aabbe2abf000 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021-2024 Gentoo Authors
+# Copyright 2021-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -235,6 +235,9 @@ src_configure() {
 	if use !custom-cflags; then
 		strip-flags # fragile
 
+		# temporary workaround for bug #947356, should be fixed in Qt 6.9.x
+		append-cppflags -U_GLIBCXX_ASSERTIONS
+
 		if is-flagq '-g?(gdb)?([2-9])'; then #914475
 			replace-flags '-g?(gdb)?([2-9])' -g1
 			ewarn "-g2+/-ggdb* *FLAGS replaced with -g1 (enable USE=custom-cflags to keep)"