net-libs/webkit-gtk: fix build w/ gcc-13

Closes: https://bugs.gentoo.org/903554
Signed-off-by: Sam James <sam@gentoo.org>

7 files changed, 36 insertions, 0 deletions

diff --git a/net-libs/webkit-gtk/files/2.38.5-gcc-13.patch b/net-libs/webkit-gtk/files/2.38.5-gcc-13.patch
new file mode 100644
index 000000000000..461e7a41afe5
--- /dev/null
+++ b/net-libs/webkit-gtk/files/2.38.5-gcc-13.patch
@@ -0,0 +1,30 @@
+https://bugs.gentoo.org/903554
+https://github.com/WebKit/WebKit/pull/11910
+https://gcc.gnu.org/bugzilla/show_bug.cgi?id=109247
+https://gcc.gnu.org/bugzilla/show_bug.cgi?id=109307
+
+From 0aa2fbaeb7cd103cda9907f8fa2248cd2209b22f Mon Sep 17 00:00:00 2001
+From: Martin Liska <mliska@suse.cz>
+Date: Fri, 24 Mar 2023 10:11:51 +0100
+Subject: [PATCH] gcc13: fix rejected code by using of an explicit ctor
+
+The following code is invalid based on the analysis here:
+https://gcc.gnu.org/bugzilla/show_bug.cgi?id=109247#c5
+--- a/Source/WebCore/platform/graphics/SourceBrush.cpp
++++ b/Source/WebCore/platform/graphics/SourceBrush.cpp
+@@ -65,12 +65,12 @@
+ 
+ void SourceBrush::setGradient(Ref<Gradient>&& gradient, const AffineTransform& spaceTransform)
+ {
+-    m_brush = { Brush::LogicalGradient { WTFMove(gradient), spaceTransform } };
++    m_brush = Brush { Brush::LogicalGradient { WTFMove(gradient), spaceTransform } };
+ }
+ 
+ void SourceBrush::setPattern(Ref<Pattern>&& pattern)
+ {
+-    m_brush = { WTFMove(pattern) };
++    m_brush = Brush { WTFMove(pattern) };
+ }
+ 
+ WTF::TextStream& operator<<(TextStream& ts, const SourceBrush& brush)
+
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.38.5-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.38.5-r410.ebuild
index 4439d16a0952..3452a65b31db 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.38.5-r410.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.38.5-r410.ebuild
@@ -155,6 +155,7 @@ src_prepare() {
 	cmake_src_prepare
 	gnome2_src_prepare
 	eapply "${FILESDIR}"/2.38.3-gcc-13.patch
+	eapply "${FILESDIR}"/2.38.5-gcc-13.patch
 }
 
 src_configure() {
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.38.5-r500.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.38.5-r500.ebuild
index 82a618336e36..e3232066c118 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.38.5-r500.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.38.5-r500.ebuild
@@ -157,6 +157,7 @@ src_prepare() {
 	cmake_src_prepare
 	gnome2_src_prepare
 	eapply "${FILESDIR}"/2.38.3-gcc-13.patch
+	eapply "${FILESDIR}"/2.38.5-gcc-13.patch
 }
 
 src_configure() {
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.38.5.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.38.5.ebuild
index 34ce19042566..d028ce2e49f0 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.38.5.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.38.5.ebuild
@@ -153,6 +153,7 @@ src_prepare() {
 	cmake_src_prepare
 	gnome2_src_prepare
 	eapply "${FILESDIR}"/2.38.3-gcc-13.patch
+	eapply "${FILESDIR}"/2.38.5-gcc-13.patch
 }
 
 src_configure() {
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.0-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.0-r410.ebuild
index aadc66693cf3..91bd845a4163 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.40.0-r410.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.40.0-r410.ebuild
@@ -144,6 +144,7 @@ pkg_setup() {
 src_prepare() {
 	cmake_src_prepare
 	gnome2_src_prepare
+	eapply "${FILESDIR}"/2.38.5-gcc-13.patch
 }
 
 src_configure() {
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.0-r600.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.0-r600.ebuild
index d1f9aaeb242f..6d4bea0a0c88 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.40.0-r600.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.40.0-r600.ebuild
@@ -145,6 +145,7 @@ pkg_setup() {
 src_prepare() {
 	cmake_src_prepare
 	gnome2_src_prepare
+	eapply "${FILESDIR}"/2.38.5-gcc-13.patch
 }
 
 src_configure() {
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.0.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.0.ebuild
index 7e0ca1b9e2d9..b6fa733b5b32 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.40.0.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.40.0.ebuild
@@ -142,6 +142,7 @@ pkg_setup() {
 src_prepare() {
 	cmake_src_prepare
 	gnome2_src_prepare
+	eapply "${FILESDIR}"/2.38.5-gcc-13.patch
 }
 
 src_configure() {