CVS commit: pkgsrc/www/webkit-gtk

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/www/webkit-gtk
From: "Leonardo Taccari" <leot%netbsd.org@localhost>
Date: Wed, 24 Oct 2018 18:31:08 +0000

Module Name:    pkgsrc
Committed By:   leot
Date:           Wed Oct 24 18:31:08 UTC 2018

Modified Files:
        pkgsrc/www/webkit-gtk: Makefile PLIST buildlink3.mk distinfo options.mk
        pkgsrc/www/webkit-gtk/patches: patch-CMakeLists.txt
            patch-Source_JavaScriptCore_assembler_ARMAssembler.h
            patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp
            patch-Source_JavaScriptCore_jit_ExecutableAllocator.cpp
            patch-Source_WTF_wtf_Platform.h
            patch-Source_WTF_wtf_StackBounds.cpp
            patch-Source_WebKit_NetworkProcess_cache_NetworkCacheFileSystem.cpp
            patch-Source_WebKit_PlatformGTK.cmake
            patch-Source_bmalloc_bmalloc_VMAllocate.h patch-aj
Added Files:
        pkgsrc/www/webkit-gtk/patches:
            patch-Source_JavaScriptCore_runtime_MachineContext.h
            patch-Source_WebCore_inspector_InspectorFrontendHost.cpp
            patch-Source_bmalloc_bmalloc_BPlatform.h
Removed Files:
        pkgsrc/www/webkit-gtk/patches: patch-Source_WTF_wtf_ThreadSpecific.h

Log Message:
webkit-gtk: Update www/webkit-gtk to 2.22.2

