blob: e7a4cc25ade499d48af4b5e2980ac43328d3bcd3 [file] [log] [blame]
Andrew Geisslereff27472021-10-29 15:35:00 -05001From 2cc9d445b4c8eb70c2ab6c1723dfd208218f103e Mon Sep 17 00:00:00 2001
William A. Kennington IIIac69b482021-06-02 12:28:27 -07002From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Fri, 6 Nov 2020 04:38:13 +0100
4Subject: [PATCH] webkitgtk: fix build with x11 enabled
5
Andrew Geissler6ce62a22020-11-30 19:58:47 -06006Since
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
William A. Kennington IIIac69b482021-06-02 12:28:27 -070019---
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
Andrew Geisslereff27472021-10-29 15:35:00 -050024index bad56eba..fc141f98 100644
William A. Kennington IIIac69b482021-06-02 12:28:27 -070025--- a/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp
26+++ b/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp
Andrew Geisslereff27472021-10-29 15:35:00 -050027@@ -31,6 +31,7 @@
Andrew Geissler6ce62a22020-11-30 19:58:47 -060028 #if PLATFORM(X11)
Andrew Geisslereff27472021-10-29 15:35:00 -050029 #include <X11/Xatom.h>
Andrew Geissler6ce62a22020-11-30 19:58:47 -060030 #include <X11/Xlib.h>
31+#include <X11/Xutil.h>
32 #include <X11/extensions/Xcomposite.h>
33 #if PLATFORM(GTK)
William A. Kennington IIIac69b482021-06-02 12:28:27 -070034 #include <X11/Xutil.h>