Tue Sep 28 22:11:54 2021 UTC ()
webkit-gtk: Update to 2.34.0

Changes:
2.34.0
------
 - Add support for HTTP/2 when building with libsoup3.
 - Add support for CSS Scroll Snap.
 - Add support for date and datetime-local input elements.
 - Add support for display capture.
 - Add support for ICC color management.
 - Add support color-schemes CSS property.
 - Add support for link preconnect when building with libsoup3.
 - Add support for client side certificates when building with libsoup3.
 - Add multi-track support to MSE media backend.
 - Add new API to handle web process unresponsiveness.
 - Add API to disable CORS on a web view for particular domains.
 - Add new API to access/modify capture devices states.
 - Add new API to configure the memory pressure handler.


(leot)
diff -r1.211 -r1.212 pkgsrc/www/webkit-gtk/Makefile
diff -r1.75 -r1.76 pkgsrc/www/webkit-gtk/PLIST
diff -r1.82 -r1.83 pkgsrc/www/webkit-gtk/buildlink3.mk
diff -r1.153 -r1.154 pkgsrc/www/webkit-gtk/distinfo
diff -r1.3 -r1.4 pkgsrc/www/webkit-gtk/patches/patch-Source_JavaScriptCore_heap_MarkedSpace.cpp
diff -r1.3 -r1.4 pkgsrc/www/webkit-gtk/patches/patch-Source_bmalloc_bmalloc_VMAllocate.h
diff -r1.4 -r1.5 pkgsrc/www/webkit-gtk/patches/patch-Source_ThirdParty_gtest_include_gtest_internal_gtest-port.h
diff -r1.1 -r1.2 pkgsrc/www/webkit-gtk/patches/patch-Source_WebCore_platform_network_DNS.h
cvs diff -r1.211 -r1.212 pkgsrc/www/webkit-gtk/Makefile (expand / switch to unified diff)

--- pkgsrc/www/webkit-gtk/Makefile 2021/09/17 15:50:34 1.211
+++ pkgsrc/www/webkit-gtk/Makefile 2021/09/28 22:11:54 1.212
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1# $NetBSD: Makefile,v 1.211 2021/09/17 15:50:34 leot Exp $ 1# $NetBSD: Makefile,v 1.212 2021/09/28 22:11:54 leot Exp $
2 2
3DISTNAME= webkitgtk-2.32.4 3DISTNAME= webkitgtk-2.34.0
4PKGNAME= ${DISTNAME:S/webkitgtk/webkit-gtk/} 4PKGNAME= ${DISTNAME:S/webkitgtk/webkit-gtk/}
5CATEGORIES= www 5CATEGORIES= www
6MASTER_SITES= https://www.webkitgtk.org/releases/ 6MASTER_SITES= https://www.webkitgtk.org/releases/
7EXTRACT_SUFX= .tar.xz 7EXTRACT_SUFX= .tar.xz
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://www.webkitgtk.org/ 10HOMEPAGE= https://www.webkitgtk.org/
11COMMENT= GTK port of the WebKit browser engine 11COMMENT= GTK port of the WebKit browser engine
12LICENSE= 2-clause-bsd AND gnu-lgpl-v2 12LICENSE= 2-clause-bsd AND gnu-lgpl-v2
13 13
14# shm_open(3) and shm_unlink(3) appeared in NetBSD 7.0 14# shm_open(3) and shm_unlink(3) appeared in NetBSD 7.0
15NOT_FOR_PLATFORM= NetBSD-[1-6].*-* 15NOT_FOR_PLATFORM= NetBSD-[1-6].*-*
16 16
@@ -36,26 +36,27 @@ PKGCONFIG_OVERRIDE+= Source/JavaScriptCo @@ -36,26 +36,27 @@ PKGCONFIG_OVERRIDE+= Source/JavaScriptCo
36PKGCONFIG_OVERRIDE+= Source/WebKit/gtk/webkit2gtk-web-extension.pc.in 36PKGCONFIG_OVERRIDE+= Source/WebKit/gtk/webkit2gtk-web-extension.pc.in
37PKGCONFIG_OVERRIDE+= Source/WebKit/gtk/webkit2gtk.pc.in 37PKGCONFIG_OVERRIDE+= Source/WebKit/gtk/webkit2gtk.pc.in
38 38
39CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release 39CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
40CMAKE_ARGS+= -DPORT=GTK 40CMAKE_ARGS+= -DPORT=GTK
41CMAKE_ARGS+= -DENABLE_X11_TARGET=ON 41CMAKE_ARGS+= -DENABLE_X11_TARGET=ON
42CMAKE_ARGS+= -DENABLE_MINIBROWSER=ON 42CMAKE_ARGS+= -DENABLE_MINIBROWSER=ON
43CMAKE_ARGS+= -DENABLE_GAMEPAD=OFF 43CMAKE_ARGS+= -DENABLE_GAMEPAD=OFF
44CMAKE_ARGS+= -DENABLE_GEOLOCATION=OFF 44CMAKE_ARGS+= -DENABLE_GEOLOCATION=OFF
45CMAKE_ARGS+= -DENABLE_BUBBLEWRAP_SANDBOX=OFF 45CMAKE_ARGS+= -DENABLE_BUBBLEWRAP_SANDBOX=OFF
46CMAKE_ARGS+= -DUSE_GSTREAMER_GL=OFF 46CMAKE_ARGS+= -DUSE_GSTREAMER_GL=OFF
47CMAKE_ARGS+= -DUSE_LIBHYPHEN=OFF 47CMAKE_ARGS+= -DUSE_LIBHYPHEN=OFF
48CMAKE_ARGS+= -DUSE_OPENJPEG=OFF 48CMAKE_ARGS+= -DUSE_OPENJPEG=OFF
 49CMAKE_ARGS+= -DUSE_SOUP2=ON