pkgsrc changes:
 - Bump GCC_REQD to 6 (now gcc 6.0.0 or newer is needed)
 - Add NetBSD support for JavaScript JIT on x86_64, i386, arm,
   aarch64 and mips
 - Add WebKitWebProcess and jsc to NOT_PAX_MPROTECT_SAFE.
   At least on NetBSD/amd64, running SunSpider 1.0.2 JavaScript Benchmark
   (<https://webkit.org/perf/sunspider/sunspider.html>) with MiniBrowser
   before `paxctl +m'-ing them needed:
    Total:                 1006.9ms +/- 0.7%
   ...while after `paxctl +m'-ing them:
    Total:                 322.3ms +/- 3.0%
   (Probably EACCESS due PaX MPROTECT are handled gracefully and
   silently instead of failing hard at runtime.)
   Please also note that webkit-gtk browsers should not need any
   NOT_PAX_MPROTECT_SAFE because WebKitWebProcess is used and already
   have that.
 - Improve handling of `webkit-jit' by introducing a
   WEBKIT_JIT_MACHINE_PLATFORMS list that contain all MACHINE_PLATFORMs
   triplets that have `webkit-jit' option as suggested one.
 - Always use OS(...) and BOS(...) macros instead of __Os__ macros for
   consistency with webkit code.
 - Add definition for BOS(SOLARIS) and OS(SOLARIS) and add it to the
   OS(UNIX) OSes list.
 - Limit patch-Source_JavaScriptCore_jit_ExecutableAllocator.cpp to
   OpenBSD. It is no longer present in FreeBSD ports and it is not
   problematic in NetBSD.
 - Remove no longer needed patch-Source_WTF_wtf_ThreadSpecific.h:
   NetBSD 5.x was already part of NOT_FOR_PLATFORM.
 - Sync patch-CMakeLists.txt with FreeBSD ports.
   Please note that this also removes WTF_CPU_SPARC64 definition that was
   unused.
 - madvise(2) on {Free,DragonFly,Net,Open}BSD supports MADV_FREE and
   MADV_DONTNEED flags. Define the corresponding HAVE_* via
   patch-Source_WTF_wtf_Platform.h.
 - Use globbing for REPLACE_{PERL,PYTHON} where possible.

Changes:
WebKitGTK+ 2.22.2
=================
  - Several fixes for video playback with media source extensions (MSE).
    This allows using WebM support for YouTube, which no longer works through
    regular video source. Note that MSE is still disabled by default and
    webkit_settings_set_enable_mediasource() has to be used to enable the
    feature.
  - Fix the build when only Wayland support is enabled and X11 headers are
    not available.

WebKitGTK+ 2.22.1
=================
  - Fix printing in landscape.
  - Fix the build in several platforms: s390x, ppc64le, armv7hl.
  - Fix the build with a11y disabled.
  - Fix the build with video disabled.
  - Fix several crashes and rendering issues.

WebKitGTK+ 2.22.0
==================
  - Add warn_unused_result attribute to some JavaScriptCore GLib APIs.
  - Make pinch to zoom scale the page without changing the layout.
  - Fix the build in mips64.


To generate a diff of this commit:
cvs rdiff -u -r1.144 -r1.145 pkgsrc/www/webkit-gtk/Makefile
cvs rdiff -u -r1.41 -r1.42 pkgsrc/www/webkit-gtk/PLIST
cvs rdiff -u -r1.66 -r1.67 pkgsrc/www/webkit-gtk/buildlink3.mk
cvs rdiff -u -r1.106 -r1.107 pkgsrc/www/webkit-gtk/distinfo
cvs rdiff -u -r1.12 -r1.13 pkgsrc/www/webkit-gtk/options.mk
cvs rdiff -u -r1.4 -r1.5 pkgsrc/www/webkit-gtk/patches/patch-CMakeLists.txt
cvs rdiff -u -r1.6 -r1.7 \
    pkgsrc/www/webkit-gtk/patches/patch-Source_JavaScriptCore_assembler_ARMAssembler.h \
    pkgsrc/www/webkit-gtk/patches/patch-aj
cvs rdiff -u -r1.5 -r1.6 \
    pkgsrc/www/webkit-gtk/patches/patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/www/webkit-gtk/patches/patch-Source_JavaScriptCore_jit_ExecutableAllocator.cpp \
    pkgsrc/www/webkit-gtk/patches/patch-Source_WTF_wtf_StackBounds.cpp \
    pkgsrc/www/webkit-gtk/patches/patch-Source_WebKit_NetworkProcess_cache_NetworkCacheFileSystem.cpp \
    pkgsrc/www/webkit-gtk/patches/patch-Source_WebKit_PlatformGTK.cmake \
    pkgsrc/www/webkit-gtk/patches/patch-Source_bmalloc_bmalloc_VMAllocate.h
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/www/webkit-gtk/patches/patch-Source_JavaScriptCore_runtime_MachineContext.h \
    pkgsrc/www/webkit-gtk/patches/patch-Source_WebCore_inspector_InspectorFrontendHost.cpp \
    pkgsrc/www/webkit-gtk/patches/patch-Source_bmalloc_bmalloc_BPlatform.h
cvs rdiff -u -r1.11 -r1.12 \
    pkgsrc/www/webkit-gtk/patches/patch-Source_WTF_wtf_Platform.h
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/www/webkit-gtk/patches/patch-Source_WTF_wtf_ThreadSpecific.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/Makefile
diff -u pkgsrc/www/webkit-gtk/Makefile:1.144 pkgsrc/www/webkit-gtk/Makefile:1.145
--- pkgsrc/www/webkit-gtk/Makefile:1.144        Wed Aug 22 09:47:59 2018
+++ pkgsrc/www/webkit-gtk/Makefile      Wed Oct 24 18:31:07 2018
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.144 2018/08/22 09:47:59 wiz Exp $
+# $NetBSD: Makefile,v 1.145 2018/10/24 18:31:07 leot Exp $
 
-DISTNAME=      webkitgtk-2.20.5
+DISTNAME=      webkitgtk-2.22.2
 PKGNAME=       ${DISTNAME:S/webkitgtk/webkit-gtk/}
-PKGREVISION=   1
 CATEGORIES=    www
 MASTER_SITES=  https://www.webkitgtk.org/releases/
 EXTRACT_SUFX=  .tar.xz
@@ -13,16 +12,15 @@ COMMENT=    GTK port of the WebKit browser 
 LICENSE=       2-clause-bsd AND gnu-lgpl-v2
 
 # shm_open(3) and shm_unlink(3) appeared in NetBSD 7.0
-NOT_FOR_PLATFORM=      NetBSD-[1-6]*-*
+NOT_FOR_PLATFORM=      NetBSD-[1-6].*-*
 
-BUILD_DEPENDS+=        gettext-tools>=0.18:../../devel/gettext-tools
+TOOL_DEPENDS+= gettext-tools>=0.18:../../devel/gettext-tools
 
 USE_CMAKE=     yes
 USE_LANGUAGES= c c++11
-#USE_LIBTOOL=  yes
 USE_TOOLS+=    automake bison gmake perl:build pkg-config msgfmt
 
-GCC_REQD+=     5.0
+GCC_REQD+=     6
 
 # Using ld.gold subverts Pkgsrc wrappers, and this package also crashes buggy
 # versions of ld.gold.
@@ -43,97 +41,29 @@ CMAKE_ARGS+=                -DUSE_LIBHYPHEN=OFF
 
 REPLACE_PERL+= Source/JavaScriptCore/create_hash_table
 REPLACE_PERL+= Source/WebCore/bindings/scripts/*.pl
-REPLACE_PERL+= Source/WebCore/bindings/scripts/InFilesCompiler.pm
-REPLACE_PERL+= Source/WebCore/bindings/scripts/InFilesParser.pm
+REPLACE_PERL+= Source/WebCore/bindings/scripts/*.pm
 REPLACE_PERL+= Source/WebCore/css/*.pl
 REPLACE_PERL+= Source/WebCore/dom/*.pl
 REPLACE_PERL+= Source/WebCore/make-hash-tools.pl
 
-REPLACE_PYTHON+=       Source/JavaScriptCore/Scripts/UpdateContents.py
-REPLACE_PYTHON+=       Source/JavaScriptCore/Scripts/builtins/builtins_generate_combined_header.py
-REPLACE_PYTHON+=       Source/JavaScriptCore/Scripts/builtins/builtins_generate_combined_implementation.py
-REPLACE_PYTHON+=       Source/JavaScriptCore/Scripts/builtins/builtins_generate_internals_wrapper_header.py
-REPLACE_PYTHON+=       Source/JavaScriptCore/Scripts/builtins/builtins_generate_internals_wrapper_implementation.py
-REPLACE_PYTHON+=       Source/JavaScriptCore/Scripts/builtins/builtins_generate_separate_header.py
-REPLACE_PYTHON+=       Source/JavaScriptCore/Scripts/builtins/builtins_generate_separate_implementation.py
-REPLACE_PYTHON+=       Source/JavaScriptCore/Scripts/builtins/builtins_generate_wrapper_header.py
-REPLACE_PYTHON+=       Source/JavaScriptCore/Scripts/builtins/builtins_generate_wrapper_implementation.py
-REPLACE_PYTHON+=       Source/JavaScriptCore/Scripts/builtins/builtins_generator.py
-REPLACE_PYTHON+=       Source/JavaScriptCore/Scripts/builtins/builtins_model.py
-REPLACE_PYTHON+=       Source/JavaScriptCore/Scripts/builtins/builtins_templates.py
-REPLACE_PYTHON+=       Source/JavaScriptCore/Scripts/cssmin.py
-REPLACE_PYTHON+=       Source/JavaScriptCore/Scripts/generate-combined-inspector-json.py
-REPLACE_PYTHON+=       Source/JavaScriptCore/Scripts/generate-js-builtins.py
-REPLACE_PYTHON+=       Source/JavaScriptCore/Scripts/generateYarrUnicodePropertyTables.py
-REPLACE_PYTHON+=       Source/JavaScriptCore/Scripts/hasher.py
-REPLACE_PYTHON+=       Source/JavaScriptCore/Scripts/inline-and-minify-stylesheets-and-scripts.py
-REPLACE_PYTHON+=       Source/JavaScriptCore/Scripts/lazywriter.py
-REPLACE_PYTHON+=       Source/JavaScriptCore/Scripts/make-js-file-arrays.py
+REPLACE_PYTHON+=       Source/JavaScriptCore/Scripts/*.py
+REPLACE_PYTHON+=       Source/JavaScriptCore/Scripts/builtins/*.py
 REPLACE_PYTHON+=       Source/JavaScriptCore/generate-bytecode-files
-REPLACE_PYTHON+=       Source/JavaScriptCore/inspector/scripts/codegen/cpp_generator.py
-REPLACE_PYTHON+=       Source/JavaScriptCore/inspector/scripts/codegen/cpp_generator_templates.py
-REPLACE_PYTHON+=       Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_alternate_backend_dispatcher_header.py
-REPLACE_PYTHON+=       Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_backend_dispatcher_header.py
-REPLACE_PYTHON+=       Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_backend_dispatcher_implementation.py
-REPLACE_PYTHON+=       Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_frontend_dispatcher_header.py
-REPLACE_PYTHON+=       Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_frontend_dispatcher_implementation.py
-REPLACE_PYTHON+=       Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_protocol_types_header.py
-REPLACE_PYTHON+=       Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_protocol_types_implementation.py
-REPLACE_PYTHON+=       Source/JavaScriptCore/inspector/scripts/codegen/generate_js_backend_commands.py
-REPLACE_PYTHON+=       Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_backend_dispatcher_header.py
-REPLACE_PYTHON+=       Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_backend_dispatcher_implementation.py
-REPLACE_PYTHON+=       Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_configuration_header.py
-REPLACE_PYTHON+=       Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_configuration_implementation.py
-REPLACE_PYTHON+=       Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_frontend_dispatcher_implementation.py
-REPLACE_PYTHON+=       Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_header.py
-REPLACE_PYTHON+=       Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_internal_header.py
-REPLACE_PYTHON+=       Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_protocol_type_conversions_header.py
-REPLACE_PYTHON+=       Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_protocol_type_conversions_implementation.py
-REPLACE_PYTHON+=       Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_protocol_types_implementation.py
-REPLACE_PYTHON+=       Source/JavaScriptCore/inspector/scripts/codegen/generator.py
-REPLACE_PYTHON+=       Source/JavaScriptCore/inspector/scripts/codegen/generator_templates.py
-REPLACE_PYTHON+=       Source/JavaScriptCore/inspector/scripts/codegen/models.py
-REPLACE_PYTHON+=       Source/JavaScriptCore/inspector/scripts/codegen/objc_generator.py
-REPLACE_PYTHON+=       Source/JavaScriptCore/inspector/scripts/codegen/objc_generator_templates.py
-REPLACE_PYTHON+=       Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
-REPLACE_PYTHON+=       Source/JavaScriptCore/wasm/generateWasm.py
-REPLACE_PYTHON+=       Source/JavaScriptCore/wasm/generateWasmB3IRGeneratorInlinesHeader.py
-REPLACE_PYTHON+=       Source/JavaScriptCore/wasm/generateWasmOpsHeader.py
-REPLACE_PYTHON+=       Source/JavaScriptCore/wasm/generateWasmValidateInlinesHeader.py
+REPLACE_PYTHON+=       Source/JavaScriptCore/inspector/scripts/*.py
+REPLACE_PYTHON+=       Source/JavaScriptCore/inspector/scripts/codegen/*.py
+REPLACE_PYTHON+=       Source/JavaScriptCore/wasm/*.py
 REPLACE_PYTHON+=       Source/JavaScriptCore/yarr/create_regex_tables
 REPLACE_PYTHON+=       Source/JavaScriptCore/yarr/generateYarrCanonicalizeUnicode
-REPLACE_PYTHON+=       Source/ThirdParty/gtest/run_tests.py
-REPLACE_PYTHON+=       Source/ThirdParty/gtest/scripts/fuse_gtest_files.py
-REPLACE_PYTHON+=       Source/ThirdParty/gtest/scripts/gen_gtest_pred_impl.py
-REPLACE_PYTHON+=       Source/ThirdParty/gtest/scripts/pump.py
-REPLACE_PYTHON+=       Source/ThirdParty/gtest/scripts/upload.py
-REPLACE_PYTHON+=       Source/ThirdParty/gtest/scripts/upload_gtest.py
-REPLACE_PYTHON+=       Source/ThirdParty/gtest/test/gtest_break_on_failure_unittest.py
-REPLACE_PYTHON+=       Source/ThirdParty/gtest/test/gtest_color_test.py
-REPLACE_PYTHON+=       Source/ThirdParty/gtest/test/gtest_env_var_test.py
-REPLACE_PYTHON+=       Source/ThirdParty/gtest/test/gtest_filter_unittest.py
-REPLACE_PYTHON+=       Source/ThirdParty/gtest/test/gtest_help_test.py
-REPLACE_PYTHON+=       Source/ThirdParty/gtest/test/gtest_list_tests_unittest.py
-REPLACE_PYTHON+=       Source/ThirdParty/gtest/test/gtest_nc_test.py
-REPLACE_PYTHON+=       Source/ThirdParty/gtest/test/gtest_output_test.py
-REPLACE_PYTHON+=       Source/ThirdParty/gtest/test/gtest_shuffle_test.py
-REPLACE_PYTHON+=       Source/ThirdParty/gtest/test/gtest_test_utils.py
-REPLACE_PYTHON+=       Source/ThirdParty/gtest/test/gtest_throw_on_failure_test.py
-REPLACE_PYTHON+=       Source/ThirdParty/gtest/test/gtest_uninitialized_test.py
-REPLACE_PYTHON+=       Source/ThirdParty/gtest/test/gtest_xml_outfiles_test.py
-REPLACE_PYTHON+=       Source/ThirdParty/gtest/test/gtest_xml_output_unittest.py
-REPLACE_PYTHON+=       Source/ThirdParty/gtest/test/gtest_xml_test_utils.py
-REPLACE_PYTHON+=       Source/ThirdParty/gtest/test/run_tests_util_test.py
-REPLACE_PYTHON+=       Source/ThirdParty/gtest/xcode/Scripts/versiongenerate.py
-REPLACE_PYTHON+=       Source/WebCore/PAL/AVFoundationSupport.py
-REPLACE_PYTHON+=       Source/WebCore/css/makeSelectorPseudoClassAndCompatibilityElementMap.py
-REPLACE_PYTHON+=       Source/WebCore/css/makeSelectorPseudoElementsMap.py
+REPLACE_PYTHON+=       Source/ThirdParty/gtest/*.py
+REPLACE_PYTHON+=       Source/ThirdParty/gtest/scripts/*.py
+REPLACE_PYTHON+=       Source/ThirdParty/gtest/test/*.py
+REPLACE_PYTHON+=       Source/ThirdParty/gtest/xcode/Scripts/*.py
+REPLACE_PYTHON+=       Source/WebCore/PAL/*.py
+REPLACE_PYTHON+=       Source/WebCore/css/*.py
 REPLACE_PYTHON+=       Source/WebCore/html/parser/create-html-entity-table
 REPLACE_PYTHON+=       Source/WebCore/platform/network/create-http-header-name-table
-REPLACE_PYTHON+=       Source/WebKit/Scripts/generate-message-receiver.py
-REPLACE_PYTHON+=       Source/WebKit/Scripts/generate-messages-header.py
-REPLACE_PYTHON+=       Tools/glib/common.py
-REPLACE_PYTHON+=       Tools/glib/generate-inspector-gresource-manifest.py
+REPLACE_PYTHON+=       Source/WebKit/Scripts/*.py
+REPLACE_PYTHON+=       Tools/glib/*.py
 REPLACE_PYTHON+=       Tools/gtk/*.py
 REPLACE_PYTHON+=       Tools/gtk/generate-gtkdoc
 
@@ -144,11 +74,11 @@ SUBST_STAGE.python=        pre-configure
 SUBST_MESSAGE.python=  Fixing path to python binary.
 
 .include "../../lang/ruby/rubyversion.mk"
-BUILD_DEPENDS+=        ${RUBY_BASE}>=${RUBY_VERSION}:${RUBY_SRCDIR}
+TOOL_DEPENDS+= ${RUBY_BASE}>=${RUBY_VERSION}:${RUBY_SRCDIR}
 CMAKE_ARGS+=   -DRUBY_EXECUTABLE=${RUBY}
 
 PYTHON_FOR_BUILD_ONLY= yes
-PYTHON_VERSIONS_INCOMPATIBLE=  34 35 36 37 # not yet ported as of 1.10.2
+PYTHON_VERSIONS_INCOMPATIBLE=  34 35 36 37 # not yet ported as of 2.22.2
 .include "../../lang/python/application.mk"
 CMAKE_ARGS+=   -DPYTHON_EXECUTABLE=${PYTHONBIN}
 
@@ -162,6 +92,9 @@ CXXFLAGS+=   -Wno-c++11-narrowing
 # This does not disable optimisations, merely avoids #error if there are none.
 CFLAGS+=       -DRELEASE_WITHOUT_OPTIMIZATIONS
 
+NOT_PAX_MPROTECT_SAFE+=        libexec/webkit2gtk-4.0/WebKitWebProcess
+NOT_PAX_MPROTECT_SAFE+=        libexec/webkit2gtk-4.0/jsc
+
 .include "options.mk"
 
 BUILDLINK_API_DEPENDS.glib2+= glib2>=2.32.1

Index: pkgsrc/www/webkit-gtk/PLIST
diff -u pkgsrc/www/webkit-gtk/PLIST:1.41 pkgsrc/www/webkit-gtk/PLIST:1.42
--- pkgsrc/www/webkit-gtk/PLIST:1.41    Sun Aug 19 19:59:12 2018
+++ pkgsrc/www/webkit-gtk/PLIST Wed Oct 24 18:31:07 2018
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.41 2018/08/19 19:59:12 wiz Exp $
+@comment $NetBSD: PLIST,v 1.42 2018/10/24 18:31:07 leot Exp $
 bin/WebKitWebDriver
 include/webkitgtk-4.0/JavaScriptCore/JSBase.h
 include/webkitgtk-4.0/JavaScriptCore/JSContextRef.h
@@ -8,6 +8,16 @@ include/webkitgtk-4.0/JavaScriptCore/JST
 include/webkitgtk-4.0/JavaScriptCore/JSValueRef.h
 include/webkitgtk-4.0/JavaScriptCore/JavaScript.h
 include/webkitgtk-4.0/JavaScriptCore/WebKitAvailability.h
+include/webkitgtk-4.0/jsc/JSCAutocleanups.h
+include/webkitgtk-4.0/jsc/JSCClass.h
+include/webkitgtk-4.0/jsc/JSCContext.h
+include/webkitgtk-4.0/jsc/JSCDefines.h
+include/webkitgtk-4.0/jsc/JSCException.h
+include/webkitgtk-4.0/jsc/JSCValue.h
+include/webkitgtk-4.0/jsc/JSCVersion.h
+include/webkitgtk-4.0/jsc/JSCVirtualMachine.h
+include/webkitgtk-4.0/jsc/JSCWeakValue.h
+include/webkitgtk-4.0/jsc/jsc.h
 include/webkitgtk-4.0/webkit2/WebKitApplicationInfo.h
 include/webkitgtk-4.0/webkit2/WebKitAuthenticationRequest.h
 include/webkitgtk-4.0/webkit2/WebKitAutocleanups.h
@@ -198,10 +208,10 @@ ${PLIST.introspection}lib/girepository-1
 ${PLIST.introspection}lib/girepository-1.0/WebKit2WebExtension-4.0.typelib
 lib/libjavascriptcoregtk-4.0.so
 lib/libjavascriptcoregtk-4.0.so.18
-lib/libjavascriptcoregtk-4.0.so.18.7.13
+lib/libjavascriptcoregtk-4.0.so.18.11.3
 lib/libwebkit2gtk-4.0.so
 lib/libwebkit2gtk-4.0.so.37
-lib/libwebkit2gtk-4.0.so.37.28.5
+lib/libwebkit2gtk-4.0.so.37.33.3
 lib/pkgconfig/javascriptcoregtk-4.0.pc
 lib/pkgconfig/webkit2gtk-4.0.pc
 lib/pkgconfig/webkit2gtk-web-extension-4.0.pc

Index: pkgsrc/www/webkit-gtk/buildlink3.mk
diff -u pkgsrc/www/webkit-gtk/buildlink3.mk:1.66 pkgsrc/www/webkit-gtk/buildlink3.mk:1.67
--- pkgsrc/www/webkit-gtk/buildlink3.mk:1.66    Fri Jul 20 03:33:58 2018
+++ pkgsrc/www/webkit-gtk/buildlink3.mk Wed Oct 24 18:31:07 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.66 2018/07/20 03:33:58 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.67 2018/10/24 18:31:07 leot Exp $
 
 BUILDLINK_TREE+=       webkit-gtk
 
@@ -6,11 +6,11 @@ BUILDLINK_TREE+=      webkit-gtk
 WEBKIT_GTK_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.webkit-gtk+=     webkit-gtk>=2.8
-BUILDLINK_ABI_DEPENDS.webkit-gtk?=     webkit-gtk>=2.20.3nb1
+BUILDLINK_ABI_DEPENDS.webkit-gtk?=     webkit-gtk>=2.22.2
 BUILDLINK_PKGSRCDIR.webkit-gtk?=       ../../www/webkit-gtk
 
 # This is necessary to match the package requirement.
-GCC_REQD+=     5.0
+GCC_REQD+=     6
 
 pkgbase := webkit-gtk
 .include "../../mk/pkg-build-options.mk"

Index: pkgsrc/www/webkit-gtk/distinfo
diff -u pkgsrc/www/webkit-gtk/distinfo:1.106 pkgsrc/www/webkit-gtk/distinfo:1.107
--- pkgsrc/www/webkit-gtk/distinfo:1.106        Mon Oct  1 21:45:31 2018
+++ pkgsrc/www/webkit-gtk/distinfo      Wed Oct 24 18:31:07 2018
@@ -1,26 +1,28 @@
-$NetBSD: distinfo,v 1.106 2018/10/01 21:45:31 jperkin Exp $
+$NetBSD: distinfo,v 1.107 2018/10/24 18:31:07 leot Exp $
 
-SHA1 (webkitgtk-2.20.5.tar.xz) = 63bff8f9b3811e8ee294c0c1af6a7e2e453f0916
-RMD160 (webkitgtk-2.20.5.tar.xz) = 6a4cda986d2a4c4762b0daf0ff2007cd95b72b79
-SHA512 (webkitgtk-2.20.5.tar.xz) = d92fd079ec2826b2880ae5b2d90795ee3071a331bd7a576230b77b9f67a829ab27f09a9b0241a780f612f4f78ea5cc849e4b3d09285d4903eb600a7a7729c1e7
-Size (webkitgtk-2.20.5.tar.xz) = 16625200 bytes
-SHA1 (patch-CMakeLists.txt) = 684aad9e5bcc25b1afc128a1b5df00f34f1208e9
-SHA1 (patch-Source_JavaScriptCore_assembler_ARMAssembler.h) = 99e46f9d9b26a8d9ba6b29c66d7ce5326c4ffeb6
-SHA1 (patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp) = f78e6150ed8901b3fe046b2ef182f50f1c7500a4
+SHA1 (webkitgtk-2.22.2.tar.xz) = ff0c40e81e240aa0743f7e6483f175defebd1417
+RMD160 (webkitgtk-2.22.2.tar.xz) = f8f16a72800debdf9b74a03151299f16f69fcc1c
+SHA512 (webkitgtk-2.22.2.tar.xz) = 0bb885726872f128a0e0d71cbc75ba076e5c0c928c40e71e030c87444a7068568c568587514407d6549c27d0bfe121dc33f96f0c516d2ae1c6801e005ad52756
+Size (webkitgtk-2.22.2.tar.xz) = 16769120 bytes
+SHA1 (patch-CMakeLists.txt) = 2f05f3682bda601c99544dafd8e79bd622dfc5a5
+SHA1 (patch-Source_JavaScriptCore_assembler_ARMAssembler.h) = bae08310572c2e23c69cbf6aa9760a67345dcfe3
+SHA1 (patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp) = ab75ef8714e5071fcd094735717a2f5d0321c747
 SHA1 (patch-Source_JavaScriptCore_heap_MarkedSpace.cpp) = e6a23d5ef22bddd0a9606fb0e472960e4cf5673e
-SHA1 (patch-Source_JavaScriptCore_jit_ExecutableAllocator.cpp) = 2f20d6aa8f1ec4122bee9f2f95b736ee4496812f
+SHA1 (patch-Source_JavaScriptCore_jit_ExecutableAllocator.cpp) = 36d29a5db03c2413ae93224ac391f3ff248983e8
+SHA1 (patch-Source_JavaScriptCore_runtime_MachineContext.h) = 23bc86a389f8009ec829c3ee0fe3effe3f20b012
 SHA1 (patch-Source_ThirdParty_gtest_include_gtest_internal_gtest-port.h) = f1eee7f9d3012edee1915234c837cff820f97092
-SHA1 (patch-Source_WTF_wtf_Platform.h) = 1697dc48555a4b085fc3e35633776ba3ffa16e15
-SHA1 (patch-Source_WTF_wtf_StackBounds.cpp) = 0b35ab065e4cccbb63199cd8a9add0d5106c6150
-SHA1 (patch-Source_WTF_wtf_ThreadSpecific.h) = 38a85e10a72fe38d286a2ce747e090a2955b8791
+SHA1 (patch-Source_WTF_wtf_Platform.h) = 5cf36cf7cca8a39d75a788ca988758927b421d95
+SHA1 (patch-Source_WTF_wtf_StackBounds.cpp) = 22a71daac8443f079ad8bcc7285cfd7319c972b3
+SHA1 (patch-Source_WebCore_inspector_InspectorFrontendHost.cpp) = daf6351a1a0b5a49592a2bb6db0d54620c7b09e3
 SHA1 (patch-Source_WebCore_platform_FileSystem.cpp) = adef1a42c4e210f0a3dcb82807e2d2039684a0ec
 SHA1 (patch-Source_WebCore_platform_graphics_filters_FEMorphology.cpp) = 16b36d2d91fd7f43156b9ee09bcafd19602ebbd9
 SHA1 (patch-Source_WebCore_rendering_shapes_RasterShape.cpp) = 551e47698dee50d097b11e3218f13bb3447edfea
 SHA1 (patch-Source_WebKit_CMakeLists.txt) = 228cc4734de3b08a3877ac839b1ffa2fbf2d3aa8
-SHA1 (patch-Source_WebKit_NetworkProcess_cache_NetworkCacheFileSystem.cpp) = 6a8c147b0606a55c18f4bef46a3bbf2932349c58
-SHA1 (patch-Source_WebKit_PlatformGTK.cmake) = 67f71d609c7c7459447a9be8a5a7ad8455f88a33
+SHA1 (patch-Source_WebKit_NetworkProcess_cache_NetworkCacheFileSystem.cpp) = 810dfbd5be6a6a2fd2c70795ed257d973fc3e4fe
+SHA1 (patch-Source_WebKit_PlatformGTK.cmake) = 91a7e63ebeac06cca21547aa7025a55a4d174b6d
 SHA1 (patch-Source_WebKit_Platform_IPC_unix_ConnectionUnix.cpp) = 9c58253868e06b3dd3cac936651ba7e6a1437fc6
 SHA1 (patch-Source_WebKit_Platform_classifier_ResourceLoadStatisticsClassifier.cpp) = 920376ec8697780637f376b2fff312b7e214a7f6
-SHA1 (patch-Source_bmalloc_bmalloc_VMAllocate.h) = f5235df843849f8e1dd8fceaa015bc91785d8b3b
+SHA1 (patch-Source_bmalloc_bmalloc_BPlatform.h) = ad6c6f93732a4bb355ac2b65bff8968aae0460ba
+SHA1 (patch-Source_bmalloc_bmalloc_VMAllocate.h) = 7bbf23f5ac92173dcce9743c5a115bdf0bf7c0ea
 SHA1 (patch-Source_cmake_OptionsCommon.cmake) = 03b72552414e7114bfa7ddc2d68fd97009a5ff7d
-SHA1 (patch-aj) = cd9a280c3bbab82c1a7aeb62a27ee6eb96c67ec2
+SHA1 (patch-aj) = ec60907df4336b755d1d1924c026b3041805f431

Index: pkgsrc/www/webkit-gtk/options.mk
diff -u pkgsrc/www/webkit-gtk/options.mk:1.12 pkgsrc/www/webkit-gtk/options.mk:1.13
--- pkgsrc/www/webkit-gtk/options.mk:1.12       Mon Apr  9 08:33:48 2018
+++ pkgsrc/www/webkit-gtk/options.mk    Wed Oct 24 18:31:07 2018
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.12 2018/04/09 08:33:48 wiz Exp $
+# $NetBSD: options.mk,v 1.13 2018/10/24 18:31:07 leot Exp $
 #
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.webkit-gtk
@@ -9,14 +9,19 @@ PLIST_VARS=   introspection
 
 .include "../../mk/bsd.prefs.mk"
 
-# XXX JIT produces invalid code
-# it's also entirely unsupported on powerpc and sparc
-.if empty(MACHINE_PLATFORM:MNetBSD-*-i386) \
- && empty(MACHINE_PLATFORM:MNetBSD-*-x86_64) \
- && empty(MACHINE_PLATFORM:MNetBSD-*-powerpc) \
- && empty(MACHINE_PLATFORM:MNetBSD-*-sparc64) \
- && empty(MACHINE_PLATFORM:MNetBSD-*-sparc) \
- && empty(MACHINE_PLATFORM:MSunOS-*)
+#
+# Platforms that support the webkit-jit option
+#
+WEBKIT_JIT_MACHINE_PLATFORMS+= Darwin-*-*
+WEBKIT_JIT_MACHINE_PLATFORMS+= DragonFly-*-*
+WEBKIT_JIT_MACHINE_PLATFORMS+= FreeBSD-*-x86_64 FreeBSD-*-i386 FreeBSD-*-arm*
+WEBKIT_JIT_MACHINE_PLATFORMS+= FreeBSD-*-aarch64 FreeBSD-*-mips*
+WEBKIT_JIT_MACHINE_PLATFORMS+= Linux-*-x86_64 Linux-*-i386 Linux-*-arm*
+WEBKIT_JIT_MACHINE_PLATFORMS+= Linux-*-aarch64 Linux-*-mips*
+WEBKIT_JIT_MACHINE_PLATFORMS+= NetBSD-*-x86_64 NetBSD-*-i386 NetBSD-*-arm*
+WEBKIT_JIT_MACHINE_PLATFORMS+= NetBSD-*-aarch64 NetBSD-*-mips*
+
+.if !empty(WEBKIT_JIT_MACHINE_PLATFORMS:@.PLAT.@${MACHINE_PLATFORM:M${.PLAT.}}@)
 PKG_SUGGESTED_OPTIONS+=        webkit-jit
 .endif
 

Index: pkgsrc/www/webkit-gtk/patches/patch-CMakeLists.txt
diff -u pkgsrc/www/webkit-gtk/patches/patch-CMakeLists.txt:1.4 pkgsrc/www/webkit-gtk/patches/patch-CMakeLists.txt:1.5
--- pkgsrc/www/webkit-gtk/patches/patch-CMakeLists.txt:1.4      Sat Apr 28 19:10:13 2018
+++ pkgsrc/www/webkit-gtk/patches/patch-CMakeLists.txt  Wed Oct 24 18:31:07 2018
@@ -1,10 +1,9 @@
-$NetBSD: patch-CMakeLists.txt,v 1.4 2018/04/28 19:10:13 wiz Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.5 2018/10/24 18:31:07 leot Exp $
 
 - Fix support for arm
-- Fix support for ppc and add support for sparc64.
-  From FreeBSD and OpenBSD ports.
+- Fix support for ppc, from FreeBSD.
 
---- CMakeLists.txt.orig        2018-02-19 07:44:43.000000000 +0000
+--- CMakeLists.txt.orig        2018-09-06 11:51:31.000000000 +0000
 +++ CMakeLists.txt
 @@ -85,6 +85,8 @@ else ()
  endif ()
@@ -14,19 +13,16 @@ $NetBSD: patch-CMakeLists.txt,v 1.4 2018
 +    set(WTF_CPU_ARM 1)
  elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^aarch64")
      set(WTF_CPU_ARM64 1)
- elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^mips")
-@@ -93,11 +95,13 @@ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR
+ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^mips64")
+@@ -95,9 +97,9 @@ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR
      set(WTF_CPU_X86_64 1)
  elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(i[3-6]86|x86)")
      set(WTF_CPU_X86 1)
 -elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "ppc")
 +elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(ppc|powerpc)")
      set(WTF_CPU_PPC 1)
- elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64")
+-elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64")
++elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(ppc64|powerpc64)")
      set(WTF_CPU_PPC64 1)
  elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64le")
-+elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "sparc64")
-+    set(WTF_CPU_SPARC64 1)
      set(WTF_CPU_PPC64LE 1)
- else ()
-     set(WTF_CPU_UNKNOWN 1)

Index: pkgsrc/www/webkit-gtk/patches/patch-Source_JavaScriptCore_assembler_ARMAssembler.h
diff -u pkgsrc/www/webkit-gtk/patches/patch-Source_JavaScriptCore_assembler_ARMAssembler.h:1.6 pkgsrc/www/webkit-gtk/patches/patch-Source_JavaScriptCore_assembler_ARMAssembler.h:1.7
--- pkgsrc/www/webkit-gtk/patches/patch-Source_JavaScriptCore_assembler_ARMAssembler.h:1.6      Thu Jan 21 13:42:33 2016
+++ pkgsrc/www/webkit-gtk/patches/patch-Source_JavaScriptCore_assembler_ARMAssembler.h  Wed Oct 24 18:31:07 2018
@@ -1,4 +1,6 @@
-$NetBSD: patch-Source_JavaScriptCore_assembler_ARMAssembler.h,v 1.6 2016/01/21 13:42:33 leot Exp $
+$NetBSD: patch-Source_JavaScriptCore_assembler_ARMAssembler.h,v 1.7 2018/10/24 18:31:07 leot Exp $
+
+Add support for NetBSD.
 
 --- Source/JavaScriptCore/assembler/ARMAssembler.h.orig        2016-01-20 12:12:59.000000000 +0000
 +++ Source/JavaScriptCore/assembler/ARMAssembler.h
@@ -6,7 +8,7 @@ $NetBSD: patch-Source_JavaScriptCore_ass
  
  #if ENABLE(ASSEMBLER) && CPU(ARM_TRADITIONAL)
  
-+#if defined(__NetBSD__)
++#if OS(NETBSD)
 +#include <sys/types.h>
 +#include <machine/sysarch.h>
 +#endif
@@ -18,7 +20,7 @@ $NetBSD: patch-Source_JavaScriptCore_ass
                  linuxPageFlush(current, current + page);
  
              linuxPageFlush(current, end);
-+#elif defined(__NetBSD__)
++#elif OS(NETBSD)
 +            struct arm_sync_icache_args arg;
 +            arg.addr = reinterpret_cast<uintptr_t>(code);
 +            arg.len = size;
Index: pkgsrc/www/webkit-gtk/patches/patch-aj
diff -u pkgsrc/www/webkit-gtk/patches/patch-aj:1.6 pkgsrc/www/webkit-gtk/patches/patch-aj:1.7
--- pkgsrc/www/webkit-gtk/patches/patch-aj:1.6  Mon Apr  9 08:33:48 2018
+++ pkgsrc/www/webkit-gtk/patches/patch-aj      Wed Oct 24 18:31:08 2018
@@ -1,4 +1,6 @@
-$NetBSD: patch-aj,v 1.6 2018/04/09 08:33:48 wiz Exp $
+$NetBSD: patch-aj,v 1.7 2018/10/24 18:31:08 leot Exp $
+
+Add support for NetBSD, OpenBSD and Solaris.
 
 --- Source/WTF/wtf/InlineASM.h.orig    2017-02-20 16:20:15.000000000 +0000
 +++ Source/WTF/wtf/InlineASM.h
@@ -7,7 +9,7 @@ $NetBSD: patch-aj,v 1.6 2018/04/09 08:33
  #endif
  
 -#if (OS(LINUX) || OS(FREEBSD)) && CPU(X86_64)
-+#if (OS(LINUX) || OS(FREEBSD) || OS(NETBSD) || OS(OPENBSD) || OS(SOLARIS)) && CPU(X86_64) || (OS(SOLARIS) && CPU(X86)) 
++#if ((OS(LINUX) || OS(FREEBSD) || OS(NETBSD) || OS(OPENBSD) || OS(SOLARIS)) && CPU(X86_64)) || (OS(SOLARIS) && CPU(X86)) 
  #define GLOBAL_REFERENCE(name) #name "@plt"
  #elif CPU(X86) && COMPILER(MINGW)
  #define GLOBAL_REFERENCE(name) "@" #name "@4"

Index: pkgsrc/www/webkit-gtk/patches/patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp
diff -u pkgsrc/www/webkit-gtk/patches/patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp:1.5 pkgsrc/www/webkit-gtk/patches/patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp:1.6
--- pkgsrc/www/webkit-gtk/patches/patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp:1.5       Thu Jan 21 13:42:33 2016
+++ pkgsrc/www/webkit-gtk/patches/patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp   Wed Oct 24 18:31:07 2018
@@ -1,4 +1,6 @@
-$NetBSD: patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp,v 1.5 2016/01/21 13:42:33 leot Exp $
+$NetBSD: patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp,v 1.6 2018/10/24 18:31:07 leot Exp $
+
+Add support for NetBSD.
 
 --- Source/JavaScriptCore/assembler/MacroAssemblerARM.cpp.orig 2016-01-20 12:12:59.000000000 +0000
 +++ Source/JavaScriptCore/assembler/MacroAssemblerARM.cpp

Index: pkgsrc/www/webkit-gtk/patches/patch-Source_JavaScriptCore_jit_ExecutableAllocator.cpp
diff -u pkgsrc/www/webkit-gtk/patches/patch-Source_JavaScriptCore_jit_ExecutableAllocator.cpp:1.1 pkgsrc/www/webkit-gtk/patches/patch-Source_JavaScriptCore_jit_ExecutableAllocator.cpp:1.2
--- pkgsrc/www/webkit-gtk/patches/patch-Source_JavaScriptCore_jit_ExecutableAllocator.cpp:1.1   Mon Apr  9 08:33:48 2018
+++ pkgsrc/www/webkit-gtk/patches/patch-Source_JavaScriptCore_jit_ExecutableAllocator.cpp       Wed Oct 24 18:31:07 2018
@@ -1,10 +1,10 @@
-$NetBSD: patch-Source_JavaScriptCore_jit_ExecutableAllocator.cpp,v 1.1 2018/04/09 08:33:48 wiz Exp $
+$NetBSD: patch-Source_JavaScriptCore_jit_ExecutableAllocator.cpp,v 1.2 2018/10/24 18:31:07 leot Exp $
 
-Avoid to (pre)allocate 1GB of memory:
+Avoid to (pre)allocate 1GB of memory on OpenBSD:
 
  <https://bugs.webkit.org/show_bug.cgi?id=61137>
 
-From FreeBSD and OpenBSD ports.
+From OpenBSD ports.
 
 --- Source/JavaScriptCore/jit/ExecutableAllocator.cpp.orig     2017-08-09 09:13:42.000000000 +0000
 +++ Source/JavaScriptCore/jit/ExecutableAllocator.cpp
@@ -13,7 +13,7 @@ From FreeBSD and OpenBSD ports.
  #elif CPU(ARM64)
  static const size_t fixedExecutableMemoryPoolSize = 64 * 1024 * 1024;
 -#elif CPU(X86_64)
-+#elif CPU(X86_64) && !defined(__OpenBSD__) && !defined(__FreeBSD__) && !defined(__NetBSD__)
++#elif CPU(X86_64) && !OS(OPENBSD)
  static const size_t fixedExecutableMemoryPoolSize = 1024 * 1024 * 1024;
  #else
  static const size_t fixedExecutableMemoryPoolSize = 32 * 1024 * 1024;
Index: pkgsrc/www/webkit-gtk/patches/patch-Source_WTF_wtf_StackBounds.cpp
diff -u pkgsrc/www/webkit-gtk/patches/patch-Source_WTF_wtf_StackBounds.cpp:1.1 pkgsrc/www/webkit-gtk/patches/patch-Source_WTF_wtf_StackBounds.cpp:1.2
--- pkgsrc/www/webkit-gtk/patches/patch-Source_WTF_wtf_StackBounds.cpp:1.1      Wed May 16 18:55:45 2018
+++ pkgsrc/www/webkit-gtk/patches/patch-Source_WTF_wtf_StackBounds.cpp  Wed Oct 24 18:31:07 2018
@@ -1,4 +1,4 @@
-$NetBSD: patch-Source_WTF_wtf_StackBounds.cpp,v 1.1 2018/05/16 18:55:45 jperkin Exp $
+$NetBSD: patch-Source_WTF_wtf_StackBounds.cpp,v 1.2 2018/10/24 18:31:07 leot Exp $
 
 SunOS does not have pthread_getattr_np.
 
@@ -8,7 +8,7 @@ SunOS does not have pthread_getattr_np.
  #if HAVE(PTHREAD_NP_H) || OS(NETBSD)
      // e.g. on FreeBSD 5.4, neundorf%kde.org@localhost
      pthread_attr_get_np(thread, &sattr);
-+#elif defined(__sun)
++#elif OS(SOLARIS)
  #else
      // FIXME: this function is non-portable; other POSIX systems may have different np alternatives
      pthread_getattr_np(thread, &sattr);
Index: pkgsrc/www/webkit-gtk/patches/patch-Source_WebKit_NetworkProcess_cache_NetworkCacheFileSystem.cpp
diff -u pkgsrc/www/webkit-gtk/patches/patch-Source_WebKit_NetworkProcess_cache_NetworkCacheFileSystem.cpp:1.1 
pkgsrc/www/webkit-gtk/patches/patch-Source_WebKit_NetworkProcess_cache_NetworkCacheFileSystem.cpp:1.2
--- pkgsrc/www/webkit-gtk/patches/patch-Source_WebKit_NetworkProcess_cache_NetworkCacheFileSystem.cpp:1.1       Wed May 16 18:55:45 2018
+++ pkgsrc/www/webkit-gtk/patches/patch-Source_WebKit_NetworkProcess_cache_NetworkCacheFileSystem.cpp   Wed Oct 24 18:31:07 2018
@@ -1,13 +1,13 @@
-$NetBSD: patch-Source_WebKit_NetworkProcess_cache_NetworkCacheFileSystem.cpp,v 1.1 2018/05/16 18:55:45 jperkin Exp $
+$NetBSD: patch-Source_WebKit_NetworkProcess_cache_NetworkCacheFileSystem.cpp,v 1.2 2018/10/24 18:31:07 leot Exp $
 
 SunOS does not support DT_{DIR,REG}
 
---- Source/WebKit/NetworkProcess/cache/NetworkCacheFileSystem.cpp.orig 2018-02-19 07:45:32.000000000 +0000
+--- Source/WebKit/NetworkProcess/cache/NetworkCacheFileSystem.cpp.orig 2018-07-25 11:56:32.000000000 +0000
 +++ Source/WebKit/NetworkProcess/cache/NetworkCacheFileSystem.cpp
-@@ -50,6 +50,12 @@ namespace NetworkCache {
- 
+@@ -54,6 +54,12 @@ namespace NetworkCache {
  static DirectoryEntryType directoryEntryType(uint8_t dtype)
  {
+ #if !OS(WINDOWS)
 +#ifndef DT_DIR
 +#define DT_DIR        S_IFDIR
 +#endif
@@ -17,11 +17,11 @@ SunOS does not support DT_{DIR,REG}
      switch (dtype) {
      case DT_DIR:
          return DirectoryEntryType::Directory;
-@@ -63,12 +69,20 @@ static DirectoryEntryType directoryEntry
- 
+@@ -71,12 +77,20 @@ static DirectoryEntryType directoryEntry
  void traverseDirectory(const String& path, const Function<void (const String&, DirectoryEntryType)>& function)
  {
-+#ifdef __sun
+ #if !OS(WINDOWS)
++#if OS(SOLARIS)
 +    struct stat s;
 +#endif
      DIR* dir = opendir(WebCore::FileSystem::fileSystemRepresentation(path).data());
@@ -29,7 +29,7 @@ SunOS does not support DT_{DIR,REG}
          return;
      dirent* dp;
      while ((dp = readdir(dir))) {
-+#ifdef __sun
++#if OS(SOLARIS)
 +        stat(dp->d_name, &s);
 +        if (s.st_mode != S_IFDIR && s.st_mode != S_IFREG)
 +#else
@@ -38,15 +38,15 @@ SunOS does not support DT_{DIR,REG}
              continue;
          const char* name = dp->d_name;
          if (!strcmp(name, ".") || !strcmp(name, ".."))
-@@ -76,7 +90,11 @@ void traverseDirectory(const String& pat
+@@ -84,7 +98,11 @@ void traverseDirectory(const String& pat
          auto nameString = String::fromUTF8(name);
          if (nameString.isNull())
              continue;
-+#ifdef __sun
++#if OS(SOLARIS)
 +        function(nameString, directoryEntryType(s.st_mode));
 +#else
          function(nameString, directoryEntryType(dp->d_type));
 +#endif
      }
      closedir(dir);
- }
+ #else
Index: pkgsrc/www/webkit-gtk/patches/patch-Source_WebKit_PlatformGTK.cmake
diff -u pkgsrc/www/webkit-gtk/patches/patch-Source_WebKit_PlatformGTK.cmake:1.1 pkgsrc/www/webkit-gtk/patches/patch-Source_WebKit_PlatformGTK.cmake:1.2
--- pkgsrc/www/webkit-gtk/patches/patch-Source_WebKit_PlatformGTK.cmake:1.1     Wed May 16 18:55:45 2018
+++ pkgsrc/www/webkit-gtk/patches/patch-Source_WebKit_PlatformGTK.cmake Wed Oct 24 18:31:07 2018
@@ -1,12 +1,12 @@
-$NetBSD: patch-Source_WebKit_PlatformGTK.cmake,v 1.1 2018/05/16 18:55:45 jperkin Exp $
+$NetBSD: patch-Source_WebKit_PlatformGTK.cmake,v 1.2 2018/10/24 18:31:07 leot Exp $
 
 SunOS ld does not support --version-script.
 
---- Source/WebKit/PlatformGTK.cmake.orig       2018-04-10 07:33:13.000000000 +0000
+--- Source/WebKit/PlatformGTK.cmake.orig       2018-08-21 16:06:11.000000000 +0000
 +++ Source/WebKit/PlatformGTK.cmake
-@@ -24,7 +24,7 @@ add_definitions(-DLOCALEDIR="${CMAKE_INS
+@@ -22,7 +22,7 @@ add_definitions(-DPKGLIBEXECDIR="${LIBEX
+ add_definitions(-DLOCALEDIR="${CMAKE_INSTALL_FULL_LOCALEDIR}")
  add_definitions(-DLIBDIR="${LIB_INSTALL_DIR}")
- add_definitions(-DDATADIR="${CMAKE_INSTALL_FULL_DATADIR}")
  
 -if (NOT DEVELOPER_MODE AND NOT CMAKE_SYSTEM_NAME MATCHES "Darwin")
 +if (NOT DEVELOPER_MODE AND NOT CMAKE_SYSTEM_NAME MATCHES "Darwin" AND NOT CMAKE_SYSTEM_NAME MATCHES "SunOS")
Index: pkgsrc/www/webkit-gtk/patches/patch-Source_bmalloc_bmalloc_VMAllocate.h
diff -u pkgsrc/www/webkit-gtk/patches/patch-Source_bmalloc_bmalloc_VMAllocate.h:1.1 pkgsrc/www/webkit-gtk/patches/patch-Source_bmalloc_bmalloc_VMAllocate.h:1.2
--- pkgsrc/www/webkit-gtk/patches/patch-Source_bmalloc_bmalloc_VMAllocate.h:1.1 Wed May 16 18:55:45 2018
+++ pkgsrc/www/webkit-gtk/patches/patch-Source_bmalloc_bmalloc_VMAllocate.h     Wed Oct 24 18:31:08 2018
@@ -1,4 +1,4 @@
-$NetBSD: patch-Source_bmalloc_bmalloc_VMAllocate.h,v 1.1 2018/05/16 18:55:45 jperkin Exp $
+$NetBSD: patch-Source_bmalloc_bmalloc_VMAllocate.h,v 1.2 2018/10/24 18:31:08 leot Exp $
 
 Use posix_madvise on SunOS.
 
@@ -8,7 +8,7 @@ Use posix_madvise on SunOS.
      vmValidatePhysical(p, vmSize);
  #if BOS(DARWIN)
      SYSCALL(madvise(p, vmSize, MADV_FREE_REUSABLE));
-+#elif defined(__sun)
++#elif BOS(SOLARIS)
 +    SYSCALL(posix_madvise(p, vmSize, MADV_DONTNEED));
  #else
      SYSCALL(madvise(p, vmSize, MADV_DONTNEED));
@@ -17,7 +17,7 @@ Use posix_madvise on SunOS.
      vmValidatePhysical(p, vmSize);
  #if BOS(DARWIN)
      SYSCALL(madvise(p, vmSize, MADV_FREE_REUSE));
-+#elif defined(__sun)
++#elif BOS(SOLARIS)
 +    SYSCALL(posix_madvise(p, vmSize, MADV_NORMAL));
  #else
      SYSCALL(madvise(p, vmSize, MADV_NORMAL));

Index: pkgsrc/www/webkit-gtk/patches/patch-Source_WTF_wtf_Platform.h
diff -u pkgsrc/www/webkit-gtk/patches/patch-Source_WTF_wtf_Platform.h:1.11 pkgsrc/www/webkit-gtk/patches/patch-Source_WTF_wtf_Platform.h:1.12
--- pkgsrc/www/webkit-gtk/patches/patch-Source_WTF_wtf_Platform.h:1.11  Mon Oct  1 21:45:31 2018
+++ pkgsrc/www/webkit-gtk/patches/patch-Source_WTF_wtf_Platform.h       Wed Oct 24 18:31:07 2018
@@ -1,17 +1,73 @@
-$NetBSD: patch-Source_WTF_wtf_Platform.h,v 1.11 2018/10/01 21:45:31 jperkin Exp $
+$NetBSD: patch-Source_WTF_wtf_Platform.h,v 1.12 2018/10/24 18:31:07 leot Exp $
 
-Avoid flock() on SunOS, not supported on older platforms.
+- Add OS(SOLARIS) definition and add them to Unix systems.
+- Avoid flock() on SunOS, not supported on older platforms.
+- madvise(2) on {Free,Net,OpenBSD} support both MADV_DONTNEED and
+  MADV_FREE.
+- Add support for NetBSD.
 
---- Source/WTF/wtf/Platform.h.orig     2018-02-20 09:12:50.000000000 +0000
+--- Source/WTF/wtf/Platform.h.orig     2018-09-21 19:59:47.000000000 +0000
 +++ Source/WTF/wtf/Platform.h
-@@ -533,8 +533,10 @@
+@@ -410,6 +410,11 @@
+ #define WTF_OS_OPENBSD 1
+ #endif
+ 
++/* OS(SOLARIS) - Solaris and derivatives */
++#ifdef __sun
++#define WTF_OS_SOLARIS 1
++#endif
++
+ /* OS(WINDOWS) - Any version of Windows */
+ #if defined(WIN32) || defined(_WIN32)
+ #define WTF_OS_WINDOWS 1
+@@ -427,6 +432,7 @@
+     || OS(LINUX)            \
+     || OS(NETBSD)           \
+     || OS(OPENBSD)          \
++    || OS(SOLARIS)          \
+     || defined(unix)        \
+     || defined(__unix)      \
+     || defined(__unix__)
+@@ -567,8 +573,10 @@
  #define USE_HARFBUZZ 1
  #define USE_SOUP 1
  #define USE_WEBP 1
-+#ifndef __sun
++#if !OS(SOLARIS)
  #define USE_FILE_LOCK 1
  #endif
 +#endif
  
  #if PLATFORM(GTK)
  #define GLIB_VERSION_MIN_REQUIRED GLIB_VERSION_2_36
+@@ -693,11 +701,16 @@
+ 
+ #endif /* OS(DARWIN) */
+ 
++#if OS(FREEBSD) || OS(NETBSD) || OS(OPENBSD)
++#define HAVE_MADV_FREE 1
++#define HAVE_MADV_DONTNEED 1
++#endif
++
+ #if PLATFORM(COCOA)
+ #define HAVE_CFNETWORK_STORAGE_PARTITIONING 1
+ #endif
+ 
+-#if OS(DARWIN) || OS(FUCHSIA) || ((OS(FREEBSD) || defined(__GLIBC__) || defined(__BIONIC__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS)))
++#if OS(DARWIN) || OS(FUCHSIA) || ((OS(FREEBSD) || OS(NETBSD) || defined(__GLIBC__) || defined(__BIONIC__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS)))
+ #define HAVE_MACHINE_CONTEXT 1
+ #endif
+ 
+@@ -786,11 +799,11 @@
+ 
+ #if !defined(ENABLE_DFG_JIT) && ENABLE(JIT)
+ /* Enable the DFG JIT on X86 and X86_64. */
+-#if (CPU(X86) || CPU(X86_64)) && (OS(DARWIN) || OS(LINUX) || OS(FREEBSD) || OS(HURD) || OS(WINDOWS))
++#if (CPU(X86) || CPU(X86_64)) && (OS(DARWIN) || OS(LINUX) || OS(FREEBSD) || OS(NETBSD) || OS(HURD) || OS(WINDOWS))
+ #define ENABLE_DFG_JIT 1
+ #endif
+ /* Enable the DFG JIT on ARMv7.  Only tested on iOS, Linux, and FreeBSD. */
+-#if (CPU(ARM_THUMB2) || CPU(ARM64)) && (PLATFORM(IOS) || OS(LINUX) || OS(FREEBSD))
++#if (CPU(ARM_THUMB2) || CPU(ARM64)) && (PLATFORM(IOS) || OS(LINUX) || OS(FREEBSD) || OS(NETBSD))
+ #define ENABLE_DFG_JIT 1
+ #endif
+ /* Enable the DFG JIT on ARM. */

Added files:

Index: pkgsrc/www/webkit-gtk/patches/patch-Source_JavaScriptCore_runtime_MachineContext.h
diff -u /dev/null pkgsrc/www/webkit-gtk/patches/patch-Source_JavaScriptCore_runtime_MachineContext.h:1.1
--- /dev/null   Wed Oct 24 18:31:08 2018
+++ pkgsrc/www/webkit-gtk/patches/patch-Source_JavaScriptCore_runtime_MachineContext.h  Wed Oct 24 18:31:07 2018
@@ -0,0 +1,121 @@
+$NetBSD: patch-Source_JavaScriptCore_runtime_MachineContext.h,v 1.1 2018/10/24 18:31:07 leot Exp $
+
+Add support for NetBSD.
+
+--- Source/JavaScriptCore/runtime/MachineContext.h.orig        2018-08-21 16:06:10.000000000 +0000
++++ Source/JavaScriptCore/runtime/MachineContext.h
+@@ -188,6 +188,22 @@ static inline void*& stackPointerImpl(mc
+ #error Unknown Architecture
+ #endif
+ 
++#elif OS(NETBSD)
++
++#if CPU(X86)
++    return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_UESP]);
++#elif CPU(X86_64)
++    return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_RSP]);
++#elif CPU(ARM)
++    return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_SP]);
++#elif CPU(ARM64)
++    return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_SP]);
++#elif CPU(MIPS)
++    return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_SP]);
++#else
++#error Unknown Architecture
++#endif
++
+ #elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__)
+ 
+ #if CPU(X86)
+@@ -335,6 +351,22 @@ static inline void*& framePointerImpl(mc
+ #error Unknown Architecture
+ #endif
+ 
++#elif OS(NETBSD)
++
++#if CPU(X86)
++    return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_EBP]);
++#elif CPU(X86_64)
++    return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_RBP]);
++#elif CPU(ARM)
++    return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_FP]);
++#elif CPU(ARM64)
++    return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_FP]);
++#elif CPU(MIPS)
++    return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_S8]);
++#else
++#error Unknown Architecture
++#endif
++
+ #elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__)
+ 
+ // The following sequence depends on glibc's sys/ucontext.h.
+@@ -482,6 +514,22 @@ static inline void*& instructionPointerI
+ #error Unknown Architecture
+ #endif
+ 
++#elif OS(NETBSD)
++
++#if CPU(X86)
++    return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_EIP]);
++#elif CPU(X86_64)
++    return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_RIP]);
++#elif CPU(ARM)
++    return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_PC]);
++#elif CPU(ARM64)
++    return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_PC]);
++#elif CPU(MIPS)
++    return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_EPC]);
++#else
++#error Unknown Architecture
++#endif
++
+ #elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__)
+ 
+ // The following sequence depends on glibc's sys/ucontext.h.
+@@ -639,6 +687,22 @@ inline void*& argumentPointer<1>(mcontex
+ #error Unknown Architecture
+ #endif
+ 
++#elif OS(NETBSD)
++
++#if CPU(X86)
++    return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_EDX]);
++#elif CPU(X86_64)
++    return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_RSI]);
++#elif CPU(ARM)
++    return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_R1]);
++#elif CPU(ARM64)
++    return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_X1]);
++#elif CPU(MIPS)
++    return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_A1]);
++#else
++#error Unknown Architecture
++#endif
++
+ #elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__)
+ 
+ // The following sequence depends on glibc's sys/ucontext.h.
+@@ -756,6 +820,22 @@ inline void*& llintInstructionPointer(mc
+ #error Unknown Architecture
+ #endif
+ 
++#elif OS(NETBSD)
++
++#if CPU(X86)
++    return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_ESI]);
++#elif CPU(X86_64)
++    return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_R8]);
++#elif CPU(ARM)
++    return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_R8]);
++#elif CPU(ARM64)
++    return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_X4]);
++#elif CPU(MIPS)
++    return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_T4]);
++#else
++#error Unknown Architecture
++#endif
++
+ #elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__)
+ 
+ // The following sequence depends on glibc's sys/ucontext.h.
Index: pkgsrc/www/webkit-gtk/patches/patch-Source_WebCore_inspector_InspectorFrontendHost.cpp
diff -u /dev/null pkgsrc/www/webkit-gtk/patches/patch-Source_WebCore_inspector_InspectorFrontendHost.cpp:1.1
--- /dev/null   Wed Oct 24 18:31:08 2018
+++ pkgsrc/www/webkit-gtk/patches/patch-Source_WebCore_inspector_InspectorFrontendHost.cpp      Wed Oct 24 18:31:07 2018
@@ -0,0 +1,15 @@
+$NetBSD: patch-Source_WebCore_inspector_InspectorFrontendHost.cpp,v 1.1 2018/10/24 18:31:07 leot Exp $
+
+Add support for NetBSD.
+
+--- Source/WebCore/inspector/InspectorFrontendHost.cpp.orig    2018-08-06 14:07:41.000000000 +0000
++++ Source/WebCore/inspector/InspectorFrontendHost.cpp
+@@ -279,6 +279,8 @@ String InspectorFrontendHost::platform()
+     return "freebsd"_s;
+ #elif OS(OPENBSD)
+     return "openbsd"_s;
++#elif OS(NETBSD)
++    return "netbsd"_s;
+ #else
+     return "unknown"_s;
+ #endif
Index: pkgsrc/www/webkit-gtk/patches/patch-Source_bmalloc_bmalloc_BPlatform.h
diff -u /dev/null pkgsrc/www/webkit-gtk/patches/patch-Source_bmalloc_bmalloc_BPlatform.h:1.1
--- /dev/null   Wed Oct 24 18:31:08 2018
+++ pkgsrc/www/webkit-gtk/patches/patch-Source_bmalloc_bmalloc_BPlatform.h      Wed Oct 24 18:31:07 2018
@@ -0,0 +1,17 @@
+$NetBSD: patch-Source_bmalloc_bmalloc_BPlatform.h,v 1.1 2018/10/24 18:31:07 leot Exp $
+
+Add BOS(SOLARIS) definition.
+
+--- Source/bmalloc/bmalloc/BPlatform.h.orig    2018-07-25 11:56:32.000000000 +0000
++++ Source/bmalloc/bmalloc/BPlatform.h
+@@ -48,6 +48,10 @@
+ #define BOS_LINUX 1
+ #endif
+ 
++#ifdef __sun
++#define BOS_SOLARIS 1
++#endif
++
+ #if defined(WIN32) || defined(_WIN32)
+ #define BOS_WINDOWS 1
+ #endif

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index