From owner-dev-commits-ports-main@freebsd.org Mon Sep 6 00:42:33 2021 Return-Path: Delivered-To: dev-commits-ports-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 8B901664CF1; Mon, 6 Sep 2021 00:42:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4H2qP53MWWz3CjS; Mon, 6 Sep 2021 00:42:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5441F1564C; Mon, 6 Sep 2021 00:42:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1860gXK8044728; Mon, 6 Sep 2021 00:42:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1860gXfK044727; Mon, 6 Sep 2021 00:42:33 GMT (envelope-from git) Date: Mon, 6 Sep 2021 00:42:33 GMT Message-Id: <202109060042.1860gXfK044727@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: 1af1b4caa25a - main - www/webkit2-gtk3: convert 3f23fec4c93a to upstream fix MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1af1b4caa25a2d4dcee07939369e988c996bffe5 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Sep 2021 00:42:33 -0000 The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=1af1b4caa25a2d4dcee07939369e988c996bffe5 commit 1af1b4caa25a2d4dcee07939369e988c996bffe5 Author: Jan Beich AuthorDate: 2021-09-05 18:44:57 +0000 Commit: Jan Beich 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 + #include + #if PLATFORM(GTK) ++#include + #include #endif - #if USE(EGL) -+#define USE_X11 - #include - #include - #endif