CVS commit: pkgsrc/www/webkit-gtk

["Michael Forney" <mcf%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   mcf
Date:           Sun Oct 23 07:33:51 UTC 2022

Modified Files:
        pkgsrc/www/webkit-gtk: distinfo
Added Files:
        pkgsrc/www/webkit-gtk/patches:
            patch-Source_WebKit_WebProcess_WebPage_CoordinatedGraphics_LayerTreeHost.h

Log Message:
webkit-gtk: fix build with -opengl


To generate a diff of this commit:
cvs rdiff -u -r1.172 -r1.173 pkgsrc/www/webkit-gtk/distinfo
cvs rdiff -u -r0 -r1.3 \
    pkgsrc/www/webkit-gtk/patches/patch-Source_WebKit_WebProcess_WebPage_CoordinatedGraphics_LayerTreeHost.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/webkit-gtk/distinfo
diff -u pkgsrc/www/webkit-gtk/distinfo:1.172 pkgsrc/www/webkit-gtk/distinfo:1.173
--- pkgsrc/www/webkit-gtk/distinfo:1.172        Sat Oct  8 11:06:35 2022
+++ pkgsrc/www/webkit-gtk/distinfo      Sun Oct 23 07:33:51 2022
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.172 2022/10/08 11:06:35 nia Exp $
+$NetBSD: distinfo,v 1.173 2022/10/23 07:33:51 mcf Exp $
 
 BLAKE2s (webkitgtk-2.36.8.tar.xz) = 277ba5935bda3e3867083b4c736499d974b9c733dbd05bf574510857dde481a1
 SHA512 (webkitgtk-2.36.8.tar.xz) = 50576f13ea84c0634d174ccf0b70d0eb28752589b2b9ce7a82ffeee1b4b6c849a802f7ae83a3c5a74d0da2b7e3321876ead33e819d8006b8153376074cb57036
@@ -38,6 +38,7 @@ SHA1 (patch-Source_WebKit_Platform_IPC_u
 SHA1 (patch-Source_WebKit_Platform_classifier_ResourceLoadStatisticsClassifier.cpp) = 920376ec8697780637f376b2fff312b7e214a7f6
 SHA1 (patch-Source_WebKit_Scripts_check-xcfilelists.sh) = 22cc5ba1ababc6395aa0ef467db0c27c2fbf6878
 SHA1 (patch-Source_WebKit_Scripts_generate-unified-sources.sh) = def930cf3f706ac657b2f8835c8c0278ade8f663
+SHA1 (patch-Source_WebKit_WebProcess_WebPage_CoordinatedGraphics_LayerTreeHost.h) = 91a3002d47c469375e70fcde7d575ec352f642f9
 SHA1 (patch-Source_bmalloc_bmalloc_AvailableMemory.cpp) = 18915c691d6f4e2a8870f8fee0909bd1a609cc05
 SHA1 (patch-Source_bmalloc_bmalloc_BPlatform.h) = 28d1f657fde427062a729b26398e96825082fc4d
 SHA1 (patch-Source_bmalloc_bmalloc_VMAllocate.h) = 22c23689fa79c930145068ed7966844bbf92a6a9

Added files:

Index: pkgsrc/www/webkit-gtk/patches/patch-Source_WebKit_WebProcess_WebPage_CoordinatedGraphics_LayerTreeHost.h
diff -u /dev/null pkgsrc/www/webkit-gtk/patches/patch-Source_WebKit_WebProcess_WebPage_CoordinatedGraphics_LayerTreeHost.h:1.3
--- /dev/null   Sun Oct 23 07:33:51 2022
+++ pkgsrc/www/webkit-gtk/patches/patch-Source_WebKit_WebProcess_WebPage_CoordinatedGraphics_LayerTreeHost.h    Sun Oct 23 07:33:50 2022
@@ -0,0 +1,37 @@
+$NetBSD: patch-Source_WebKit_WebProcess_WebPage_CoordinatedGraphics_LayerTreeHost.h,v 1.3 2022/10/23 07:33:50 mcf Exp $
+
+Fix build with -opengl.
+
+Upstream: https://commits.webkit.org/254220@main
+
+--- Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h.orig  Thu Jun 30 09:49:38 2022
++++ Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h
+@@ -37,9 +37,6 @@
+ #include <wtf/Forward.h>
+ #include <wtf/OptionSet.h>
+ #include <wtf/RunLoop.h>
+-#if PLATFORM(GTK)
+-#include <WebCore/CoordinatedGraphicsLayer.h>
+-#endif
+ 
+ #if USE(GRAPHICS_LAYER_TEXTURE_MAPPER)
+ 
+@@ -48,6 +45,7 @@
+ #else // USE(GRAPHICS_LAYER_TEXTURE_MAPPER)
+ 
+ namespace WebCore {
++class CoordinatedGraphicsLayer;
+ class IntRect;
+ class IntSize;
+ class GraphicsLayer;
+@@ -241,6 +239,10 @@ inline void LayerTreeHost::didChangeViewportAttributes
+ inline void LayerTreeHost::setIsDiscardable(bool) { }
+ inline void LayerTreeHost::deviceOrPageScaleFactorChanged() { }
+ inline RefPtr<WebCore::DisplayRefreshMonitor> LayerTreeHost::createDisplayRefreshMonitor(WebCore::PlatformDisplayID) { return nullptr; }
++#if PLATFORM(GTK)
++inline void LayerTreeHost::adjustTransientZoom(double, WebCore::FloatPoint) { }
++inline void LayerTreeHost::commitTransientZoom(double, WebCore::FloatPoint) { }
++#endif
+ #endif
+ 
+ } // namespace WebKit