summaryrefslogtreecommitdiffstats
path: root/meta/recipes-sato
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2021-11-10 20:39:37 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-11-11 17:09:16 +0000
commit07fe973701852396358c408c53dcc80ac59355b5 (patch)
treebdc781ec3175f4dae713cada45c23d400b4312d2 /meta/recipes-sato
parent8b11f3c12bf9fa0723eee50440792354eeb017a7 (diff)
downloadpoky-07fe973701852396358c408c53dcc80ac59355b5.tar.gz
webkitgtk: remove unneeded patch
The file is already included just three lines below. (From OE-Core rev: bcfb2539ed319fefd2b3605d8505666bdfc4704c) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-sato')
-rw-r--r--meta/recipes-sato/webkit/webkitgtk/include_xutil.patch34
-rw-r--r--meta/recipes-sato/webkit/webkitgtk_2.34.1.bb1
2 files changed, 0 insertions, 35 deletions
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 @@
1From 2cc9d445b4c8eb70c2ab6c1723dfd208218f103e Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Fri, 6 Nov 2020 04:38:13 +0100
4Subject: [PATCH] webkitgtk: fix build with x11 enabled
5
6Since
7https://github.com/WebKit/webkit/commit/acd3f32cd43c363be032f93ede3aa10c4ee97fa4
8it uses XVisualInfo which is defined in Xutil.h
9
10Without this the build fails with:
11webkitgtk-2.30.2/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp:132:5: error: 'XVisualInfo' was not declared in this scope; did you mean 'VisualID'?
12 132 | XVisualInfo visualTemplate;
13 | ^~~~~~~~~~~
14 | VisualID
15
16Upstream-Status: Pending
17Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
18
19---
20 Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp | 1 +
21 1 file changed, 1 insertion(+)
22
23diff --git a/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp b/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp
24index bad56eba..fc141f98 100644
25--- a/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp
26+++ b/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp
27@@ -31,6 +31,7 @@
28 #if PLATFORM(X11)
29 #include <X11/Xatom.h>
30 #include <X11/Xlib.h>
31+#include <X11/Xutil.h>
32 #include <X11/extensions/Xcomposite.h>
33 #if PLATFORM(GTK)
34 #include <X11/Xutil.h>
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 \
15 file://0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch \ 15 file://0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch \
16 file://0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch \ 16 file://0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch \
17 file://0001-Enable-THREADS_PREFER_PTHREAD_FLAG.patch \ 17 file://0001-Enable-THREADS_PREFER_PTHREAD_FLAG.patch \
18 file://include_xutil.patch \
19 file://reduce-memory-overheads.patch \ 18 file://reduce-memory-overheads.patch \
20 file://musl-lower-stack-usage.patch \ 19 file://musl-lower-stack-usage.patch \
21 file://0001-Fix-build-without-opengl-or-es.patch \ 20 file://0001-Fix-build-without-opengl-or-es.patch \