49CMAKE_ARGS+= -DUSE_SYSTEMD=OFF 50CMAKE_ARGS+= -DUSE_SYSTEMD=OFF
50 51
51REPLACE_PERL+= Source/JavaScriptCore/Scripts/*.pl 52REPLACE_PERL+= Source/JavaScriptCore/Scripts/*.pl
52REPLACE_PERL+= Source/JavaScriptCore/create_hash_table 53REPLACE_PERL+= Source/JavaScriptCore/create_hash_table
53REPLACE_PERL+= Source/WebCore/Scripts/*.pl 54REPLACE_PERL+= Source/WebCore/Scripts/*.pl
54REPLACE_PERL+= Source/WebCore/bindings/scripts/*.pl 55REPLACE_PERL+= Source/WebCore/bindings/scripts/*.pl
55REPLACE_PERL+= Source/WebCore/bindings/scripts/*.pm 56REPLACE_PERL+= Source/WebCore/bindings/scripts/*.pm
56REPLACE_PERL+= Source/WebCore/css/*.pl 57REPLACE_PERL+= Source/WebCore/css/*.pl
57REPLACE_PERL+= Source/WebCore/dom/*.pl 58REPLACE_PERL+= Source/WebCore/dom/*.pl
58REPLACE_PERL+= Source/WebCore/make-hash-tools.pl 59REPLACE_PERL+= Source/WebCore/make-hash-tools.pl
59REPLACE_PERL+= Source/WebInspectorUI/Scripts/*.pl 60REPLACE_PERL+= Source/WebInspectorUI/Scripts/*.pl
60REPLACE_PERL+= Source/WebKit/Scripts/*.pl 61REPLACE_PERL+= Source/WebKit/Scripts/*.pl
61REPLACE_PERL+= Source/cmake/tools/scripts/*.pl 62REPLACE_PERL+= Source/cmake/tools/scripts/*.pl
@@ -129,26 +130,27 @@ NOT_PAX_MPROTECT_SAFE+= libexec/webkit2g @@ -129,26 +130,27 @@ NOT_PAX_MPROTECT_SAFE+= libexec/webkit2g
129 130
130BUILDLINK_API_DEPENDS.glib2+= glib2>=2.32.1 131BUILDLINK_API_DEPENDS.glib2+= glib2>=2.32.1
131.include "../../devel/glib2/buildlink3.mk" 132.include "../../devel/glib2/buildlink3.mk"
132.include "../../devel/zlib/buildlink3.mk" 133.include "../../devel/zlib/buildlink3.mk"
133.include "../../databases/sqlite3/buildlink3.mk" 134.include "../../databases/sqlite3/buildlink3.mk"
134.include "../../devel/gperf/buildlink3.mk" 135.include "../../devel/gperf/buildlink3.mk"
135.include "../../devel/pango/buildlink3.mk" 136.include "../../devel/pango/buildlink3.mk"
136.include "../../fonts/harfbuzz-icu/buildlink3.mk" 137.include "../../fonts/harfbuzz-icu/buildlink3.mk"
137.include "../../fonts/woff2/buildlink3.mk" 138.include "../../fonts/woff2/buildlink3.mk"
138.include "../../graphics/cairo-gobject/buildlink3.mk" 139.include "../../graphics/cairo-gobject/buildlink3.mk"
139.include "../../graphics/freetype2/buildlink3.mk" 140.include "../../graphics/freetype2/buildlink3.mk"
140.include "../../graphics/libwebp/buildlink3.mk" 141.include "../../graphics/libwebp/buildlink3.mk"
141.include "../../mk/jpeg.buildlink3.mk" 142.include "../../mk/jpeg.buildlink3.mk"
 143.include "../../graphics/lcms2/buildlink3.mk"
142BUILDLINK_API_DEPENDS.png+= png>=1.5.1beta08 144BUILDLINK_API_DEPENDS.png+= png>=1.5.1beta08
143.include "../../graphics/png/buildlink3.mk" 145.include "../../graphics/png/buildlink3.mk"
144BUILDLINK_API_DEPENDS.gstreamer1+= gstreamer1>=1.0.3 146BUILDLINK_API_DEPENDS.gstreamer1+= gstreamer1>=1.0.3
145.include "../../multimedia/gstreamer1/buildlink3.mk" 147.include "../../multimedia/gstreamer1/buildlink3.mk"
146BUILDLINK_API_DEPENDS.gst-plugins1-base+= gst-plugins1-base>=1.0.3 148BUILDLINK_API_DEPENDS.gst-plugins1-base+= gst-plugins1-base>=1.0.3
147.include "../../multimedia/gst-plugins1-base/buildlink3.mk" 149.include "../../multimedia/gst-plugins1-base/buildlink3.mk"
148BUILDLINK_API_DEPENDS.libsoup+= libsoup>=2.42.2nb3 150BUILDLINK_API_DEPENDS.libsoup+= libsoup>=2.42.2nb3
149.include "../../net/libsoup/buildlink3.mk" 151.include "../../net/libsoup/buildlink3.mk"
150.include "../../security/libsecret/buildlink3.mk" 152.include "../../security/libsecret/buildlink3.mk"
151.include "../../security/libtasn1/buildlink3.mk" 153.include "../../security/libtasn1/buildlink3.mk"
152.include "../../sysutils/libnotify/buildlink3.mk" 154.include "../../sysutils/libnotify/buildlink3.mk"
153.include "../../textproc/icu/buildlink3.mk" 155.include "../../textproc/icu/buildlink3.mk"
154.include "../../textproc/libxslt/buildlink3.mk" 156.include "../../textproc/libxslt/buildlink3.mk"
cvs diff -r1.75 -r1.76 pkgsrc/www/webkit-gtk/PLIST (expand / switch to unified diff)

--- pkgsrc/www/webkit-gtk/PLIST 2021/09/17 15:50:34 1.75
+++ pkgsrc/www/webkit-gtk/PLIST 2021/09/28 22:11:54 1.76
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.75 2021/09/17 15:50:34 leot Exp $ 1@comment $NetBSD: PLIST,v 1.76 2021/09/28 22:11:54 leot Exp $
2bin/WebKitWebDriver 2bin/WebKitWebDriver
3include/webkitgtk-4.0/JavaScriptCore/JSBase.h 3include/webkitgtk-4.0/JavaScriptCore/JSBase.h
4include/webkitgtk-4.0/JavaScriptCore/JSContextRef.h 4include/webkitgtk-4.0/JavaScriptCore/JSContextRef.h
5include/webkitgtk-4.0/JavaScriptCore/JSObjectRef.h 5include/webkitgtk-4.0/JavaScriptCore/JSObjectRef.h
6include/webkitgtk-4.0/JavaScriptCore/JSStringRef.h 6include/webkitgtk-4.0/JavaScriptCore/JSStringRef.h
7include/webkitgtk-4.0/JavaScriptCore/JSTypedArray.h 7include/webkitgtk-4.0/JavaScriptCore/JSTypedArray.h
8include/webkitgtk-4.0/JavaScriptCore/JSValueRef.h 8include/webkitgtk-4.0/JavaScriptCore/JSValueRef.h
9include/webkitgtk-4.0/JavaScriptCore/JavaScript.h 9include/webkitgtk-4.0/JavaScriptCore/JavaScript.h
10include/webkitgtk-4.0/JavaScriptCore/WebKitAvailability.h 10include/webkitgtk-4.0/JavaScriptCore/WebKitAvailability.h
11include/webkitgtk-4.0/jsc/JSCAutocleanups.h 11include/webkitgtk-4.0/jsc/JSCAutocleanups.h
12include/webkitgtk-4.0/jsc/JSCClass.h 12include/webkitgtk-4.0/jsc/JSCClass.h
13include/webkitgtk-4.0/jsc/JSCContext.h 13include/webkitgtk-4.0/jsc/JSCContext.h
14include/webkitgtk-4.0/jsc/JSCDefines.h 14include/webkitgtk-4.0/jsc/JSCDefines.h
@@ -42,26 +42,27 @@ include/webkitgtk-4.0/webkit2/WebKitErro @@ -42,26 +42,27 @@ include/webkitgtk-4.0/webkit2/WebKitErro
42include/webkitgtk-4.0/webkit2/WebKitFaviconDatabase.h 42include/webkitgtk-4.0/webkit2/WebKitFaviconDatabase.h
43include/webkitgtk-4.0/webkit2/WebKitFileChooserRequest.h 43include/webkitgtk-4.0/webkit2/WebKitFileChooserRequest.h
44include/webkitgtk-4.0/webkit2/WebKitFindController.h 44include/webkitgtk-4.0/webkit2/WebKitFindController.h
45include/webkitgtk-4.0/webkit2/WebKitFormSubmissionRequest.h 45include/webkitgtk-4.0/webkit2/WebKitFormSubmissionRequest.h
46include/webkitgtk-4.0/webkit2/WebKitForwardDeclarations.h 46include/webkitgtk-4.0/webkit2/WebKitForwardDeclarations.h
47include/webkitgtk-4.0/webkit2/WebKitFrame.h 47include/webkitgtk-4.0/webkit2/WebKitFrame.h
48include/webkitgtk-4.0/webkit2/WebKitGeolocationManager.h 48include/webkitgtk-4.0/webkit2/WebKitGeolocationManager.h
49include/webkitgtk-4.0/webkit2/WebKitGeolocationPermissionRequest.h 49include/webkitgtk-4.0/webkit2/WebKitGeolocationPermissionRequest.h
50include/webkitgtk-4.0/webkit2/WebKitHitTestResult.h 50include/webkitgtk-4.0/webkit2/WebKitHitTestResult.h
51include/webkitgtk-4.0/webkit2/WebKitInputMethodContext.h 51include/webkitgtk-4.0/webkit2/WebKitInputMethodContext.h
52include/webkitgtk-4.0/webkit2/WebKitInstallMissingMediaPluginsPermissionRequest.h 52include/webkitgtk-4.0/webkit2/WebKitInstallMissingMediaPluginsPermissionRequest.h
53include/webkitgtk-4.0/webkit2/WebKitJavascriptResult.h 53include/webkitgtk-4.0/webkit2/WebKitJavascriptResult.h
54include/webkitgtk-4.0/webkit2/WebKitMediaKeySystemPermissionRequest.h 54include/webkitgtk-4.0/webkit2/WebKitMediaKeySystemPermissionRequest.h
 55include/webkitgtk-4.0/webkit2/WebKitMemoryPressureSettings.h
55include/webkitgtk-4.0/webkit2/WebKitMimeInfo.h 56include/webkitgtk-4.0/webkit2/WebKitMimeInfo.h
56include/webkitgtk-4.0/webkit2/WebKitNavigationAction.h 57include/webkitgtk-4.0/webkit2/WebKitNavigationAction.h
57include/webkitgtk-4.0/webkit2/WebKitNavigationPolicyDecision.h 58include/webkitgtk-4.0/webkit2/WebKitNavigationPolicyDecision.h
58include/webkitgtk-4.0/webkit2/WebKitNetworkProxySettings.h 59include/webkitgtk-4.0/webkit2/WebKitNetworkProxySettings.h
59include/webkitgtk-4.0/webkit2/WebKitNotification.h 60include/webkitgtk-4.0/webkit2/WebKitNotification.h
60include/webkitgtk-4.0/webkit2/WebKitNotificationPermissionRequest.h 61include/webkitgtk-4.0/webkit2/WebKitNotificationPermissionRequest.h
61include/webkitgtk-4.0/webkit2/WebKitOptionMenu.h 62include/webkitgtk-4.0/webkit2/WebKitOptionMenu.h
62include/webkitgtk-4.0/webkit2/WebKitOptionMenuItem.h 63include/webkitgtk-4.0/webkit2/WebKitOptionMenuItem.h
63include/webkitgtk-4.0/webkit2/WebKitPermissionRequest.h 64include/webkitgtk-4.0/webkit2/WebKitPermissionRequest.h
64include/webkitgtk-4.0/webkit2/WebKitPlugin.h 65include/webkitgtk-4.0/webkit2/WebKitPlugin.h
65include/webkitgtk-4.0/webkit2/WebKitPointerLockPermissionRequest.h 66include/webkitgtk-4.0/webkit2/WebKitPointerLockPermissionRequest.h
66include/webkitgtk-4.0/webkit2/WebKitPolicyDecision.h 67include/webkitgtk-4.0/webkit2/WebKitPolicyDecision.h
67include/webkitgtk-4.0/webkit2/WebKitPrintCustomWidget.h 68include/webkitgtk-4.0/webkit2/WebKitPrintCustomWidget.h
@@ -209,30 +210,30 @@ include/webkitgtk-4.0/webkitdom/WebKitDO @@ -209,30 +210,30 @@ include/webkitgtk-4.0/webkitdom/WebKitDO
209include/webkitgtk-4.0/webkitdom/WebKitDOMUIEvent.h 210include/webkitgtk-4.0/webkitdom/WebKitDOMUIEvent.h
210include/webkitgtk-4.0/webkitdom/WebKitDOMWheelEvent.h 211include/webkitgtk-4.0/webkitdom/WebKitDOMWheelEvent.h
211include/webkitgtk-4.0/webkitdom/WebKitDOMXPathExpression.h 212include/webkitgtk-4.0/webkitdom/WebKitDOMXPathExpression.h
212include/webkitgtk-4.0/webkitdom/WebKitDOMXPathNSResolver.h 213include/webkitgtk-4.0/webkitdom/WebKitDOMXPathNSResolver.h
213include/webkitgtk-4.0/webkitdom/WebKitDOMXPathResult.h 214include/webkitgtk-4.0/webkitdom/WebKitDOMXPathResult.h
214include/webkitgtk-4.0/webkitdom/webkitdom.h 215include/webkitgtk-4.0/webkitdom/webkitdom.h
215include/webkitgtk-4.0/webkitdom/webkitdomautocleanups.h 216include/webkitgtk-4.0/webkitdom/webkitdomautocleanups.h
216include/webkitgtk-4.0/webkitdom/webkitdomdefines.h 217include/webkitgtk-4.0/webkitdom/webkitdomdefines.h
217${PLIST.introspection}lib/girepository-1.0/JavaScriptCore-4.0.typelib 218${PLIST.introspection}lib/girepository-1.0/JavaScriptCore-4.0.typelib
218${PLIST.introspection}lib/girepository-1.0/WebKit2-4.0.typelib 219${PLIST.introspection}lib/girepository-1.0/WebKit2-4.0.typelib
219${PLIST.introspection}lib/girepository-1.0/WebKit2WebExtension-4.0.typelib 220${PLIST.introspection}lib/girepository-1.0/WebKit2WebExtension-4.0.typelib
220lib/libjavascriptcoregtk-4.0.so 221lib/libjavascriptcoregtk-4.0.so
221lib/libjavascriptcoregtk-4.0.so.18 222lib/libjavascriptcoregtk-4.0.so.18
222lib/libjavascriptcoregtk-4.0.so.18.18.8 223lib/libjavascriptcoregtk-4.0.so.18.19.5
223lib/libwebkit2gtk-4.0.so 224lib/libwebkit2gtk-4.0.so
224lib/libwebkit2gtk-4.0.so.37 225lib/libwebkit2gtk-4.0.so.37
225lib/libwebkit2gtk-4.0.so.37.53.5 226lib/libwebkit2gtk-4.0.so.37.55.3
226lib/pkgconfig/javascriptcoregtk-4.0.pc 227lib/pkgconfig/javascriptcoregtk-4.0.pc
227lib/pkgconfig/webkit2gtk-4.0.pc 228lib/pkgconfig/webkit2gtk-4.0.pc
228lib/pkgconfig/webkit2gtk-web-extension-4.0.pc 229lib/pkgconfig/webkit2gtk-web-extension-4.0.pc
229lib/webkit2gtk-4.0/injected-bundle/libwebkit2gtkinjectedbundle.so 230lib/webkit2gtk-4.0/injected-bundle/libwebkit2gtkinjectedbundle.so
230libexec/webkit2gtk-4.0/MiniBrowser 231libexec/webkit2gtk-4.0/MiniBrowser
231libexec/webkit2gtk-4.0/WebKitNetworkProcess 232libexec/webkit2gtk-4.0/WebKitNetworkProcess
232libexec/webkit2gtk-4.0/WebKitWebProcess 233libexec/webkit2gtk-4.0/WebKitWebProcess
233libexec/webkit2gtk-4.0/jsc 234libexec/webkit2gtk-4.0/jsc
234${PLIST.introspection}share/gir-1.0/JavaScriptCore-4.0.gir 235${PLIST.introspection}share/gir-1.0/JavaScriptCore-4.0.gir
235${PLIST.introspection}share/gir-1.0/WebKit2-4.0.gir 236${PLIST.introspection}share/gir-1.0/WebKit2-4.0.gir
236${PLIST.introspection}share/gir-1.0/WebKit2WebExtension-4.0.gir 237${PLIST.introspection}share/gir-1.0/WebKit2WebExtension-4.0.gir
237share/locale/ar/LC_MESSAGES/WebKit2GTK-4.0.mo 238share/locale/ar/LC_MESSAGES/WebKit2GTK-4.0.mo
238share/locale/as/LC_MESSAGES/WebKit2GTK-4.0.mo 239share/locale/as/LC_MESSAGES/WebKit2GTK-4.0.mo
cvs diff -r1.82 -r1.83 pkgsrc/www/webkit-gtk/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/www/webkit-gtk/buildlink3.mk 2021/04/21 11:40:44 1.82
+++ pkgsrc/www/webkit-gtk/buildlink3.mk 2021/09/28 22:11:54 1.83
@@ -1,38 +1,39 @@ @@ -1,38 +1,39 @@
1# $NetBSD: buildlink3.mk,v 1.82 2021/04/21 11:40:44 adam Exp $ 1# $NetBSD: buildlink3.mk,v 1.83 2021/09/28 22:11:54 leot Exp $
2 2
3BUILDLINK_TREE+= webkit-gtk 3BUILDLINK_TREE+= webkit-gtk
4 4
5.if !defined(WEBKIT_GTK_BUILDLINK3_MK) 5.if !defined(WEBKIT_GTK_BUILDLINK3_MK)
6WEBKIT_GTK_BUILDLINK3_MK:= 6WEBKIT_GTK_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.webkit-gtk+= webkit-gtk>=2.8 8BUILDLINK_API_DEPENDS.webkit-gtk+= webkit-gtk>=2.8
9BUILDLINK_ABI_DEPENDS.webkit-gtk?= webkit-gtk>=2.32.0nb1 9BUILDLINK_ABI_DEPENDS.webkit-gtk?= webkit-gtk>=2.32.0nb1
10BUILDLINK_PKGSRCDIR.webkit-gtk?= ../../www/webkit-gtk 10BUILDLINK_PKGSRCDIR.webkit-gtk?= ../../www/webkit-gtk
11 11
12# This is necessary to match the package requirement. 12# This is necessary to match the package requirement.
13GCC_REQD+= 7.3 13GCC_REQD+= 7.3
14 14
15pkgbase := webkit-gtk 15pkgbase := webkit-gtk
16.include "../../mk/pkg-build-options.mk" 16.include "../../mk/pkg-build-options.mk"
17 17
18.if !empty(PKG_BUILD_OPTIONS.webkit-gtk:Menchant) 18.if !empty(PKG_BUILD_OPTIONS.webkit-gtk:Menchant)
19.include "../../textproc/enchant2/buildlink3.mk" 19.include "../../textproc/enchant2/buildlink3.mk"
20.endif 20.endif
21 21
22.include "../../databases/sqlite3/buildlink3.mk" 22.include "../../databases/sqlite3/buildlink3.mk"
23.include "../../devel/gperf/buildlink3.mk" 23.include "../../devel/gperf/buildlink3.mk"
24.include "../../graphics/freetype2/buildlink3.mk" 24.include "../../graphics/freetype2/buildlink3.mk"
25.include "../../mk/jpeg.buildlink3.mk" 25.include "../../mk/jpeg.buildlink3.mk"
 26.include "../../graphics/lcms2/buildlink3.mk"
26.include "../../graphics/png/buildlink3.mk" 27.include "../../graphics/png/buildlink3.mk"
27.include "../../graphics/libwebp/buildlink3.mk" 28.include "../../graphics/libwebp/buildlink3.mk"
28.include "../../multimedia/gstreamer1/buildlink3.mk" 29.include "../../multimedia/gstreamer1/buildlink3.mk"
29.include "../../multimedia/gst-plugins1-base/buildlink3.mk" 30.include "../../multimedia/gst-plugins1-base/buildlink3.mk"
30.include "../../net/libsoup/buildlink3.mk" 31.include "../../net/libsoup/buildlink3.mk"
31.include "../../security/libsecret/buildlink3.mk" 32.include "../../security/libsecret/buildlink3.mk"
32.include "../../textproc/icu/buildlink3.mk" 33.include "../../textproc/icu/buildlink3.mk"
33.include "../../textproc/libxslt/buildlink3.mk" 34.include "../../textproc/libxslt/buildlink3.mk"
34.include "../../x11/gtk3/buildlink3.mk" 35.include "../../x11/gtk3/buildlink3.mk"
35.include "../../x11/libXdamage/buildlink3.mk" 36.include "../../x11/libXdamage/buildlink3.mk"
36.include "../../x11/libXt/buildlink3.mk" 37.include "../../x11/libXt/buildlink3.mk"
37.endif # WEBKIT_GTK_BUILDLINK3_MK 38.endif # WEBKIT_GTK_BUILDLINK3_MK
38 39
cvs diff -r1.153 -r1.154 pkgsrc/www/webkit-gtk/distinfo (expand / switch to unified diff)

--- pkgsrc/www/webkit-gtk/distinfo 2021/09/17 15:50:34 1.153
+++ pkgsrc/www/webkit-gtk/distinfo 2021/09/28 22:11:54 1.154
@@ -1,47 +1,47 @@ @@ -1,47 +1,47 @@
1$NetBSD: distinfo,v 1.153 2021/09/17 15:50:34 leot Exp $ 1$NetBSD: distinfo,v 1.154 2021/09/28 22:11:54 leot Exp $
2 2
3SHA1 (webkitgtk-2.32.4.tar.xz) = f7255ffb488e727e9e250e0dae9f192266f50f01 3SHA1 (webkitgtk-2.34.0.tar.xz) = a370f8844b99828531228ad6f1f7a02d8b07488d
4RMD160 (webkitgtk-2.32.4.tar.xz) = 410788d0911dc2d4ce86b1178401440c511629ef 4RMD160 (webkitgtk-2.34.0.tar.xz) = 9478d7164391d66de6f2580fdca5d05ee211dd60
5SHA512 (webkitgtk-2.32.4.tar.xz) = c2d72850097da72a82faab0a1218b312668b88bc8b67fcd62f08368c71d46bc833e08b3e095eb286beeae59ee88ac74c8393caee8a4ec5a8e90e02425e43350b 5SHA512 (webkitgtk-2.34.0.tar.xz) = 165cd075680c6890f8d92bb319df4ef13787998e9e24a96dbc601fc922f468c86c5bfebdfde2b7fa21775d1a2c2efa5cb5d3b0e9f7d4b655b4b3b352a17ec6c8
6Size (webkitgtk-2.32.4.tar.xz) = 23327956 bytes 6Size (webkitgtk-2.34.0.tar.xz) = 24998292 bytes
7SHA1 (patch-Source_JavaScriptCore_Scripts_check-xcfilelists.sh) = f4f117e6c1cd8eb8e4905f74946e0367156ed528 7SHA1 (patch-Source_JavaScriptCore_Scripts_check-xcfilelists.sh) = f4f117e6c1cd8eb8e4905f74946e0367156ed528
8SHA1 (patch-Source_JavaScriptCore_Scripts_generate-unified-sources.sh) = 308a7c8f687253b4fc75de0c66016dd18666e697 8SHA1 (patch-Source_JavaScriptCore_Scripts_generate-unified-sources.sh) = 308a7c8f687253b4fc75de0c66016dd18666e697
9SHA1 (patch-Source_JavaScriptCore_assembler_ARM64Assembler.h) = 79c282ca90d0ba2ef4769da40d4648f5f709951b 9SHA1 (patch-Source_JavaScriptCore_assembler_ARM64Assembler.h) = 79c282ca90d0ba2ef4769da40d4648f5f709951b
10SHA1 (patch-Source_JavaScriptCore_assembler_ARMv7Assembler.h) = 70975aac175ec4131a4ed26a54dfe51e16ffb7cd 10SHA1 (patch-Source_JavaScriptCore_assembler_ARMv7Assembler.h) = 70975aac175ec4131a4ed26a54dfe51e16ffb7cd
11SHA1 (patch-Source_JavaScriptCore_heap_MarkedSpace.cpp) = 709e5dcf4cdb834617c2ef542686bb2aa4aa37b3 11SHA1 (patch-Source_JavaScriptCore_heap_MarkedSpace.cpp) = 8f324091df41be96b011bcbeed5fd64c4464f010
12SHA1 (patch-Source_JavaScriptCore_jit_ExecutableAllocator.cpp) = 7f6c0c57d46478e83c4ff21dae2415f44085ba32 12SHA1 (patch-Source_JavaScriptCore_jit_ExecutableAllocator.cpp) = 7f6c0c57d46478e83c4ff21dae2415f44085ba32
13SHA1 (patch-Source_JavaScriptCore_offlineasm_arm64.rb) = 8c05dafa317667bbf55504d05eeb8ae06fba4e93 13SHA1 (patch-Source_JavaScriptCore_offlineasm_arm64.rb) = 8c05dafa317667bbf55504d05eeb8ae06fba4e93
14SHA1 (patch-Source_JavaScriptCore_runtime_MachineContext.h) = 3bf3c200917ba49573388081ea9c5f6c55605b9b 14SHA1 (patch-Source_JavaScriptCore_runtime_MachineContext.h) = 3bf3c200917ba49573388081ea9c5f6c55605b9b
15SHA1 (patch-Source_ThirdParty_ANGLE_src_common_third__party_smhasher_src_PMurHash.cpp) = 73dfe781efe7e8aa7d49094af8820a87c501818f 15SHA1 (patch-Source_ThirdParty_ANGLE_src_common_third__party_smhasher_src_PMurHash.cpp) = 73dfe781efe7e8aa7d49094af8820a87c501818f
16SHA1 (patch-Source_ThirdParty_ANGLE_src_compiler_translator_SymbolTable.h) = 10debffda84bc752ed434657a337a466aad19a3a 16SHA1 (patch-Source_ThirdParty_ANGLE_src_compiler_translator_SymbolTable.h) = 10debffda84bc752ed434657a337a466aad19a3a
17SHA1 (patch-Source_ThirdParty_gtest_include_gtest_internal_gtest-port.h) = a5454eb891ad1f9d8285c28af2e9efb4ff439e6b 17SHA1 (patch-Source_ThirdParty_gtest_include_gtest_internal_gtest-port.h) = ac07d4d8faa6dab606bcea31936340d260fcda33
18SHA1 (patch-Source_WTF_wtf_Assertions.h) = 427de20eba4627578087feaa7de2f23e80b9debf 18SHA1 (patch-Source_WTF_wtf_Assertions.h) = 427de20eba4627578087feaa7de2f23e80b9debf
19SHA1 (patch-Source_WTF_wtf_FileSystem.cpp) = 2fe7b7755646d9a1cc022aec3d01091766378aba 19SHA1 (patch-Source_WTF_wtf_FileSystem.cpp) = 2fe7b7755646d9a1cc022aec3d01091766378aba
20SHA1 (patch-Source_WTF_wtf_PlatformEnable.h) = eb5598c20c8453314daba7897066f15827bbede7 20SHA1 (patch-Source_WTF_wtf_PlatformEnable.h) = eb5598c20c8453314daba7897066f15827bbede7
21SHA1 (patch-Source_WTF_wtf_PlatformHave.h) = 1c96cc094a4f62f17d11890a17f164d214fa0f1f 21SHA1 (patch-Source_WTF_wtf_PlatformHave.h) = 1c96cc094a4f62f17d11890a17f164d214fa0f1f
22SHA1 (patch-Source_WTF_wtf_PlatformOS.h) = 80aa6ff20f10407d447fdb41606d4bb4989351aa 22SHA1 (patch-Source_WTF_wtf_PlatformOS.h) = 80aa6ff20f10407d447fdb41606d4bb4989351aa
23SHA1 (patch-Source_WTF_wtf_PlatformUse.h) = 595486b48e7d89378208c0a209a121ef136415e6 23SHA1 (patch-Source_WTF_wtf_PlatformUse.h) = 595486b48e7d89378208c0a209a121ef136415e6
24SHA1 (patch-Source_WTF_wtf_StackBounds.cpp) = 22a71daac8443f079ad8bcc7285cfd7319c972b3 24SHA1 (patch-Source_WTF_wtf_StackBounds.cpp) = 22a71daac8443f079ad8bcc7285cfd7319c972b3
25SHA1 (patch-Source_WebCore_Scripts_check-xcfilelists.sh) = b292baf2494bcd459d9af91386263123046c6615 25SHA1 (patch-Source_WebCore_Scripts_check-xcfilelists.sh) = b292baf2494bcd459d9af91386263123046c6615
26SHA1 (patch-Source_WebCore_Scripts_generate-unified-sources.sh) = 9b323aa1fa8e6e5599ac0a7ae08fbbed4348c70e 26SHA1 (patch-Source_WebCore_Scripts_generate-unified-sources.sh) = 9b323aa1fa8e6e5599ac0a7ae08fbbed4348c70e
27SHA1 (patch-Source_WebCore_crypto_algorithms_CryptoAlgorithmAES__GCM.cpp) = 03337c5eec54d6974dfea1766b14cb2c1b9f7750 27SHA1 (patch-Source_WebCore_crypto_algorithms_CryptoAlgorithmAES__GCM.cpp) = 03337c5eec54d6974dfea1766b14cb2c1b9f7750
28SHA1 (patch-Source_WebCore_inspector_InspectorFrontendHost.cpp) = daf6351a1a0b5a49592a2bb6db0d54620c7b09e3 28SHA1 (patch-Source_WebCore_inspector_InspectorFrontendHost.cpp) = daf6351a1a0b5a49592a2bb6db0d54620c7b09e3
29SHA1 (patch-Source_WebCore_platform_graphics_filters_FEMorphology.cpp) = 16b36d2d91fd7f43156b9ee09bcafd19602ebbd9 29SHA1 (patch-Source_WebCore_platform_graphics_filters_FEMorphology.cpp) = 16b36d2d91fd7f43156b9ee09bcafd19602ebbd9
30SHA1 (patch-Source_WebCore_platform_network_DNS.h) = a491ed31e288af1ef56c4a70564045609ecb4b6a 30SHA1 (patch-Source_WebCore_platform_network_DNS.h) = dd9fb67aae0029c6a452e7d8f09eeed1235d5700
31SHA1 (patch-Source_WebCore_rendering_RenderLayerBacking.h) = ecf722df1d1cca13573786b34fe1e3d85edf1e1e 31SHA1 (patch-Source_WebCore_rendering_RenderLayerBacking.h) = ecf722df1d1cca13573786b34fe1e3d85edf1e1e
32SHA1 (patch-Source_WebCore_rendering_shapes_RasterShape.cpp) = 551e47698dee50d097b11e3218f13bb3447edfea 32SHA1 (patch-Source_WebCore_rendering_shapes_RasterShape.cpp) = 551e47698dee50d097b11e3218f13bb3447edfea
33SHA1 (patch-Source_WebCore_rendering_shapes_ShapeOutsideInfo.cpp) = 3a4d9415e7d3ac78a948b9e7eb5e0377575835c3 33SHA1 (patch-Source_WebCore_rendering_shapes_ShapeOutsideInfo.cpp) = 3a4d9415e7d3ac78a948b9e7eb5e0377575835c3
34SHA1 (patch-Source_WebKit_CMakeLists.txt) = 86d11b8a1142a1ab267e412873cca4f8924aaae8 34SHA1 (patch-Source_WebKit_CMakeLists.txt) = 86d11b8a1142a1ab267e412873cca4f8924aaae8
35SHA1 (patch-Source_WebKit_NetworkProcess_cache_NetworkCacheFileSystem.cpp) = 14dfbee895aa7c70bf3b61b4dbb5bccd96d9583a 35SHA1 (patch-Source_WebKit_NetworkProcess_cache_NetworkCacheFileSystem.cpp) = 14dfbee895aa7c70bf3b61b4dbb5bccd96d9583a
36SHA1 (patch-Source_WebKit_PlatformGTK.cmake) = 61d2b4942b83d3f3c1b642d122f109ba90bbff9d 36SHA1 (patch-Source_WebKit_PlatformGTK.cmake) = 61d2b4942b83d3f3c1b642d122f109ba90bbff9d
37SHA1 (patch-Source_WebKit_Platform_IPC_unix_ConnectionUnix.cpp) = f2ee81bf200fe1fe1bc59cb571e4459163a9cbde 37SHA1 (patch-Source_WebKit_Platform_IPC_unix_ConnectionUnix.cpp) = f2ee81bf200fe1fe1bc59cb571e4459163a9cbde
38SHA1 (patch-Source_WebKit_Platform_classifier_ResourceLoadStatisticsClassifier.cpp) = 920376ec8697780637f376b2fff312b7e214a7f6 38SHA1 (patch-Source_WebKit_Platform_classifier_ResourceLoadStatisticsClassifier.cpp) = 920376ec8697780637f376b2fff312b7e214a7f6
39SHA1 (patch-Source_WebKit_Scripts_check-xcfilelists.sh) = 22cc5ba1ababc6395aa0ef467db0c27c2fbf6878 39SHA1 (patch-Source_WebKit_Scripts_check-xcfilelists.sh) = 22cc5ba1ababc6395aa0ef467db0c27c2fbf6878
40SHA1 (patch-Source_WebKit_Scripts_generate-unified-sources.sh) = def930cf3f706ac657b2f8835c8c0278ade8f663 40SHA1 (patch-Source_WebKit_Scripts_generate-unified-sources.sh) = def930cf3f706ac657b2f8835c8c0278ade8f663
41SHA1 (patch-Source_bmalloc_bmalloc_BPlatform.h) = 28d1f657fde427062a729b26398e96825082fc4d 41SHA1 (patch-Source_bmalloc_bmalloc_BPlatform.h) = 28d1f657fde427062a729b26398e96825082fc4d
42SHA1 (patch-Source_bmalloc_bmalloc_VMAllocate.h) = b1eb6ab93f2ce272cfee94a544d19806feb9a625 42SHA1 (patch-Source_bmalloc_bmalloc_VMAllocate.h) = 22c23689fa79c930145068ed7966844bbf92a6a9
43SHA1 (patch-Source_cmake_OptionsCommon.cmake) = b0f0070bb006081e5f609d07103cd8abf382d60e 43SHA1 (patch-Source_cmake_OptionsCommon.cmake) = b0f0070bb006081e5f609d07103cd8abf382d60e
44SHA1 (patch-Source_cmake_WebKitCommon.cmake) = 5f275eb75cf61b89a9168e4d72f9587dd5c732bc 44SHA1 (patch-Source_cmake_WebKitCommon.cmake) = 5f275eb75cf61b89a9168e4d72f9587dd5c732bc
45SHA1 (patch-Tools_TestWebKitAPI_Scripts_check-xcfilelists.sh) = 6e8327bf46150806910b21b298767f313e1eb3ce 45SHA1 (patch-Tools_TestWebKitAPI_Scripts_check-xcfilelists.sh) = 6e8327bf46150806910b21b298767f313e1eb3ce
46SHA1 (patch-Tools_TestWebKitAPI_Scripts_generate-unified-sources.sh) = 06747f279263558f05bb01c8da9c994a357ce74a 46SHA1 (patch-Tools_TestWebKitAPI_Scripts_generate-unified-sources.sh) = 06747f279263558f05bb01c8da9c994a357ce74a
47SHA1 (patch-aj) = ec60907df4336b755d1d1924c026b3041805f431 47SHA1 (patch-aj) = ec60907df4336b755d1d1924c026b3041805f431
cvs diff -r1.3 -r1.4 pkgsrc/www/webkit-gtk/patches/patch-Source_JavaScriptCore_heap_MarkedSpace.cpp (expand / switch to unified diff)

--- pkgsrc/www/webkit-gtk/patches/patch-Source_JavaScriptCore_heap_MarkedSpace.cpp 2020/09/11 14:47:35 1.3
+++ pkgsrc/www/webkit-gtk/patches/patch-Source_JavaScriptCore_heap_MarkedSpace.cpp 2021/09/28 22:11:54 1.4
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1$NetBSD: patch-Source_JavaScriptCore_heap_MarkedSpace.cpp,v 1.3 2020/09/11 14:47:35 leot Exp $ 1$NetBSD: patch-Source_JavaScriptCore_heap_MarkedSpace.cpp,v 1.4 2021/09/28 22:11:54 leot Exp $
2 2
3Avoid ambiguous function call. 3Avoid ambiguous function call.
4 4
5--- Source/JavaScriptCore/heap/MarkedSpace.cpp.orig 2020-08-12 09:17:52.000000000 +0000 5--- Source/JavaScriptCore/heap/MarkedSpace.cpp.orig 2021-09-01 09:16:46.000000000 +0000
6+++ Source/JavaScriptCore/heap/MarkedSpace.cpp 6+++ Source/JavaScriptCore/heap/MarkedSpace.cpp
7@@ -28,6 +28,8 @@ 7@@ -29,6 +29,8 @@
8 #include "MarkedSpaceInlines.h" 
9 #include <wtf/ListDump.h> 8 #include <wtf/ListDump.h>
 9 #include <wtf/SimpleStats.h>
10  10
11+using std::pow; 11+using std::pow;
12+ 12+
13 namespace JSC { 13 namespace JSC {
14  14
15 std::array<unsigned, MarkedSpace::numSizeClasses> MarkedSpace::s_sizeClassForSizeStep; 15 std::array<unsigned, MarkedSpace::numSizeClasses> MarkedSpace::s_sizeClassForSizeStep;
cvs diff -r1.3 -r1.4 pkgsrc/www/webkit-gtk/patches/patch-Source_bmalloc_bmalloc_VMAllocate.h (expand / switch to unified diff)

--- pkgsrc/www/webkit-gtk/patches/patch-Source_bmalloc_bmalloc_VMAllocate.h 2019/09/10 22:10:04 1.3
+++ pkgsrc/www/webkit-gtk/patches/patch-Source_bmalloc_bmalloc_VMAllocate.h 2021/09/28 22:11:54 1.4
@@ -1,28 +1,28 @@ @@ -1,28 +1,28 @@
1$NetBSD: patch-Source_bmalloc_bmalloc_VMAllocate.h,v 1.3 2019/09/10 22:10:04 leot Exp $ 1$NetBSD: patch-Source_bmalloc_bmalloc_VMAllocate.h,v 1.4 2021/09/28 22:11:54 leot Exp $
2 2
3NetBSD has MADV_FREE too. 3NetBSD has MADV_FREE too.
4Use posix_madvise on SunOS. 4Use posix_madvise on SunOS.
5 5
6--- Source/bmalloc/bmalloc/VMAllocate.h.orig 2019-08-28 11:46:33.000000000 +0000 6--- Source/bmalloc/bmalloc/VMAllocate.h.orig 2021-09-01 09:16:51.000000000 +0000
7+++ Source/bmalloc/bmalloc/VMAllocate.h 7+++ Source/bmalloc/bmalloc/VMAllocate.h
8@@ -201,8 +201,10 @@ inline void vmDeallocatePhysicalPages(vo 8@@ -201,8 +201,10 @@ inline void vmDeallocatePhysicalPages(vo
9 vmValidatePhysical(p, vmSize); 9 vmValidatePhysical(p, vmSize);
10 #if BOS(DARWIN) 10 #if BOS(DARWIN)
11 SYSCALL(madvise(p, vmSize, MADV_FREE_REUSABLE)); 11 SYSCALL(madvise(p, vmSize, MADV_FREE_REUSABLE));
12-#elif BOS(FREEBSD) 12-#elif BOS(FREEBSD)
13+#elif BOS(FREEBSD) || BOS(NETBSD) 13+#elif BOS(FREEBSD) || BOS(NETBSD)
14 SYSCALL(madvise(p, vmSize, MADV_FREE)); 14 SYSCALL(madvise(p, vmSize, MADV_FREE));
15+#elif BOS(SOLARIS) 15+#elif BOS(SOLARIS)
16+ SYSCALL(posix_madvise(p, vmSize, MADV_DONTNEED)); 16+ SYSCALL(posix_madvise(p, vmSize, MADV_DONTNEED));
17 #else 17 #else
18 SYSCALL(madvise(p, vmSize, MADV_DONTNEED)); 18 SYSCALL(madvise(p, vmSize, MADV_DONTNEED));
19 #if BOS(LINUX) 19 #if BOS(LINUX)
20@@ -216,6 +218,8 @@ inline void vmAllocatePhysicalPages(void 20@@ -220,6 +222,8 @@ inline void vmAllocatePhysicalPages(void
21 vmValidatePhysical(p, vmSize); 21 // For the Darwin platform, we don't need to call madvise(..., MADV_FREE_REUSE)
22 #if BOS(DARWIN) 22 // to commit physical memory to back a range of allocated virtual memory.
23 SYSCALL(madvise(p, vmSize, MADV_FREE_REUSE)); 23 // Instead the kernel will commit pages as they are touched.
24+#elif BOS(SOLARIS) 24+#elif BOS(SOLARIS)
25+ SYSCALL(posix_madvise(p, vmSize, MADV_NORMAL)); 25+ SYSCALL(posix_madvise(p, vmSize, MADV_NORMAL));
26 #else 26 #else
27 SYSCALL(madvise(p, vmSize, MADV_NORMAL)); 27 SYSCALL(madvise(p, vmSize, MADV_NORMAL));
28 #if BOS(LINUX) 28 #if BOS(LINUX)
cvs diff -r1.4 -r1.5 pkgsrc/www/webkit-gtk/patches/patch-Source_ThirdParty_gtest_include_gtest_internal_gtest-port.h (expand / switch to unified diff)

--- pkgsrc/www/webkit-gtk/patches/patch-Source_ThirdParty_gtest_include_gtest_internal_gtest-port.h 2019/03/13 20:49:40 1.4
+++ pkgsrc/www/webkit-gtk/patches/patch-Source_ThirdParty_gtest_include_gtest_internal_gtest-port.h 2021/09/28 22:11:54 1.5
@@ -1,36 +1,20 @@ @@ -1,36 +1,20 @@
1$NetBSD: patch-Source_ThirdParty_gtest_include_gtest_internal_gtest-port.h,v 1.4 2019/03/13 20:49:40 leot Exp $ 1$NetBSD: patch-Source_ThirdParty_gtest_include_gtest_internal_gtest-port.h,v 1.5 2021/09/28 22:11:54 leot Exp $
2 2
3--- Source/ThirdParty/gtest/include/gtest/internal/gtest-port.h.orig 2019-02-12 11:21:03.000000000 +0000 3--- Source/ThirdParty/gtest/include/gtest/internal/gtest-port.h.orig 2021-09-01 09:16:47.000000000 +0000
4+++ Source/ThirdParty/gtest/include/gtest/internal/gtest-port.h 4+++ Source/ThirdParty/gtest/include/gtest/internal/gtest-port.h
5@@ -42,6 +42,7 @@ 5@@ -42,6 +42,7 @@
6  6
7 #ifndef GTEST_INCLUDE_GTEST_INTERNAL_GTEST_PORT_H_ 7 #ifndef GOOGLETEST_INCLUDE_GTEST_INTERNAL_GTEST_PORT_H_
8 #define GTEST_INCLUDE_GTEST_INTERNAL_GTEST_PORT_H_ 8 #define GOOGLETEST_INCLUDE_GTEST_INTERNAL_GTEST_PORT_H_
9+#include <ciso646> 9+#include <ciso646>
10  10
11 // Environment-describing macros 11 // Environment-describing macros
12 // ----------------------------- 12 // -----------------------------
13@@ -268,6 +269,7 @@ 13@@ -261,6 +262,7 @@
14 #include <stdlib.h> 
15 #include <stdio.h> 14 #include <stdio.h>
 15 #include <stdlib.h>
16 #include <string.h> 16 #include <string.h>
17+#include <unistd.h> 17+#include <unistd.h>
18 #ifndef _WIN32_WCE 
19 # include <sys/types.h> 
20 # include <sys/stat.h> 
21@@ -755,7 +757,14 @@ typedef struct _RTL_CRITICAL_SECTION GTE 
22 // GCC 4.0+ implements tr1/tuple in the <tr1/tuple> header. This does 
23 // not conform to the TR1 spec, which requires the header to be <tuple>. 
24  18
25-# if !GTEST_HAS_RTTI && GTEST_GCC_VER_ < 40302 19 #include <cerrno>
26+#if defined(_LIBCPP_VERSION) 20 #include <cstdint>
27+#include <tuple> 
28+namespace std { 
29+ namespace tr1 { 
30+ using ::std::tuple; 
31+ } 
32+}  
33+#elif !GTEST_HAS_RTTI && GTEST_GCC_VER_ < 40302 
34 // Until version 4.3.2, gcc has a bug that causes <tr1/functional>, 
35 // which is #included by <tr1/tuple>, to not compile when RTTI is 
36 // disabled. _TR1_FUNCTIONAL is the header guard for 
cvs diff -r1.1 -r1.2 pkgsrc/www/webkit-gtk/patches/patch-Source_WebCore_platform_network_DNS.h (expand / switch to unified diff)

--- pkgsrc/www/webkit-gtk/patches/patch-Source_WebCore_platform_network_DNS.h 2021/01/12 15:21:31 1.1
+++ pkgsrc/www/webkit-gtk/patches/patch-Source_WebCore_platform_network_DNS.h 2021/09/28 22:11:54 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-Source_WebCore_platform_network_DNS.h,v 1.1 2021/01/12 15:21:31 jperkin Exp $ 1$NetBSD: patch-Source_WebCore_platform_network_DNS.h,v 1.2 2021/09/28 22:11:54 leot Exp $
2 2
3Include sys/socket.h for AF_*. 3Include sys/socket.h for AF_*.
4 4
5--- Source/WebCore/platform/network/DNS.h.orig 2020-08-12 09:17:55.000000000 +0000 5--- Source/WebCore/platform/network/DNS.h.orig 2021-09-01 09:16:50.000000000 +0000
6+++ Source/WebCore/platform/network/DNS.h 6+++ Source/WebCore/platform/network/DNS.h
7@@ -30,6 +30,7 @@ 7@@ -34,6 +34,7 @@
8 #include <ws2tcpip.h> 8 #include <ws2tcpip.h>
9 #else 9 #else
10 #include <netinet/in.h> 10 #include <netinet/in.h>
11+#include <sys/socket.h> 11+#include <sys/socket.h>
12 #endif 12 #endif
13  13
14 #include <wtf/Forward.h> 14 namespace WebCore {