Date: Mon, 6 Sep 2021 00:42:33 GMT From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 1af1b4caa25a - main - www/webkit2-gtk3: convert 3f23fec4c93a to upstream fix Message-ID: <202109060042.1860gXfK044727@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=1af1b4caa25a2d4dcee07939369e988c996bffe5 commit 1af1b4caa25a2d4dcee07939369e988c996bffe5 Author: Jan Beich <jbeich@FreeBSD.org> AuthorDate: 2021-09-05 18:44:57 +0000 Commit: Jan Beich <jbeich@FreeBSD.org> CommitDate: 2021-09-06 00:39:11 +0000 www/webkit2-gtk3: convert 3f23fec4c93a to upstream fix --- ...rce_WebCore_platform_graphics_x11_PlatformDisplayX11.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/www/webkit2-gtk3/files/patch-Source_WebCore_platform_graphics_x11_PlatformDisplayX11.cpp b/www/webkit2-gtk3/files/patch-Source_WebCore_platform_graphics_x11_PlatformDisplayX11.cpp index 6b5abb697d55..b28e346ad858 100644 --- a/www/webkit2-gtk3/files/patch-Source_WebCore_platform_graphics_x11_PlatformDisplayX11.cpp +++ b/www/webkit2-gtk3/files/patch-Source_WebCore_platform_graphics_x11_PlatformDisplayX11.cpp @@ -1,4 +1,5 @@ Regressed by https://github.com/KhronosGroup/EGL-Registry/commit/64aa561f1971 +Part of https://github.com/WebKit/WebKit/commit/29421afdcd64 Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp:132:5: error: unknown type name 'XVisualInfo' XVisualInfo visualTemplate; @@ -12,11 +13,11 @@ Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp:136:57: error: use o --- Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp.orig 2020-08-12 09:17:55 UTC +++ Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp -@@ -36,6 +36,7 @@ +@@ -32,6 +32,7 @@ + #include <X11/Xlib.h> + #include <X11/extensions/Xcomposite.h> + #if PLATFORM(GTK) ++#include <X11/Xutil.h> + #include <X11/extensions/Xdamage.h> #endif - #if USE(EGL) -+#define USE_X11 - #include <EGL/egl.h> - #include <EGL/eglext.h> - #endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202109060042.1860gXfK044727>