commit: ec7b3a1089009e48ba3178eda72f406687028721 parent 597509e165f4696f10aefb88b33e289215d3e03d Author: Haelwenn (lanodan) Monnier <contact@hacktivis.me> Date: Sun, 19 Nov 2023 10:28:52 +0100 net-libs/webkit-gtk: fix build with -DLOG_DISABLED=0Diffstat:
4 files changed, 35 insertions(+), 0 deletions(-)diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.42.2_tree_debugging.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.42.2_tree_debugging.patch@@ -0,0 +1,32 @@ +From 9e05696bcb54853cb53d763acbb3eed7ec39f1ed Mon Sep 17 00:00:00 2001 +From: ChangSeok Oh <changseok@webkit.org> +Date: Fri, 25 Aug 2023 01:24:09 -0700 +Subject: [PATCH] Build fix after 160450@main by guarding showRenderTree + https://bugs.webkit.org/show_bug.cgi?id=260702 + +Unreviewed build fix. + +Where LOG_DISABLED is disabled, the build fails due to missing showRenderTree(). +The showRenderTree() is guarded by ENABLE(TREE_DEBUGGING). + +* Source/WebCore/page/LocalFrameViewLayoutContext.cpp: +(WebCore::LocalFrameViewLayoutContext::performLayout): + +Canonical link: https://commits.webkit.org/267268@main +--- + Source/WebCore/page/LocalFrameViewLayoutContext.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Source/WebCore/page/LocalFrameViewLayoutContext.cpp b/Source/WebCore/page/LocalFrameViewLayoutContext.cpp +index bd98c8403226..16bb037a9950 100644 +--- a/Source/WebCore/page/LocalFrameViewLayoutContext.cpp ++++ b/Source/WebCore/page/LocalFrameViewLayoutContext.cpp +@@ -240,7 +240,7 @@ void LocalFrameViewLayoutContext::performLayout() + #endif + clearSubtreeLayoutRoot(); + +-#if !LOG_DISABLED ++#if !LOG_DISABLED && ENABLE(TREE_DEBUGGING) + auto layoutLogEnabled = [] { + return LogLayout.state == WTFLogChannelState::On; + };diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.2-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.2-r410.ebuild@@ -150,6 +150,7 @@ pkg_setup() { } src_prepare() { + eapply "${FILESDIR}/webkit-gtk-2.42.2_tree_debugging.patch" cmake_src_prepare gnome2_src_prepare }diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.2-r600.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.2-r600.ebuild@@ -150,6 +150,7 @@ pkg_setup() { } src_prepare() { + eapply "${FILESDIR}/webkit-gtk-2.42.2_tree_debugging.patch" cmake_src_prepare gnome2_src_prepare }diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.2.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.2.ebuild@@ -150,6 +150,7 @@ pkg_setup() { } src_prepare() { + eapply "${FILESDIR}/webkit-gtk-2.42.2_tree_debugging.patch" cmake_src_prepare gnome2_src_prepare }