mirror of
https://git.yoctoproject.org/poky
synced 2026-09-13 00:49:33 +02:00
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>
This commit is contained in:
committed by
Richard Purdie
parent
f465c6fa30
commit
81a925ac9e
24
meta/recipes-sato/webkit/webkitgtk/include_xutil.patch
Normal file
24
meta/recipes-sato/webkit/webkitgtk/include_xutil.patch
Normal file
@@ -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>
|
||||||
@@ -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-Enable-THREADS_PREFER_PTHREAD_FLAG.patch \
|
||||||
file://0001-Fix-build-with-musl.patch \
|
file://0001-Fix-build-with-musl.patch \
|
||||||
file://include_array.patch \
|
file://include_array.patch \
|
||||||
|
file://include_xutil.patch \
|
||||||
"
|
"
|
||||||
SRC_URI[sha256sum] = "c467e0bc2bc610c2570928e3fd63cedaadc4719cbf9b04aa99f79dd71ad5682a"
|
SRC_URI[sha256sum] = "c467e0bc2bc610c2570928e3fd63cedaadc4719cbf9b04aa99f79dd71ad5682a"
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user