William A. Kennington III | ac69b48 | 2021-06-02 12:28:27 -0700 | [diff] [blame^] | 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 | |
Andrew Geissler | 6ce62a2 | 2020-11-30 19:58:47 -0600 | [diff] [blame] | 6 | Since |
| 7 | https://github.com/WebKit/webkit/commit/acd3f32cd43c363be032f93ede3aa10c4ee97fa4 |
| 8 | it uses XVisualInfo which is defined in Xutil.h |
| 9 | |
| 10 | Without this the build fails with: |
| 11 | 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'? |
| 12 | 132 | XVisualInfo visualTemplate; |
| 13 | | ^~~~~~~~~~~ |
| 14 | | VisualID |
| 15 | |
| 16 | Upstream-Status: Pending |
| 17 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> |
| 18 | |
William A. Kennington III | ac69b48 | 2021-06-02 12:28:27 -0700 | [diff] [blame^] | 19 | --- |
| 20 | Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp | 1 + |
| 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 |
Andrew Geissler | 6ce62a2 | 2020-11-30 19:58:47 -0600 | [diff] [blame] | 27 | @@ -30,6 +30,7 @@ |
| 28 | |
| 29 | #if PLATFORM(X11) |
| 30 | #include <X11/Xlib.h> |
| 31 | +#include <X11/Xutil.h> |
| 32 | #include <X11/extensions/Xcomposite.h> |
| 33 | #if PLATFORM(GTK) |
William A. Kennington III | ac69b48 | 2021-06-02 12:28:27 -0700 | [diff] [blame^] | 34 | #include <X11/Xutil.h> |