CVS commit: pkgsrc/www/webkit-gtk

["Leonardo Taccari" <leot%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   leot
Date:           Sat Dec 14 15:09:42 UTC 2019

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 when `opengl' option is disabled

Similar commit done upstream too.


To generate a diff of this commit:
cvs rdiff -u -r1.129 -r1.130 pkgsrc/www/webkit-gtk/distinfo
cvs rdiff -u -r0 -r1.1 \
    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.129 pkgsrc/www/webkit-gtk/distinfo:1.130
--- pkgsrc/www/webkit-gtk/distinfo:1.129        Wed Nov  6 22:47:38 2019
+++ pkgsrc/www/webkit-gtk/distinfo      Sat Dec 14 15:09:42 2019
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.129 2019/11/06 22:47:38 leot Exp $
+$NetBSD: distinfo,v 1.130 2019/12/14 15:09:42 leot Exp $
 
 SHA1 (webkitgtk-2.26.2.tar.xz) = 5bd1ccb436c76fd1edb83afd5bec377de5655d45
 RMD160 (webkitgtk-2.26.2.tar.xz) = 1ebf95153ab962154595ec19ed3a58e55b1521f8
@@ -32,6 +32,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) = e2fe82bba9d4f0c80a722c5c883fa7042f5bf78f
 SHA1 (patch-Source_bmalloc_bmalloc_BPlatform.h) = 28d1f657fde427062a729b26398e96825082fc4d
 SHA1 (patch-Source_bmalloc_bmalloc_VMAllocate.h) = b1eb6ab93f2ce272cfee94a544d19806feb9a625
 SHA1 (patch-Source_cmake_OptionsCommon.cmake) = 03b72552414e7114bfa7ddc2d68fd97009a5ff7d

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.1
--- /dev/null   Sat Dec 14 15:09:42 2019
+++ pkgsrc/www/webkit-gtk/patches/patch-Source_WebKit_WebProcess_WebPage_CoordinatedGraphics_LayerTreeHost.h    Sat Dec 14 15:09:42 2019
@@ -0,0 +1,16 @@
+$NetBSD: patch-Source_WebKit_WebProcess_WebPage_CoordinatedGraphics_LayerTreeHost.h,v 1.1 2019/12/14 15:09:42 leot Exp $
+
+Remove unused definition.
+
+Fixes the build when `opengl' option is disabled.
+
+--- Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h.orig  2019-11-06 08:09:11.000000000 +0000
++++ Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h
+@@ -212,7 +212,6 @@ inline void LayerTreeHost::scheduleLayer
+ inline void LayerTreeHost::cancelPendingLayerFlush() { }
+ inline void LayerTreeHost::setRootCompositingLayer(WebCore::GraphicsLayer*) { }
+ inline void LayerTreeHost::setViewOverlayRootLayer(WebCore::GraphicsLayer*) { }
+-inline void LayerTreeHost::invalidate() { }
+ inline void LayerTreeHost::scrollNonCompositedContents(const WebCore::IntRect&) { }
+ inline void LayerTreeHost::forceRepaint() { }
+ inline bool LayerTreeHost::forceRepaintAsync(CallbackID) { return false; }