summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2020-11-06 04:38:13 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-11-08 14:03:21 +0000
commit81a925ac9e21af3dee8cc4f6e548dca2b29c2e88 (patch)
tree74a19ebf3a1afdf1dc89995f53c095bdb7786ee7
parentf465c6fa300790a7124d6e708f3d5bd4689f94ea (diff)
downloadpoky-81a925ac9e21af3dee8cc4f6e548dca2b29c2e88.tar.gz
webkitgtk: fix build with x11 enabled
(From OE-Core rev: e060925735a274164b43db5eb70af29ebf2b046e) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-sato/webkit/webkitgtk/include_xutil.patch24
-rw-r--r--meta/recipes-sato/webkit/webkitgtk_2.30.2.bb1
2 files changed, 25 insertions, 0 deletions
diff --git a/meta/recipes-sato/webkit/webkitgtk/include_xutil.patch b/meta/recipes-sato/webkit/webkitgtk/include_xutil.patch
new file mode 100644
index 0000000000..f770b381ce
--- /dev/null
+++ b/meta/recipes-sato/webkit/webkitgtk/include_xutil.patch
@@ -0,0 +1,24 @@
1Since
2https://github.com/WebKit/webkit/commit/acd3f32cd43c363be032f93ede3aa10c4ee97fa4
3it uses XVisualInfo which is defined in Xutil.h
4
5Without this the build fails with:
6webkitgtk-2.30.2/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp:132:5: error: 'XVisualInfo' was not declared in this scope; did you mean 'VisualID'?
7 132 | XVisualInfo visualTemplate;
8 | ^~~~~~~~~~~
9 | VisualID
10
11Upstream-Status: Pending
12Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
13
14diff -uNr webkitgtk-2.30.2.orig/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp webkitgtk-2.30.2/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp
15--- webkitgtk-2.30.2.orig/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp 2020-08-12 09:17:55.000000000 +0000
16+++ webkitgtk-2.30.2/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp 2020-11-06 03:11:40.379913528 +0000
17@@ -30,6 +30,7 @@
18
19 #if PLATFORM(X11)
20 #include <X11/Xlib.h>
21+#include <X11/Xutil.h>
22 #include <X11/extensions/Xcomposite.h>
23 #if PLATFORM(GTK)
24 #include <X11/extensions/Xdamage.h>
diff --git a/meta/recipes-sato/webkit/webkitgtk_2.30.2.bb b/meta/recipes-sato/webkit/webkitgtk_2.30.2.bb
index 56cd1eb9d4..94fcbd8abe 100644
--- a/meta/recipes-sato/webkit/webkitgtk_2.30.2.bb
+++ b/meta/recipes-sato/webkit/webkitgtk_2.30.2.bb
@@ -17,6 +17,7 @@ SRC_URI = "https://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \
17 file://0001-Enable-THREADS_PREFER_PTHREAD_FLAG.patch \ 17 file://0001-Enable-THREADS_PREFER_PTHREAD_FLAG.patch \
18 file://0001-Fix-build-with-musl.patch \ 18 file://0001-Fix-build-with-musl.patch \
19 file://include_array.patch \ 19 file://include_array.patch \
20 file://include_xutil.patch \
20 " 21 "
21SRC_URI[sha256sum] = "c467e0bc2bc610c2570928e3fd63cedaadc4719cbf9b04aa99f79dd71ad5682a" 22SRC_URI[sha256sum] = "c467e0bc2bc610c2570928e3fd63cedaadc4719cbf9b04aa99f79dd71ad5682a"
22 23