| 1 |
commit: f82979437cf504e3e45103019292356ca13951c2 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jan 30 03:59:13 2023 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jan 30 03:59:13 2023 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8297943 |
| 7 |
|
| 8 |
net-libs/webkit-gtk: fix build w/ gcc 13 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/892495 |
| 11 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 12 |
|
| 13 |
net-libs/webkit-gtk/files/2.38.3-gcc-13.patch | 25 +++++++++++++++++++++++ |
| 14 |
net-libs/webkit-gtk/webkit-gtk-2.38.3-r410.ebuild | 1 + |
| 15 |
net-libs/webkit-gtk/webkit-gtk-2.38.3-r500.ebuild | 1 + |
| 16 |
net-libs/webkit-gtk/webkit-gtk-2.38.3.ebuild | 1 + |
| 17 |
4 files changed, 28 insertions(+) |
| 18 |
|
| 19 |
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 |
| 20 |
new file mode 100644 |
| 21 |
index 000000000000..860f27824ca4 |
| 22 |
--- /dev/null |
| 23 |
+++ b/net-libs/webkit-gtk/files/2.38.3-gcc-13.patch |
| 24 |
@@ -0,0 +1,25 @@ |
| 25 |
+https://bugs.gentoo.org/892495 |
| 26 |
+https://github.com/WebKit/WebKit/commit/d318bb461f040b90453bc4e100dcf967243ecd98 |
| 27 |
+ |
| 28 |
+From d318bb461f040b90453bc4e100dcf967243ecd98 Mon Sep 17 00:00:00 2001 |
| 29 |
+From: Michael Catanzaro <mcatanzaro@××××××.com> |
| 30 |
+Date: Mon, 16 Jan 2023 16:55:26 -0800 |
| 31 |
+Subject: [PATCH] WebKitGTK 2.39.4 does not build due to missing #include in |
| 32 |
+ ANGLE https://bugs.webkit.org/show_bug.cgi?id=250689 |
| 33 |
+ |
| 34 |
+Unreviewed build fix. |
| 35 |
+ |
| 36 |
+* Source/ThirdParty/ANGLE/include/GLSLANG/ShaderVars.h: |
| 37 |
+ |
| 38 |
+Canonical link: https://commits.webkit.org/258968@main |
| 39 |
+--- a/Source/ThirdParty/ANGLE/include/GLSLANG/ShaderVars.h |
| 40 |
++++ b/Source/ThirdParty/ANGLE/include/GLSLANG/ShaderVars.h |
| 41 |
+@@ -12,6 +12,7 @@ |
| 42 |
+ |
| 43 |
+ #include <algorithm> |
| 44 |
+ #include <array> |
| 45 |
++#include <cstdint> |
| 46 |
+ #include <string> |
| 47 |
+ #include <vector> |
| 48 |
+ |
| 49 |
+ |
| 50 |
|
| 51 |
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 |
| 52 |
index 8d0c26c31c6e..ca3732bbf87f 100644 |
| 53 |
--- a/net-libs/webkit-gtk/webkit-gtk-2.38.3-r410.ebuild |
| 54 |
+++ b/net-libs/webkit-gtk/webkit-gtk-2.38.3-r410.ebuild |
| 55 |
@@ -154,6 +154,7 @@ pkg_setup() { |
| 56 |
src_prepare() { |
| 57 |
cmake_src_prepare |
| 58 |
gnome2_src_prepare |
| 59 |
+ eapply "${FILESDIR}"/2.38.3-gcc-13.patch |
| 60 |
} |
| 61 |
|
| 62 |
src_configure() { |
| 63 |
|
| 64 |
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 |
| 65 |
index c5568327a0a2..0124335db111 100644 |
| 66 |
--- a/net-libs/webkit-gtk/webkit-gtk-2.38.3-r500.ebuild |
| 67 |
+++ b/net-libs/webkit-gtk/webkit-gtk-2.38.3-r500.ebuild |
| 68 |
@@ -158,6 +158,7 @@ src_prepare() { |
| 69 |
gnome2_src_prepare |
| 70 |
|
| 71 |
eapply "${FILESDIR}"/2.38.2-GTK-Fix-build-failure-in-ClipboardGtk4.cpp.patch |
| 72 |
+ eapply "${FILESDIR}"/2.38.3-gcc-13.patch |
| 73 |
} |
| 74 |
|
| 75 |
src_configure() { |
| 76 |
|
| 77 |
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.38.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.38.3.ebuild |
| 78 |
index 8700c1767670..60be0c41206e 100644 |
| 79 |
--- a/net-libs/webkit-gtk/webkit-gtk-2.38.3.ebuild |
| 80 |
+++ b/net-libs/webkit-gtk/webkit-gtk-2.38.3.ebuild |
| 81 |
@@ -152,6 +152,7 @@ pkg_setup() { |
| 82 |
src_prepare() { |
| 83 |
cmake_src_prepare |
| 84 |
gnome2_src_prepare |
| 85 |
+ eapply "${FILESDIR}"/2.38.3-gcc-13.patch |
| 86 |
} |
| 87 |
|
| 88 |
src_configure() { |
Archives