diff options
Diffstat (limited to 'meta/recipes-sato/webkit/webkitgtk/include_xutil.patch')
-rw-r--r-- | meta/recipes-sato/webkit/webkitgtk/include_xutil.patch | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/meta/recipes-sato/webkit/webkitgtk/include_xutil.patch b/meta/recipes-sato/webkit/webkitgtk/include_xutil.patch index f770b381ce..ffe1b74be3 100644 --- a/meta/recipes-sato/webkit/webkitgtk/include_xutil.patch +++ b/meta/recipes-sato/webkit/webkitgtk/include_xutil.patch | |||
@@ -1,3 +1,8 @@ | |||
1 | From d95f46e149226f634830e76cc1f4f8e3ee04ff5a Mon Sep 17 00:00:00 2001 | ||
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | ||
3 | Date: Fri, 6 Nov 2020 04:38:13 +0100 | ||
4 | Subject: [PATCH] webkitgtk: fix build with x11 enabled | ||
5 | |||
1 | Since | 6 | Since |
2 | https://github.com/WebKit/webkit/commit/acd3f32cd43c363be032f93ede3aa10c4ee97fa4 | 7 | https://github.com/WebKit/webkit/commit/acd3f32cd43c363be032f93ede3aa10c4ee97fa4 |
3 | it uses XVisualInfo which is defined in Xutil.h | 8 | it uses XVisualInfo which is defined in Xutil.h |
@@ -11,9 +16,14 @@ webkitgtk-2.30.2/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp:132 | |||
11 | Upstream-Status: Pending | 16 | Upstream-Status: Pending |
12 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | 17 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> |
13 | 18 | ||
14 | 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 | 19 | --- |
15 | --- webkitgtk-2.30.2.orig/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp 2020-08-12 09:17:55.000000000 +0000 | 20 | Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp | 1 + |
16 | +++ webkitgtk-2.30.2/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp 2020-11-06 03:11:40.379913528 +0000 | 21 | 1 file changed, 1 insertion(+) |
22 | |||
23 | diff --git a/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp b/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp | ||
24 | index 2d66b9cd..424fb5a1 100644 | ||
25 | --- a/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp | ||
26 | +++ b/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp | ||
17 | @@ -30,6 +30,7 @@ | 27 | @@ -30,6 +30,7 @@ |
18 | 28 | ||
19 | #if PLATFORM(X11) | 29 | #if PLATFORM(X11) |
@@ -21,4 +31,4 @@ diff -uNr webkitgtk-2.30.2.orig/Source/WebCore/platform/graphics/x11/PlatformDis | |||
21 | +#include <X11/Xutil.h> | 31 | +#include <X11/Xutil.h> |
22 | #include <X11/extensions/Xcomposite.h> | 32 | #include <X11/extensions/Xcomposite.h> |
23 | #if PLATFORM(GTK) | 33 | #if PLATFORM(GTK) |
24 | #include <X11/extensions/Xdamage.h> | 34 | #include <X11/Xutil.h> |