summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2023-01-30 03:59:13 +0000
committerSam James <sam@gentoo.org>2023-01-30 03:59:13 +0000
commitf82979437cf504e3e45103019292356ca13951c2 (patch)
treebe53648c4a4606232993f72e46a525f78ad16c7b
parentapp-office/libreoffice: fix build w/ gcc 13 (diff)
downloadgentoo-f82979437cf504e3e45103019292356ca13951c2.tar.gz
gentoo-f82979437cf504e3e45103019292356ca13951c2.tar.bz2
gentoo-f82979437cf504e3e45103019292356ca13951c2.zip
net-libs/webkit-gtk: fix build w/ gcc 13
Closes: https://bugs.gentoo.org/892495 Signed-off-by: Sam James <sam@gentoo.org>
-rw-r--r--net-libs/webkit-gtk/files/2.38.3-gcc-13.patch25
-rw-r--r--net-libs/webkit-gtk/webkit-gtk-2.38.3-r410.ebuild1
-rw-r--r--net-libs/webkit-gtk/webkit-gtk-2.38.3-r500.ebuild1
-rw-r--r--net-libs/webkit-gtk/webkit-gtk-2.38.3.ebuild1
4 files changed, 28 insertions, 0 deletions
diff --git a/net-libs/webkit-gtk/files/2.38.3-gcc-13.patch b/net-libs/webkit-gtk/files/2.38.3-gcc-13.patch
new file mode 100644
index 000000000000..860f27824ca4
--- /dev/null
+++ b/net-libs/webkit-gtk/files/2.38.3-gcc-13.patch
@@ -0,0 +1,25 @@
+https://bugs.gentoo.org/892495
+https://github.com/WebKit/WebKit/commit/d318bb461f040b90453bc4e100dcf967243ecd98
+
+From d318bb461f040b90453bc4e100dcf967243ecd98 Mon Sep 17 00:00:00 2001
+From: Michael Catanzaro <mcatanzaro@redhat.com>
+Date: Mon, 16 Jan 2023 16:55:26 -0800
+Subject: [PATCH] WebKitGTK 2.39.4 does not build due to missing #include in
+ ANGLE https://bugs.webkit.org/show_bug.cgi?id=250689
+
+Unreviewed build fix.
+
+* Source/ThirdParty/ANGLE/include/GLSLANG/ShaderVars.h:
+
+Canonical link: https://commits.webkit.org/258968@main
+--- a/Source/ThirdParty/ANGLE/include/GLSLANG/ShaderVars.h
++++ b/Source/ThirdParty/ANGLE/include/GLSLANG/ShaderVars.h
+@@ -12,6 +12,7 @@
+
+ #include <algorithm>
+ #include <array>
++#include <cstdint>
+ #include <string>
+ #include <vector>
+
+
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.38.3-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.38.3-r410.ebuild
index 8d0c26c31c6e..ca3732bbf87f 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.38.3-r410.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.38.3-r410.ebuild
@@ -154,6 +154,7 @@ pkg_setup() {
src_prepare() {
cmake_src_prepare
gnome2_src_prepare
+ eapply "${FILESDIR}"/2.38.3-gcc-13.patch
}
src_configure() {
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.38.3-r500.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.38.3-r500.ebuild
index c5568327a0a2..0124335db111 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.38.3-r500.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.38.3-r500.ebuild
@@ -158,6 +158,7 @@ src_prepare() {
gnome2_src_prepare
eapply "${FILESDIR}"/2.38.2-GTK-Fix-build-failure-in-ClipboardGtk4.cpp.patch
+ eapply "${FILESDIR}"/2.38.3-gcc-13.patch
}
src_configure() {
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.38.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.38.3.ebuild
index 8700c1767670..60be0c41206e 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.38.3.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.38.3.ebuild
@@ -152,6 +152,7 @@ pkg_setup() {
src_prepare() {
cmake_src_prepare
gnome2_src_prepare
+ eapply "${FILESDIR}"/2.38.3-gcc-13.patch
}
src_configure() {