From bcfb2539ed319fefd2b3605d8505666bdfc4704c Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Wed, 10 Nov 2021 20:39:37 +0100 Subject: webkitgtk: remove unneeded patch The file is already included just three lines below. Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- .../webkit/webkitgtk/include_xutil.patch | 34 ---------------------- meta/recipes-sato/webkit/webkitgtk_2.34.1.bb | 1 - 2 files changed, 35 deletions(-) delete mode 100644 meta/recipes-sato/webkit/webkitgtk/include_xutil.patch (limited to 'meta/recipes-sato') diff --git a/meta/recipes-sato/webkit/webkitgtk/include_xutil.patch b/meta/recipes-sato/webkit/webkitgtk/include_xutil.patch deleted file mode 100644 index e7a4cc25ad..0000000000 --- a/meta/recipes-sato/webkit/webkitgtk/include_xutil.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 2cc9d445b4c8eb70c2ab6c1723dfd208218f103e Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Fri, 6 Nov 2020 04:38:13 +0100 -Subject: [PATCH] webkitgtk: fix build with x11 enabled - -Since -https://github.com/WebKit/webkit/commit/acd3f32cd43c363be032f93ede3aa10c4ee97fa4 -it uses XVisualInfo which is defined in Xutil.h - -Without this the build fails with: -webkitgtk-2.30.2/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp:132:5: error: 'XVisualInfo' was not declared in this scope; did you mean 'VisualID'? - 132 | XVisualInfo visualTemplate; - | ^~~~~~~~~~~ - | VisualID - -Upstream-Status: Pending -Signed-off-by: Martin Jansa - ---- - Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp b/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp -index bad56eba..fc141f98 100644 ---- a/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp -+++ b/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp -@@ -31,6 +31,7 @@ - #if PLATFORM(X11) - #include - #include -+#include - #include - #if PLATFORM(GTK) - #include diff --git a/meta/recipes-sato/webkit/webkitgtk_2.34.1.bb b/meta/recipes-sato/webkit/webkitgtk_2.34.1.bb index 4e2562df14..7a942e9cb5 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.34.1.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.34.1.bb @@ -15,7 +15,6 @@ SRC_URI = "https://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \ file://0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch \ file://0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch \ file://0001-Enable-THREADS_PREFER_PTHREAD_FLAG.patch \ - file://include_xutil.patch \ file://reduce-memory-overheads.patch \ file://musl-lower-stack-usage.patch \ file://0001-Fix-build-without-opengl-or-es.patch \ -- cgit 1.2.3-korg