From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id F33ED158086 for ; Sun, 2 Jan 2022 22:47:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2BCCB2BC035; Sun, 2 Jan 2022 22:47:29 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 22D142BC03C for ; Sun, 2 Jan 2022 22:47:16 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 07145342DAC for ; Sun, 2 Jan 2022 22:46:55 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 92DC8274 for ; Sun, 2 Jan 2022 22:46:53 +0000 (UTC) From: "Mart Raudsepp" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mart Raudsepp" Message-ID: <1641163453.55e70521884cf6143a68a7ead6f65095887f9906.leio@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/files/, net-libs/webkit-gtk/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-libs/webkit-gtk/files/2.34.3-non-jumbo-fix.patch net-libs/webkit-gtk/webkit-gtk-2.34.3.ebuild X-VCS-Directories: net-libs/webkit-gtk/ net-libs/webkit-gtk/files/ X-VCS-Committer: leio X-VCS-Committer-Name: Mart Raudsepp X-VCS-Revision: 55e70521884cf6143a68a7ead6f65095887f9906 X-VCS-Branch: master Date: Sun, 2 Jan 2022 22:46:53 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 5122d700-5caf-4f47-a114-576d035767c7 X-Archives-Hash: e5e299d9c19fb813a4d482c34bbf226c commit: 55e70521884cf6143a68a7ead6f65095887f9906 Author: Mart Raudsepp gentoo org> AuthorDate: Sun Jan 2 22:34:53 2022 +0000 Commit: Mart Raudsepp gentoo org> CommitDate: Sun Jan 2 22:44:13 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55e70521 net-libs/webkit-gtk: fix build with USE=-jumbo-build Thanks-to: Matt Whitlock mattwhitlock.name> Closes: https://bugs.gentoo.org/820437 Package-Manager: Portage-3.0.20, Repoman-3.0.2 Signed-off-by: Mart Raudsepp gentoo.org> .../webkit-gtk/files/2.34.3-non-jumbo-fix.patch | 43 ++++++++++++++++++++++ net-libs/webkit-gtk/webkit-gtk-2.34.3.ebuild | 1 + 2 files changed, 44 insertions(+) diff --git a/net-libs/webkit-gtk/files/2.34.3-non-jumbo-fix.patch b/net-libs/webkit-gtk/files/2.34.3-non-jumbo-fix.patch new file mode 100644 index 000000000000..b26f4243cd76 --- /dev/null +++ b/net-libs/webkit-gtk/files/2.34.3-non-jumbo-fix.patch @@ -0,0 +1,43 @@ +From f8efe9f2d128a897c0b2a054bf05200cb842d9b2 Mon Sep 17 00:00:00 2001 +From: "don.olmstead@sony.com" + +Date: Sun, 3 Oct 2021 23:00:17 +0000 +Subject: [PATCH] Non-unified build fixes, early October 2021 edition + https://bugs.webkit.org/show_bug.cgi?id=231143 + +Unreviewed non-unified build fixes. +--- +leio: Trimmed to what's relevant to webkitgtk-2.34 branch + + Source/WebCore/html/track/InbandTextTrack.cpp | 1 + + Source/WebCore/inspector/agents/InspectorCanvasAgent.h | 2 ++ + 2 files changed, 3 insertions(+) + +diff --git a/Source/WebCore/html/track/InbandTextTrack.cpp b/Source/WebCore/html/track/InbandTextTrack.cpp +index d45969fbfc77..ab5605100a94 100644 +--- a/Source/WebCore/html/track/InbandTextTrack.cpp ++++ b/Source/WebCore/html/track/InbandTextTrack.cpp +@@ -32,6 +32,7 @@ + #include "InbandGenericTextTrack.h" + #include "InbandTextTrackPrivate.h" + #include "InbandWebVTTTextTrack.h" ++#include "TextTrackClient.h" + #include + + namespace WebCore { +diff --git a/Source/WebCore/inspector/agents/InspectorCanvasAgent.h b/Source/WebCore/inspector/agents/InspectorCanvasAgent.h +index 7f1012aa2a24..4c7c23995276 100644 +--- a/Source/WebCore/inspector/agents/InspectorCanvasAgent.h ++++ b/Source/WebCore/inspector/agents/InspectorCanvasAgent.h +@@ -44,6 +44,8 @@ class InjectedScriptManager; + namespace WebCore { + + class CanvasRenderingContext; ++class Frame; ++ + #if ENABLE(WEBGL) + class InspectorShaderProgram; + class WebGLProgram; +-- +2.32.0 + diff --git a/net-libs/webkit-gtk/webkit-gtk-2.34.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.34.3.ebuild index ff06c0b8a9ef..1faf9e7222f8 100644 --- a/net-libs/webkit-gtk/webkit-gtk-2.34.3.ebuild +++ b/net-libs/webkit-gtk/webkit-gtk-2.34.3.ebuild @@ -172,6 +172,7 @@ pkg_setup() { src_prepare() { eapply "${FILESDIR}"/2.34.3-opengl-without-X-fixes.patch + eapply "${FILESDIR}"/2.34.3-non-jumbo-fix.patch cmake_src_prepare gnome2_src_prepare }