diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2020-11-06 04:38:13 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-11-08 14:03:16 +0000 |
commit | e060925735a274164b43db5eb70af29ebf2b046e (patch) | |
tree | 1cf9c6bbc0131df2401a981dc48e48af19b7983b /meta/recipes-sato | |
parent | 82ac2a91ea6adc33f2f10634fe0a3f1ad4d12e66 (diff) | |
download | openembedded-core-contrib-e060925735a274164b43db5eb70af29ebf2b046e.tar.gz |
webkitgtk: fix build with x11 enabled
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
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.patch | 24 | ||||
-rw-r--r-- | meta/recipes-sato/webkit/webkitgtk_2.30.2.bb | 1 |
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 @@ +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 <Martin.Jansa@gmail.com> + +diff -uNr webkitgtk-2.30.2.orig/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp webkitgtk-2.30.2/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp +--- webkitgtk-2.30.2.orig/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp 2020-08-12 09:17:55.000000000 +0000 ++++ webkitgtk-2.30.2/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp 2020-11-06 03:11:40.379913528 +0000 +@@ -30,6 +30,7 @@ + + #if PLATFORM(X11) + #include <X11/Xlib.h> ++#include <X11/Xutil.h> + #include <X11/extensions/Xcomposite.h> + #if PLATFORM(GTK) + #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 \ file://0001-Enable-THREADS_PREFER_PTHREAD_FLAG.patch \ file://0001-Fix-build-with-musl.patch \ file://include_array.patch \ + file://include_xutil.patch \ " SRC_URI[sha256sum] = "c467e0bc2bc610c2570928e3fd63cedaadc4719cbf9b04aa99f79dd71ad5682a" |