qt5-qtwebkit: update to 5.212.0.alpha2

Version of qtwebkit that is being updated with webkit changes.

51 files changed, 295 insertions, 924 deletions

diff --git a/x11/qt5-qtwebkit/Makefile b/x11/qt5-qtwebkit/Makefile
index f411c5d4993..fb9486d5ed8 100644
--- a/x11/qt5-qtwebkit/Makefile
+++ b/x11/qt5-qtwebkit/Makefile
@@ -1,21 +1,75 @@
-# $NetBSD: Makefile,v 1.46 2017/11/30 16:45:13 adam Exp $
+# $NetBSD: Makefile,v 1.47 2018/01/17 19:37:33 markd Exp $
 
-DISTNAME=	qtwebkit-opensource-src-${QTVERSION}
-PKGNAME=	qt5-qtwebkit-${QTVERSION}
-PKGREVISION=	15
+DISTNAME=	qtwebkit-${QTWKVERSION}
+PKGNAME=	qt5-qtwebkit-${QTWKVERSION:S/-/./}
+MASTER_SITES=	${MASTER_SITE_GITHUB:=annulen/}
+GITHUB_PROJECT=	webkit
+GITHUB_RELEASE=	${DISTNAME}
+#MASTER_SITES=	https://github.com/annulen/webkit/releases/download/qtwebkit-${QTWKVERSION}/
+CATEGORIES=	x11
+
+MAINTAINER=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	http://qt-project.org/
 COMMENT=	Qt5 WebView module
+LICENSE=	gnu-lgpl-v2.1 AND gnu-gpl-v3
+EXTRACT_SUFX=	.tar.xz
+
+QTWKVERSION=	5.212.0-alpha2
+
+.include "../../mk/dlopen.buildlink3.mk"
+BUILDLINK_TRANSFORM+=   opt:-ldl:${BUILDLINK_LDADD.dl:M*}
+
+USE_LANGUAGES=          c c++11
+USE_TOOLS+=             gmake perl:build pkg-config bison flex sed
+USE_CMAKE=		yes
+CMAKE_ARG_PATH=		..
+CONFIGURE_DIRS=		_build
+CMAKE_INSTALL_PREFIX=	${PREFIX}/qt5
+
+CMAKE_ARGS+=		-DPORT=Qt
+CMAKE_ARGS+=		-DENABLE_TOOLS=OFF
+CMAKE_ARGS+=		-DCMAKE_BUILD_TYPE=Release
+CMAKE_ARGS+=		-DSHARED_CORE:BOOL=ON
+CMAKE_ARGS+=		-DUSE_SYSTEM_MALLOC:BOOL=ON
+CMAKE_ARGS+=		-DUSE_LD_GOLD:BOOL=OFF
+## requires gcc >= 4.9
+#CMAKE_ARGS+=		-DENABLE_FTL_JIT:BOOL=OFF
+#CMAKE_ARGS+=		-DENABLE_INDEXED_DATABASE:BOOL=OFF
+## needs JIT and ASSEMBLER
+CMAKE_ARGS+=		-DENABLE_SAMPLING_PROFILER:BOOL=OFF
+
+CMAKE_ARGS+=		-DKDE_INSTALL_LIBEXECDIR=${CMAKE_INSTALL_PREFIX}/libexec
+#CMAKE_ARGS+=		-DLIBEXEC_INSTALL_DIR=${CMAKE_INSTALL_PREFIX}/libexec
+
+GCC_REQD+=	4.9
+
+pre-configure:
+	${MKDIR} ${WRKSRC}/_build
+
+# wcstof(3) etc. is used in C++ code.
+CFLAGS.NetBSD+=         -D_NETBSD_SOURCE
+
+## for GL_GLEXT_LEGACY with GL/gl.h error, GL_ARB_shader_objects is not defined.
+#BUILDLINK_TRANSFORM+=   rm:-Wundef
+
+PLIST_VARS+=		mac unix
+.if ${OPSYS} == "Darwin"
+PLIST.mac=		yes
+.else
+PLIST.unix=		yes
+.endif
+
+# avoid creating a .qt directory in the users home directory
+SCRIPTS_ENV+=           HOME=${WRKDIR}
 
 BUILD_DEPENDS+=		gperf-[0-9]*:../../devel/gperf
 
-USE_TOOLS+=		bison flex pkg-config sed
 REPLACE_PERL+=		Source/WebKit2/Scripts/generate-forwarding-headers.pl
 
-MAKE_ENV+=		QTDIR=${QTDIR}
+#MAKE_ENV+=		QTDIR=${QTDIR}
 INSTALL_ENV+=		INSTALL_ROOT=${DESTDIR}
 INSTALLATION_DIRS+=	lib/pkgconfig
 
-.include "../../x11/qt5-qtbase/Makefile.common"
-
 .if ${_USE_CWRAPPERS} == "yes"
 BUILDLINK_TRANSFORM+=	R:${WRKSRC}/lib:${QTDIR}/lib
 .else
@@ -38,6 +92,7 @@ post-install:
 .endif
 .include "../../graphics/libwebp/buildlink3.mk"
 .include "../../mk/curses.buildlink3.mk"
+.include "../../textproc/hyphen/buildlink3.mk"
 .include "../../textproc/icu/buildlink3.mk"
 .include "../../textproc/libxslt/buildlink3.mk"
 .if ${OPSYS} != "Darwin"
diff --git a/x11/qt5-qtwebkit/PLIST b/x11/qt5-qtwebkit/PLIST
index 553421f8928..a0a1c7d151a 100644
--- a/x11/qt5-qtwebkit/PLIST
+++ b/x11/qt5-qtwebkit/PLIST
@@ -1,42 +1,17 @@
-@comment $NetBSD: PLIST,v 1.4 2014/12/30 17:23:47 adam Exp $
+@comment $NetBSD: PLIST,v 1.5 2018/01/17 19:37:33 markd Exp $
 lib/pkgconfig/Qt5WebKit.pc
 lib/pkgconfig/Qt5WebKitWidgets.pc
-qt5/include/QtWebKit/${PKGVERSION}/QtWebKit/private/bytearraytestdata.h
-qt5/include/QtWebKit/${PKGVERSION}/QtWebKit/private/qhttpheader_p.h
-qt5/include/QtWebKit/${PKGVERSION}/QtWebKit/private/qquicknetworkreply_p.h
-qt5/include/QtWebKit/${PKGVERSION}/QtWebKit/private/qquicknetworkrequest_p.h
-qt5/include/QtWebKit/${PKGVERSION}/QtWebKit/private/qquickurlschemedelegate_p.h
-qt5/include/QtWebKit/${PKGVERSION}/QtWebKit/private/qquickwebpage_p.h
-qt5/include/QtWebKit/${PKGVERSION}/QtWebKit/private/qquickwebpage_p_p.h
-qt5/include/QtWebKit/${PKGVERSION}/QtWebKit/private/qquickwebview_p.h
-qt5/include/QtWebKit/${PKGVERSION}/QtWebKit/private/qquickwebview_p_p.h
-qt5/include/QtWebKit/${PKGVERSION}/QtWebKit/private/qrawwebview_p.h
-qt5/include/QtWebKit/${PKGVERSION}/QtWebKit/private/qrawwebview_p_p.h
-qt5/include/QtWebKit/${PKGVERSION}/QtWebKit/private/qtwebsecurityorigin_p.h
-qt5/include/QtWebKit/${PKGVERSION}/QtWebKit/private/qwebchannelwebkittransport_p.h
-qt5/include/QtWebKit/${PKGVERSION}/QtWebKit/private/qwebdatabase_p.h
-qt5/include/QtWebKit/${PKGVERSION}/QtWebKit/private/qwebdownloaditem_p.h
-qt5/include/QtWebKit/${PKGVERSION}/QtWebKit/private/qwebdownloaditem_p_p.h
-qt5/include/QtWebKit/${PKGVERSION}/QtWebKit/private/qwebelement_p.h
-qt5/include/QtWebKit/${PKGVERSION}/QtWebKit/private/qwebhistory_p.h
-qt5/include/QtWebKit/${PKGVERSION}/QtWebKit/private/qwebiconimageprovider_p.h
-qt5/include/QtWebKit/${PKGVERSION}/QtWebKit/private/qwebkittest_p.h
-qt5/include/QtWebKit/${PKGVERSION}/QtWebKit/private/qwebloadrequest_p.h
-qt5/include/QtWebKit/${PKGVERSION}/QtWebKit/private/qwebnavigationhistory_p.h
-qt5/include/QtWebKit/${PKGVERSION}/QtWebKit/private/qwebnavigationhistory_p_p.h
-qt5/include/QtWebKit/${PKGVERSION}/QtWebKit/private/qwebnavigationrequest_p.h
-qt5/include/QtWebKit/${PKGVERSION}/QtWebKit/private/qwebpermissionrequest_p.h
-qt5/include/QtWebKit/${PKGVERSION}/QtWebKit/private/qwebplugindatabase_p.h
-qt5/include/QtWebKit/${PKGVERSION}/QtWebKit/private/qwebpreferences_p.h
-qt5/include/QtWebKit/${PKGVERSION}/QtWebKit/private/qwebpreferences_p_p.h
-qt5/include/QtWebKit/${PKGVERSION}/QtWebKit/private/qwebscriptworld.h
-qt5/include/QtWebKit/${PKGVERSION}/QtWebKit/private/qwebscriptworld_p.h
-qt5/include/QtWebKit/${PKGVERSION}/QtWebKit/private/qwebsecurityorigin_p.h
-qt5/include/QtWebKit/${PKGVERSION}/QtWebKit/private/testwindow.h
-qt5/include/QtWebKit/${PKGVERSION}/QtWebKit/private/util.h
+qt5/include/QtWebKit/5.212.0/QtWebKit/private/qhttpheader_p.h
+qt5/include/QtWebKit/5.212.0/QtWebKit/private/qwebdatabase_p.h
+qt5/include/QtWebKit/5.212.0/QtWebKit/private/qwebelement_p.h
+qt5/include/QtWebKit/5.212.0/QtWebKit/private/qwebhistory_p.h
+qt5/include/QtWebKit/5.212.0/QtWebKit/private/qwebplugindatabase_p.h
+qt5/include/QtWebKit/5.212.0/QtWebKit/private/qwebscriptworld_p.h
+qt5/include/QtWebKit/5.212.0/QtWebKit/private/qwebsecurityorigin_p.h
 qt5/include/QtWebKit/QWebDatabase
 qt5/include/QtWebKit/QWebElement
 qt5/include/QtWebKit/QWebElementCollection
+qt5/include/QtWebKit/QWebFullScreenRequest
 qt5/include/QtWebKit/QWebFullScreenVideoHandler
 qt5/include/QtWebKit/QWebHapticFeedbackPlayer
 qt5/include/QtWebKit/QWebHistory
@@ -58,6 +33,7 @@ qt5/include/QtWebKit/QtWebKitVersion
 qt5/include/QtWebKit/qtwebkitversion.h
 qt5/include/QtWebKit/qwebdatabase.h
 qt5/include/QtWebKit/qwebelement.h
+qt5/include/QtWebKit/qwebfullscreenrequest.h
 qt5/include/QtWebKit/qwebhistory.h
 qt5/include/QtWebKit/qwebhistoryinterface.h
 qt5/include/QtWebKit/qwebkitglobal.h
@@ -65,10 +41,10 @@ qt5/include/QtWebKit/qwebkitplatformplugin.h
 qt5/include/QtWebKit/qwebpluginfactory.h
 qt5/include/QtWebKit/qwebsecurityorigin.h
 qt5/include/QtWebKit/qwebsettings.h
-qt5/include/QtWebKitWidgets/${PKGVERSION}/QtWebKitWidgets/private/qwebframe_p.h
-qt5/include/QtWebKitWidgets/${PKGVERSION}/QtWebKitWidgets/private/qwebinspector_p.h
-qt5/include/QtWebKitWidgets/${PKGVERSION}/QtWebKitWidgets/private/qwebpage_p.h
-qt5/include/QtWebKitWidgets/${PKGVERSION}/QtWebKitWidgets/private/qwebviewaccessible_p.h
+qt5/include/QtWebKitWidgets/5.212.0/QtWebKitWidgets/private/qwebframe_p.h
+qt5/include/QtWebKitWidgets/5.212.0/QtWebKitWidgets/private/qwebinspector_p.h
+qt5/include/QtWebKitWidgets/5.212.0/QtWebKitWidgets/private/qwebpage_p.h
+qt5/include/QtWebKitWidgets/5.212.0/QtWebKitWidgets/private/qwebviewaccessible_p.h
 qt5/include/QtWebKitWidgets/QGraphicsWebView
 qt5/include/QtWebKitWidgets/QWebFrame
 qt5/include/QtWebKitWidgets/QWebHitTestResult
@@ -86,36 +62,41 @@ qt5/include/QtWebKitWidgets/qwebpage.h
 qt5/include/QtWebKitWidgets/qwebview.h
 qt5/lib/cmake/Qt5WebKit/Qt5WebKitConfig.cmake
 qt5/lib/cmake/Qt5WebKit/Qt5WebKitConfigVersion.cmake
+qt5/lib/cmake/Qt5WebKit/WebKitTargets-release.cmake
+qt5/lib/cmake/Qt5WebKit/WebKitTargets.cmake
 qt5/lib/cmake/Qt5WebKitWidgets/Qt5WebKitWidgetsConfig.cmake
 qt5/lib/cmake/Qt5WebKitWidgets/Qt5WebKitWidgetsConfigVersion.cmake
-qt5/lib/libANGLE.la
-qt5/lib/libANGLE.prl
-qt5/lib/libJavaScriptCore.la
-qt5/lib/libJavaScriptCore.prl
-qt5/lib/libQt5WebKit.la
-qt5/lib/libQt5WebKit.prl
-qt5/lib/libQt5WebKitWidgets.la
-qt5/lib/libQt5WebKitWidgets.prl
-qt5/lib/libWTF.la
-qt5/lib/libWTF.prl
-qt5/lib/libWebCore.la
-qt5/lib/libWebCore.prl
-qt5/lib/libWebKit1.la
-qt5/lib/libWebKit1.prl
-qt5/lib/libWebKit2.la
-qt5/lib/libWebKit2.prl
-qt5/lib/libleveldb.la
-qt5/lib/libleveldb.prl
+qt5/lib/cmake/Qt5WebKitWidgets/Qt5WebKitWidgetsTargets-release.cmake
+qt5/lib/cmake/Qt5WebKitWidgets/Qt5WebKitWidgetsTargets.cmake
+qt5/lib/libANGLESupport.a
+qt5/lib/libJavaScriptCore.so
+qt5/lib/libJavaScriptCore.so.5
+qt5/lib/libJavaScriptCore.so.5.212.0
+qt5/lib/libQt5WebKit.so
+qt5/lib/libQt5WebKit.so.5
+qt5/lib/libQt5WebKit.so.5.212.0
+qt5/lib/libQt5WebKitWidgets.so
+qt5/lib/libQt5WebKitWidgets.so.5
+qt5/lib/libQt5WebKitWidgets.so.5.212.0
+qt5/lib/libWTF.so
+qt5/lib/libWebCore.so
+qt5/lib/libWebCore.so.5
+qt5/lib/libWebCore.so.5.212.0
+qt5/lib/libWebKit2.so
+qt5/lib/libWebKit2.so.5
+qt5/lib/libWebKit2.so.5.212.0
+qt5/lib/libbrotli.a
+qt5/lib/libwoff2.a
 qt5/lib/pkgconfig/Qt5WebKit.pc
 qt5/lib/pkgconfig/Qt5WebKitWidgets.pc
+qt5/libexec/QtWebDatabaseProcess
+qt5/libexec/QtWebNetworkProcess
+qt5/libexec/QtWebPluginProcess
 qt5/libexec/QtWebProcess
-${PLIST.unix}qt5/libexec/QtWebPluginProcess
 qt5/mkspecs/modules/qt_lib_webkit.pri
-qt5/mkspecs/modules/qt_lib_webkit_private.pri
 qt5/mkspecs/modules/qt_lib_webkitwidgets.pri
-qt5/mkspecs/modules/qt_lib_webkitwidgets_private.pri
-qt5/qml/QtWebKit/experimental/libqmlwebkitexperimentalplugin.la
+qt5/qml/QtWebKit/experimental/libqmlwebkitexperimentalplugin.so
 qt5/qml/QtWebKit/experimental/qmldir
-qt5/qml/QtWebKit/libqmlwebkitplugin.la
+qt5/qml/QtWebKit/libqmlwebkitplugin.so
 qt5/qml/QtWebKit/plugins.qmltypes
 qt5/qml/QtWebKit/qmldir
diff --git a/x11/qt5-qtwebkit/buildlink3.mk b/x11/qt5-qtwebkit/buildlink3.mk
index 2b4de845371..74c39456395 100644
--- a/x11/qt5-qtwebkit/buildlink3.mk
+++ b/x11/qt5-qtwebkit/buildlink3.mk
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.32 2017/11/30 16:45:13 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.33 2018/01/17 19:37:33 markd Exp $
 
 BUILDLINK_TREE+=	qt5-qtwebkit
 
 .if !defined(QT5_QTWEBKIT_BUILDLINK3_MK)
 QT5_QTWEBKIT_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.qt5-qtwebkit+=	qt5-qtwebkit>=5.5.1
-BUILDLINK_ABI_DEPENDS.qt5-qtwebkit+=	qt5-qtwebkit>=5.5.1nb15
+BUILDLINK_API_DEPENDS.qt5-qtwebkit+=	qt5-qtwebkit>=5.8.0
+BUILDLINK_ABI_DEPENDS.qt5-qtwebkit+=	qt5-qtwebkit>=5.8.0
 BUILDLINK_PKGSRCDIR.qt5-qtwebkit?=	../../x11/qt5-qtwebkit
 
 BUILDLINK_INCDIRS.qt5-qtwebkit+=	qt5/include
diff --git a/x11/qt5-qtwebkit/distinfo b/x11/qt5-qtwebkit/distinfo
index 86be14a27c9..af2b6f1df9f 100644
--- a/x11/qt5-qtwebkit/distinfo
+++ b/x11/qt5-qtwebkit/distinfo
@@ -1,57 +1,25 @@
-$NetBSD: distinfo,v 1.10 2017/11/21 17:00:28 minskim Exp $
+$NetBSD: distinfo,v 1.11 2018/01/17 19:37:33 markd Exp $
 
-SHA1 (qtwebkit-opensource-src-5.5.1.tar.xz) = e1e16f3eb48c1ce863b9ab33364e4ac178ae51a7
-RMD160 (qtwebkit-opensource-src-5.5.1.tar.xz) = 0594ec1150f7899d72f57d8ff2f108f3f75faaf9
-SHA512 (qtwebkit-opensource-src-5.5.1.tar.xz) = a44ca088fee7dbf0b10df7e1f6c914f37b31cf7c3b95156c32e5b8373a8de54013cd51cdf5b18b72f165d60c21ce55bceca86b038de68b1eb78ae0cd4bb8228a
-Size (qtwebkit-opensource-src-5.5.1.tar.xz) = 33489924 bytes
-SHA1 (patch-Source_JavaScriptCore_API_JSStringRef.cpp) = 59da586605606158d6affca8a77b1e637401a394
+SHA1 (qtwebkit-5.212.0-alpha2.tar.xz) = 6a361cc3f3b7ab1d35955bafe20fbbae61bc80c8
+RMD160 (qtwebkit-5.212.0-alpha2.tar.xz) = 33c3f7c68090fa16f72950ef85c20978432cc058
+SHA512 (qtwebkit-5.212.0-alpha2.tar.xz) = b15985aab20c5618dc1f71a0d91f02dbed993516272090a4a12990714bf4c9554ccbdcf9d6a143bf46fcc2c170f691e571114d61686fe49791f8d5c540785758
+Size (qtwebkit-5.212.0-alpha2.tar.xz) = 12456284 bytes
 SHA1 (patch-Source_JavaScriptCore_API_ObjCCallbackFunction.h) = be77c4b19f5f97c12180c1b7d3b72968364f3229
-SHA1 (patch-Source_JavaScriptCore_DerivedSources.pri) = b7a81c85257ddebd7bdff546a6d6720c9a2c5b56
-SHA1 (patch-Source_JavaScriptCore_JavaScriptCore.pri) = ccf64d0df1c61ff5c31c000636f3b64460562314
-SHA1 (patch-Source_JavaScriptCore_Target.pri) = 2635cb0b9193fcf2ad55f01099341f4e140ab19b
-SHA1 (patch-Source_JavaScriptCore_assembler_ARMAssembler.h) = a6cfdbced0bb528f47e4c0279ca03898780578cb
-SHA1 (patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp) = 2ed23192d9a4ec2c0f7b7b9a48bed664adbc7fb3
-SHA1 (patch-Source_JavaScriptCore_dfg_DFGNode.h) = cf39645a9b61299bb7b5b700a4cf2af68aa2f9f6
-SHA1 (patch-Source_JavaScriptCore_heap_MachineStackMarker.cpp) = 09bfdb6e63b835fb50611289d4a1c50cd18c9e37
-SHA1 (patch-Source_JavaScriptCore_runtime_DatePrototype.cpp) = b87c0e9d453d4f4d2a8fc2dac077b79ba761a62a
-SHA1 (patch-Source_JavaScriptCore_tools_CodeProfiling.cpp) = da6e2627337be1d6a4692697f23381b1bc80d08a
-SHA1 (patch-Source_QtWebKit.pro) = cfa9b6a36ce63f7655a164bbc696db2c0a44d288
-SHA1 (patch-Source_ThirdParty_ANGLE_Target.pri) = 33473cbae5e2f835b0cea6cfd5fe50f031bea60c
-SHA1 (patch-Source_ThirdParty_ANGLE_src_compiler_glslang.y) = 875cfb3a98b943a78bf87e91d724d067b5bd2523
-SHA1 (patch-Source_ThirdParty_ANGLE_src_compiler_osinclude.h) = a09b19f661c17a65f733a08822199b28eb51aed9
+SHA1 (patch-Source_JavaScriptCore_assembler_ARMAssembler.h) = 7bbb0a59a0c087abaaddda08fc31aa24809acb70
+SHA1 (patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp) = 79b54cb1d03d976a0629fbd8ee9ac1881951ba10
+SHA1 (patch-Source_JavaScriptCore_dfg_DFGNode.h) = a3eba122c7226a80dacf1b762747fe0a7408b849
+SHA1 (patch-Source_JavaScriptCore_heap_MachineStackMarker.cpp) = a5815dd5794d9ffbd49e5793198a06535ad89d3c
+SHA1 (patch-Source_JavaScriptCore_tools_CodeProfiling.cpp) = 94c139413eecb875bba98c7749bba24cfcc16632
 SHA1 (patch-Source_ThirdParty_gtest_include_gtest_internal_gtest-port.h) = 1e4b8cffbd7ec0a6130a0ec2112023bed5c0b78e
-SHA1 (patch-Source_ThirdParty_leveldb_Target.pri) = c202d901a2af5e9efdf2357c1e062f58c8db321d
-SHA1 (patch-Source_WTF_WTF.pro) = 06883057a69fb95142cf33615a800cd532528e3e
-SHA1 (patch-Source_WTF_wtf_Assertions.cpp) = 9146f5c8a44563328194470e3f1f4ec5150fbe93
-SHA1 (patch-Source_WTF_wtf_Compiler.h) = 09c6f86b65ad93775cf83280a48bb6925ed776b5
+SHA1 (patch-Source_WTF_wtf_Assertions.cpp) = 15b8ac40e49cfec78d46de634fd6a1edde2d2a96
 SHA1 (patch-Source_WTF_wtf_InlineASM.h) = 64ea54605fbe787be57f7423e33802def66d6432
-SHA1 (patch-Source_WTF_wtf_MathExtras.h) = fb5416d99b959e54cbe1276c42b19ed18c32ad85
-SHA1 (patch-Source_WTF_wtf_NumberOfCores.cpp) = 5f80234f0bc8a66b2f1b4824a8b79b402e707491
-SHA1 (patch-Source_WTF_wtf_Platform.h) = d44960e5a5d171e815f973999c29d88a785cb3d7
-SHA1 (patch-Source_WTF_wtf_RAMSize.cpp) = 1c5a9c0aaffdec25cea74b010b9bc8922593b1af
-SHA1 (patch-Source_WTF_wtf_ThreadIdentifierDataPthreads.cpp) = 249308d00b18a8b89e9787f440341e77a1927531
-SHA1 (patch-Source_WTF_wtf_Threading.h) = 92f303cb972335fc9aaf4054cf66d9b6e99c94a5
-SHA1 (patch-Source_WTF_wtf_TypeTraits.h) = 6ea04b8d8de553d7a58354f1d1a3a535b66f6353
-SHA1 (patch-Source_WTF_wtf_text_StringImpl.h) = ab4fc5bef1c01bf21e4a80da8709985dd16d8da0
-SHA1 (patch-Source_WebCore_Target.pri) = 6399c94c0b4f30fc0ce1d25c5056d7381ecb9020
-SHA1 (patch-Source_WebCore_bindings_js_JSInspectorFrontendHostCustom.cpp) = 011224d015cc46571646ee148bf67758ba4a56b3
-SHA1 (patch-Source_WebCore_editing_Editor.h) = 8b566568d843c9699789e9d45a019e7f4192699a
-SHA1 (patch-Source_WebCore_page_NavigatorBase.cpp) = f596432d46cb67b5b233bf7fdf0286d94c554e5e
+SHA1 (patch-Source_WTF_wtf_MathExtras.h) = 7dac41bf3e50944e49c3e3c29d482d2c3300665d
+SHA1 (patch-Source_WTF_wtf_Platform.h) = cfffb219f1d58d937ae46440aa5395aa066669e4
+SHA1 (patch-Source_WTF_wtf_ThreadIdentifierDataPthreads.cpp) = bfa570aa20e3508c77bbaebed051821a33f36209
+SHA1 (patch-Source_WebCore_page_NavigatorBase.cpp) = e8972f4b703a9ff45ce313609d2540f89064b4ff
 SHA1 (patch-Source_WebCore_platform_graphics_cpu_arm_filters_FELightingNEON.cpp) = dd409929936955ad31b8ec0902067e2f23c054a2
 SHA1 (patch-Source_WebCore_platform_graphics_surfaces_GraphicsSurface.h) = d1d986afd5525143fc786a959240a72167f03352
 SHA1 (patch-Source_WebCore_platform_graphics_surfaces_GraphicsSurfaceToken.h) = 838acb2d7ecf41e5f6989d98459d103f4268cdcf
-SHA1 (patch-Source_WebCore_platform_graphics_surfaces_mac_GraphicsSurfaceMac.cpp) = a42d4604c92ec43d11966f2a599125d6a1e9febc
-SHA1 (patch-Source_WebCore_platform_sql_SQLiteDatabase.cpp) = 97dd7fd94afcb967bc1c65287d4ded5b34840857
-SHA1 (patch-Source_WebKit2_DerivedSources.pri) = 4147fd02d353f90a859e15d8dae70efd4dc1eeb4
-SHA1 (patch-Source_WebKit2_Platform_CoreIPC_MessageDecoder.cpp) = b83d80adef042141a9047b64f635577151c4e819
-SHA1 (patch-Source_WebKit2_Platform_CoreIPC_MessageDecoder.h) = 8270ff1cc34e738e45d730c56a463e96c0a9ea11
-SHA1 (patch-Source_WebKit2_Platform_unix_SharedMemoryUnix.cpp) = 17a7e91683f7e336d8ec3d4b26a91d4b0a1c4e31
-SHA1 (patch-Source_WebKit2_Shared_API_c_WKString.cpp) = dde4de25714ca66a53f0464f774b330b97a01150
-SHA1 (patch-Source_WebKit2_Target.pri) = ed1b26769f666c1aeb45480666af1f5a0c83e489
-SHA1 (patch-Source_WebKit_WebKit1.pro) = 421885279866c19172eb93597e60c9940128f8de
-SHA1 (patch-Source_WebKit_qt_examples_platformplugin_platformplugin.pro) = 40b2669f06d3fe964f86252e3e16eabe6d8ed508
-SHA1 (patch-Source_api.pri) = 116d15c6d2554c5bd0865de972fb3f9101cb4b3c
-SHA1 (patch-Tools_Scripts_webkitdirs.pm) = 60b3be277872ac7e96a16649598ac0b937d7b91f
-SHA1 (patch-Tools_WebKitTestRunner_InjectedBundle_Target.pri) = 336191aa4014005f13698ccdd459ae8e935e0588
-SHA1 (patch-Tools_qmake_mkspecs_features_functions.prf) = 87053c94e52d172f7b1b81cedb5de57ca7ddfb87
-SHA1 (patch-Tools_qmake_mkspecs_features_production__build.prf) = 4c20517f1d3266c5169e822526374c429ba430d4
+SHA1 (patch-Source_WebKit2_Platform_unix_SharedMemoryUnix.cpp) = d18013d0e07d7ad7e9d84cb6ef2d418d9bba4c7e
+SHA1 (patch-Source_WebKit_PlatformQt.cmake) = 5dfde3b2e3092ffcd11fc6746bed1767b2c3b692
+SHA1 (patch-Source_cmake_OptionsQt.cmake) = 2527e56468709bd9fd0a98bf754ac9c692cac4dc
diff --git a/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_API_JSStringRef.cpp b/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_API_JSStringRef.cpp
deleted file mode 100644
index 5171e0b997d..00000000000
--- a/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_API_JSStringRef.cpp
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-Source_JavaScriptCore_API_JSStringRef.cpp,v 1.1 2017/04/26 10:27:43 wiz Exp $
-
-Fix build with icu-59.
-
---- Source/JavaScriptCore/API/JSStringRef.cpp.orig	2015-10-13 04:37:10.000000000 +0000
-+++ Source/JavaScriptCore/API/JSStringRef.cpp
-@@ -37,7 +37,7 @@ using namespace WTF::Unicode;
- JSStringRef JSStringCreateWithCharacters(const JSChar* chars, size_t numChars)
- {
-     initializeThreading();
--    return OpaqueJSString::create(chars, numChars).leakRef();
-+    return OpaqueJSString::create((const UChar*)chars, numChars).leakRef();
- }
- 
- JSStringRef JSStringCreateWithUTF8CString(const char* string)
-@@ -62,7 +62,7 @@ JSStringRef JSStringCreateWithUTF8CStrin
- JSStringRef JSStringCreateWithCharactersNoCopy(const JSChar* chars, size_t numChars)
- {
-     initializeThreading();
--    return OpaqueJSString::create(StringImpl::createWithoutCopying(chars, numChars, WTF::DoesNotHaveTerminatingNullCharacter)).leakRef();
-+    return OpaqueJSString::create(StringImpl::createWithoutCopying((const UChar*)chars, numChars, WTF::DoesNotHaveTerminatingNullCharacter)).leakRef();
- }
- 
- JSStringRef JSStringRetain(JSStringRef string)
-@@ -83,7 +83,7 @@ size_t JSStringGetLength(JSStringRef str
- 
- const JSChar* JSStringGetCharactersPtr(JSStringRef string)
- {
--    return string->characters();
-+    return (const JSChar *)string->characters();
- }
- 
- size_t JSStringGetMaximumUTF8CStringSize(JSStringRef string)
diff --git a/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_DerivedSources.pri b/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_DerivedSources.pri
deleted file mode 100644
index ccff7bb4e57..00000000000
--- a/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_DerivedSources.pri
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-Source_JavaScriptCore_DerivedSources.pri,v 1.1 2014/12/30 17:23:47 adam Exp $
-
-* Make conditional for Unix
-
---- Source/JavaScriptCore/DerivedSources.pri.orig	2013-11-27 01:01:48.000000000 +0000
-+++ Source/JavaScriptCore/DerivedSources.pri
-@@ -108,7 +108,7 @@ llint.depends = $$LLINT_DEPENDENCY
- llint.commands = ruby $$llint.script $$LLINT_ASSEMBLER ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
- GENERATORS += llint
- 
--linux-*:if(isEqual(QT_ARCH, "i386")|isEqual(QT_ARCH, "x86_64")) {
-+unix-*:if(isEqual(QT_ARCH, "i386")|isEqual(QT_ARCH, "x86_64")) {
-     # GENERATOR: disassembler
-     disassembler.output = udis86_itab.c
-     disassembler.input = DISASSEMBLER_FILES
diff --git a/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_JavaScriptCore.pri b/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_JavaScriptCore.pri
deleted file mode 100644
index a1a2929e2f1..00000000000
--- a/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_JavaScriptCore.pri
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-Source_JavaScriptCore_JavaScriptCore.pri,v 1.1 2014/12/30 17:23:47 adam Exp $
-
-* Make conditional for Unix
-
---- Source/JavaScriptCore/JavaScriptCore.pri.orig	2013-11-27 01:01:48.000000000 +0000
-+++ Source/JavaScriptCore/JavaScriptCore.pri
-@@ -41,6 +41,6 @@ wince* {
-     INCLUDEPATH += $$SOURCE_DIR/os-win32
- }
- 
--linux-*:if(isEqual(QT_ARCH, "i386")|isEqual(QT_ARCH, "x86_64")) {
-+unix-*:if(isEqual(QT_ARCH, "i386")|isEqual(QT_ARCH, "x86_64")) {
-     INCLUDEPATH += $$SOURCE_DIR/disassembler/udis86
- }
diff --git a/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_Target.pri b/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_Target.pri
deleted file mode 100644
index 3b9cfb4c439..00000000000
--- a/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_Target.pri
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-Source_JavaScriptCore_Target.pri,v 1.1 2014/12/30 17:23:47 adam Exp $
-
-* Libtoolized
-* Build as shared library
-* Install libJavaScriptCore library
-* Make conditionals for Unix
-
---- Source/JavaScriptCore/Target.pri.orig	2014-09-11 10:48:22.000000000 +0000
-+++ Source/JavaScriptCore/Target.pri
-@@ -13,7 +13,9 @@ WEBKIT += wtf
- QT += core
- QT -= gui
- 
--CONFIG += staticlib optimize_full
-+CONFIG += optimize_full
-+target.path = $$[QT_INSTALL_LIBS]
-+INSTALLS += target
- 
- # Rules when JIT enabled (not disabled)
- !contains(DEFINES, ENABLE_JIT=0) {
-@@ -326,7 +328,7 @@ SOURCES += \
-     tools/CodeProfiling.cpp \
-     yarr/YarrJIT.cpp \
- 
--linux-*:if(isEqual(QT_ARCH, "i386")|isEqual(QT_ARCH, "x86_64")) {
-+unix-*:if(isEqual(QT_ARCH, "i386")|isEqual(QT_ARCH, "x86_64")) {
-     SOURCES += \
-         disassembler/UDis86Disassembler.cpp \
-         disassembler/udis86/udis86.c \
diff --git a/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_assembler_ARMAssembler.h b/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_assembler_ARMAssembler.h
index af18a166a85..c691da94f0d 100644
--- a/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_assembler_ARMAssembler.h
+++ b/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_assembler_ARMAssembler.h
@@ -1,8 +1,8 @@
-$NetBSD: patch-Source_JavaScriptCore_assembler_ARMAssembler.h,v 1.1 2014/12/30 17:23:47 adam Exp $
+$NetBSD: patch-Source_JavaScriptCore_assembler_ARMAssembler.h,v 1.2 2018/01/17 19:37:33 markd Exp $
 
 * Add NetBSD support
 
---- Source/JavaScriptCore/assembler/ARMAssembler.h.orig	2013-11-27 01:01:49.000000000 +0000
+--- Source/JavaScriptCore/assembler/ARMAssembler.h.orig	2017-06-04 20:16:05.000000000 +0000
 +++ Source/JavaScriptCore/assembler/ARMAssembler.h
 @@ -27,6 +27,10 @@
  #ifndef ARMAssembler_h
@@ -15,10 +15,10 @@ $NetBSD: patch-Source_JavaScriptCore_assembler_ARMAssembler.h,v 1.1 2014/12/30 1
  #if ENABLE(ASSEMBLER) && CPU(ARM_TRADITIONAL)
  
  #include "AssemblerBufferWithConstantPool.h"
-@@ -1069,6 +1073,11 @@ namespace JSC {
-             UNUSED_PARAM(size);
- #elif OS(QNX)
-             msync(code, size, MS_INVALIDATE_ICACHE);
+@@ -1128,6 +1132,11 @@ namespace JSC {
+                 linuxPageFlush(current, current + page);
+ 
+             linuxPageFlush(current, end);
 +#elif OS(NETBSD)
 +            struct arm_sync_icache_args args;
 +            args.addr = reinterpret_cast<uintptr_t>(code);
diff --git a/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp b/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp
index c7ddeda15fc..777f87c47ce 100644
--- a/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp
+++ b/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp
@@ -1,11 +1,11 @@
-$NetBSD: patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp,v 1.1 2014/12/30 17:23:47 adam Exp $
+$NetBSD: patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp,v 1.2 2018/01/17 19:37:33 markd Exp $
 
 * Add NetBSD support
 
---- Source/JavaScriptCore/assembler/MacroAssemblerARM.cpp.orig	2014-09-11 10:48:22.000000000 +0000
+--- Source/JavaScriptCore/assembler/MacroAssemblerARM.cpp.orig	2017-06-04 20:16:05.000000000 +0000
 +++ Source/JavaScriptCore/assembler/MacroAssemblerARM.cpp
-@@ -43,6 +43,15 @@
- # endif
+@@ -42,6 +42,15 @@
+ #include <asm/hwcap.h>
  #endif
  
 +#if OS(NETBSD)
@@ -20,9 +20,9 @@ $NetBSD: patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp,v 1.1 2014/
  namespace JSC {
  
  static bool isVFPPresent()
-@@ -61,6 +70,16 @@ static bool isVFPPresent()
+@@ -60,6 +69,16 @@ static bool isVFPPresent()
      }
- #endif
+ #endif // OS(LINUX)
  
 +#if OS(NETBSD)
 +    size_t len;
@@ -34,6 +34,6 @@ $NetBSD: patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp,v 1.1 2014/
 +    }
 +#endif
 +
- #if (COMPILER(RVCT) && defined(__TARGET_FPU_VFP)) || (COMPILER(GCC) && defined(__VFP_FP__))
+ #if (COMPILER(GCC_OR_CLANG) && defined(__VFP_FP__))
      return true;
  #else
diff --git a/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_dfg_DFGNode.h b/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_dfg_DFGNode.h
index 994e65bf3c9..0e70dd691fe 100644
--- a/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_dfg_DFGNode.h
+++ b/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_dfg_DFGNode.h
@@ -1,11 +1,11 @@
-$NetBSD: patch-Source_JavaScriptCore_dfg_DFGNode.h,v 1.1 2014/12/30 17:23:47 adam Exp $
+$NetBSD: patch-Source_JavaScriptCore_dfg_DFGNode.h,v 1.2 2018/01/17 19:37:33 markd Exp $
 
 * Add NetBSD support
 
---- Source/JavaScriptCore/dfg/DFGNode.h.orig	2013-11-27 01:01:48.000000000 +0000
+--- Source/JavaScriptCore/dfg/DFGNode.h.orig	2017-06-04 20:16:05.000000000 +0000
 +++ Source/JavaScriptCore/dfg/DFGNode.h
-@@ -73,7 +73,7 @@ struct NewArrayBufferData {
- struct OpInfo {
+@@ -226,7 +226,7 @@ struct OpInfo {
+     OpInfo() : m_value(0) { }
      explicit OpInfo(int32_t value) : m_value(static_cast<uintptr_t>(value)) { }
      explicit OpInfo(uint32_t value) : m_value(static_cast<uintptr_t>(value)) { }
 -#if OS(DARWIN) || USE(JSVALUE64)
diff --git a/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_heap_MachineStackMarker.cpp b/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_heap_MachineStackMarker.cpp
index 13b0dbb459b..3b1203e3fab 100644
--- a/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_heap_MachineStackMarker.cpp
+++ b/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_heap_MachineStackMarker.cpp
@@ -1,90 +1,78 @@
-$NetBSD: patch-Source_JavaScriptCore_heap_MachineStackMarker.cpp,v 1.1 2014/12/30 17:23:47 adam Exp $
+$NetBSD: patch-Source_JavaScriptCore_heap_MachineStackMarker.cpp,v 1.2 2018/01/17 19:37:33 markd Exp $
 
-* Add Solaris/SunOS support
+Support NetBSD
 
---- Source/JavaScriptCore/heap/MachineStackMarker.cpp.orig	2013-11-27 01:01:49.000000000 +0000
+XXXX - currently only did CPU(X86_64) and guessed those values.
+    rest are currently jsut copied from FreeBSD
+
+--- Source/JavaScriptCore/heap/MachineStackMarker.cpp.orig	2017-06-04 20:16:05.000000000 +0000
 +++ Source/JavaScriptCore/heap/MachineStackMarker.cpp
-@@ -20,6 +20,9 @@
-  */
- 
- #include "config.h"
-+#if OS(SOLARIS)
-+#undef _FILE_OFFSET_BITS
-+#endif
- #include "MachineStackMarker.h"
- 
- #include "ConservativeRoots.h"
-@@ -49,6 +52,10 @@
- #include <unistd.h>
- 
- #if OS(SOLARIS)
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+#include <fcntl.h>
-+#include <procfs.h>
- #include <thread.h>
- #else
- #include <pthread.h>
-@@ -317,6 +324,7 @@ typedef pthread_attr_t PlatformThreadReg
- #error Need a thread register struct for this platform
+@@ -665,6 +665,22 @@ void* MachineThreads::Thread::Registers:
+ #error Unknown Architecture
  #endif
  
-+#if !OS(SOLARIS)
- static size_t getPlatformThreadRegisters(const PlatformThread& platformThread, PlatformThreadRegisters& regs)
- {
- #if OS(DARWIN)
-@@ -383,6 +391,7 @@ static size_t getPlatformThreadRegisters
- #error Need a way to get thread registers on this platform
- #endif
- }
++#elif OS(NETBSD)
++
++#if CPU(X86)
++    return reinterpret_cast<void*>((uintptr_t) regs.machineContext.mc_ebp);
++#elif CPU(X86_64)
++    return reinterpret_cast<void*>((uintptr_t) regs.machineContext.__gregs[_REG_RBP]);
++#elif CPU(ARM)
++    return reinterpret_cast<void*>((uintptr_t) regs.machineContext.__gregs[_REG_FP]);
++#elif CPU(ARM64)
++    return reinterpret_cast<void*>((uintptr_t) regs.machineContext.mc_gpregs.gp_x[29]);
++#elif CPU(MIPS)
++    return reinterpret_cast<void*>((uintptr_t) regs.machineContext.mc_regs[30]);
++#else
++#error Unknown Architecture
 +#endif
++
+ #elif defined(__GLIBC__)
  
- static inline void* otherThreadStackPointer(const PlatformThreadRegisters& regs)
- {
-@@ -446,6 +455,7 @@ static inline void* otherThreadStackPoin
- #endif
- }
- 
-+#if !OS(SOLARIS)
- static void freePlatformThreadRegisters(PlatformThreadRegisters& regs)
- {
- #if USE(PTHREADS) && !OS(WINDOWS) && !OS(DARWIN) && !OS(QNX)
-@@ -454,20 +464,36 @@ static void freePlatformThreadRegisters(
-     UNUSED_PARAM(regs);
+ // The following sequence depends on glibc's sys/ucontext.h.
+@@ -747,6 +763,22 @@ void* MachineThreads::Thread::Registers:
+ #error Unknown Architecture
  #endif
- }
-+#endif
  
- void MachineThreads::gatherFromOtherThread(ConservativeRoots& conservativeRoots, Thread* thread)
- {
-+#if OS(SOLARIS)
-+    struct lwpstatus lwp;
-+    char procfile[64];
-+    int fd;
-+    snprintf(procfile, 64, "/proc/self/lwp/%u/lwpstatus", thread->platformThread);
-+    fd = open(procfile, O_RDONLY, 0);
-+    if (fd == -1) {
-+        fprintf(stderr, "%s: %s\n", procfile, strerror(errno));
-+        abort();
-+    }
-+    pread(fd, &lwp, sizeof(lwp), 0);
-+    close(fd);
-+    void* stackPointer = (void*)lwp.pr_reg[REG_SP];
++#elif OS(NETBSD)
++
++#if CPU(X86)
++    return reinterpret_cast<void*>((uintptr_t) regs.machineContext.mc_eip);
++#elif CPU(X86_64)
++    return reinterpret_cast<void*>((uintptr_t) regs.machineContext.__gregs[_REG_RIP]);
++#elif CPU(ARM)
++    return reinterpret_cast<void*>((uintptr_t) regs.machineContext.__gregs[_REG_PC]);
++#elif CPU(ARM64)
++    return reinterpret_cast<void*>((uintptr_t) regs.machineContext.mc_gpregs.gp_elr);
++#elif CPU(MIPS)
++    return reinterpret_cast<void*>((uintptr_t) regs.machineContext.mc_pc);
 +#else
-     PlatformThreadRegisters regs;
-     size_t regSize = getPlatformThreadRegisters(thread->platformThread, regs);
++#error Unknown Architecture
++#endif
++
+ #elif defined(__GLIBC__)
  
-     conservativeRoots.add(static_cast<void*>(&regs), static_cast<void*>(reinterpret_cast<char*>(&regs) + regSize));
+ // The following sequence depends on glibc's sys/ucontext.h.
+@@ -838,6 +870,22 @@ void* MachineThreads::Thread::Registers:
+ #error Unknown Architecture
+ #endif
  
-     void* stackPointer = otherThreadStackPointer(regs);
++#elif OS(NETBSD)
 +
-+    freePlatformThreadRegisters(regs);
++#if CPU(X86)
++    return reinterpret_cast<void*>((uintptr_t) regs.machineContext.mc_esi);
++#elif CPU(X86_64)
++    return reinterpret_cast<void*>((uintptr_t) regs.machineContext.__gregs[_REG_R8]);
++#elif CPU(ARM)
++    return reinterpret_cast<void*>((uintptr_t) regs.machineContext.__gregs[_REG_R8]);
++#elif CPU(ARM64)
++    return reinterpret_cast<void*>((uintptr_t) regs.machineContext.mc_gpregs.gp_x[4]);
++#elif CPU(MIPS)
++    return reinterpret_cast<void*>((uintptr_t) regs.machineContext.mc_regs[12]);
++#else
++#error Unknown Architecture
 +#endif
-     void* stackBase = thread->stackBase;
-     swapIfBackwards(stackPointer, stackBase);
-     conservativeRoots.add(stackPointer, stackBase);
--
--    freePlatformThreadRegisters(regs);
- }
++
+ #elif defined(__GLIBC__)
  
- void MachineThreads::gatherConservativeRoots(ConservativeRoots& conservativeRoots, void* stackCurrent)
+ // The following sequence depends on glibc's sys/ucontext.h.
diff --git a/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_runtime_DatePrototype.cpp b/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_runtime_DatePrototype.cpp
deleted file mode 100644
index 041c78a6d80..00000000000
--- a/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_runtime_DatePrototype.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-Source_JavaScriptCore_runtime_DatePrototype.cpp,v 1.1 2017/11/21 17:00:28 minskim Exp $
-
-Cast ICU's UChar (char16_t) to pass as UniChar.
-
---- Source/JavaScriptCore/runtime/DatePrototype.cpp.orig	2015-10-13 04:37:10.000000000 +0000
-+++ Source/JavaScriptCore/runtime/DatePrototype.cpp
-@@ -167,7 +167,7 @@ static JSCell* formatLocaleDate(ExecStat
-     CFRelease(locale);
- 
-     if (useCustomFormat) {
--        CFStringRef customFormatCFString = CFStringCreateWithCharacters(0, customFormatString.characters(), customFormatString.length());
-+        CFStringRef customFormatCFString = CFStringCreateWithCharacters(0, (const UniChar*)customFormatString.characters(), customFormatString.length());
-         CFDateFormatterSetFormat(formatter, customFormatCFString);
-         CFRelease(customFormatCFString);
-     }
-@@ -184,7 +184,7 @@ static JSCell* formatLocaleDate(ExecStat
-     ASSERT(length <= bufferLength);
-     if (length > bufferLength)
-         length = bufferLength;
--    CFStringGetCharacters(string, CFRangeMake(0, length), buffer);
-+    CFStringGetCharacters(string, CFRangeMake(0, length), (UniChar*)buffer);
- 
-     CFRelease(string);
- 
diff --git a/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_tools_CodeProfiling.cpp b/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_tools_CodeProfiling.cpp
index 4275c46de0f..42beb51de4c 100644
--- a/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_tools_CodeProfiling.cpp
+++ b/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_tools_CodeProfiling.cpp
@@ -1,15 +1,15 @@
-$NetBSD: patch-Source_JavaScriptCore_tools_CodeProfiling.cpp,v 1.3 2016/03/18 07:37:38 dbj Exp $
+$NetBSD: patch-Source_JavaScriptCore_tools_CodeProfiling.cpp,v 1.4 2018/01/17 19:37:33 markd Exp $
 
 * Add NetBSD support
 
---- Source/JavaScriptCore/tools/CodeProfiling.cpp.orig	2015-10-13 04:37:12.000000000 +0000
+--- Source/JavaScriptCore/tools/CodeProfiling.cpp.orig	2017-06-04 20:16:06.000000000 +0000
 +++ Source/JavaScriptCore/tools/CodeProfiling.cpp
 @@ -33,7 +33,7 @@
  #include <signal.h>
  #endif
  
--#if OS(LINUX)
-+#if OS(LINUX) || OS(NETBSD)
+-#if OS(LINUX) || OS(DARWIN)
++#if OS(LINUX) || OS(DARWIN) || OS(NETBSD)
  #include <sys/time.h>
  #endif
  
@@ -17,8 +17,8 @@ $NetBSD: patch-Source_JavaScriptCore_tools_CodeProfiling.cpp,v 1.3 2016/03/18 07
  #pragma clang diagnostic ignored "-Wmissing-noreturn"
  #endif
  
--#if (PLATFORM(MAC) && CPU(X86_64)) || (OS(LINUX) && CPU(X86) && !OS(ANDROID))
-+#if (PLATFORM(MAC) && CPU(X86_64)) || ((OS(LINUX) || OS(NETBSD)) && CPU(X86) && !OS(ANDROID))
+-#if (OS(DARWIN) && !PLATFORM(EFL) && !PLATFORM(GTK) && CPU(X86_64)) || (OS(LINUX) && CPU(X86))
++#if (OS(DARWIN) && !PLATFORM(EFL) && !PLATFORM(GTK) && CPU(X86_64)) || ((OS(LINUX) || OS(NETBSD)) && CPU(X86))
  // Helper function to start & stop the timer.
  // Presently we're using the wall-clock timer, since this seems to give the best results.
  static void setProfileTimer(unsigned usec)
@@ -36,12 +36,12 @@ $NetBSD: patch-Source_JavaScriptCore_tools_CodeProfiling.cpp,v 1.3 2016/03/18 07
  #endif
  
  // Callback triggered when the timer is fired.
-@@ -143,7 +150,7 @@ void CodeProfiling::begin(const SourceCo
+@@ -141,7 +148,7 @@ void CodeProfiling::begin(const SourceCo
      if (alreadyProfiling)
          return;
  
--#if (PLATFORM(MAC) && CPU(X86_64)) || (OS(LINUX) && CPU(X86) && !OS(ANDROID))
-+#if (PLATFORM(MAC) && CPU(X86_64)) || ((OS(LINUX) || OS(NETBSD)) && CPU(X86) && !OS(ANDROID))
+-#if (OS(DARWIN) && !PLATFORM(EFL) && !PLATFORM(GTK) && CPU(X86_64)) || (OS(LINUX) && CPU(X86))
++#if (OS(DARWIN) && !PLATFORM(EFL) && !PLATFORM(GTK) && CPU(X86_64)) || ((OS(LINUX) || OS(NETBSD)) && CPU(X86))
      // Regsiter a signal handler & itimer.
      struct sigaction action;
      action.sa_sigaction = reinterpret_cast<void (*)(int, siginfo_t *, void *)>(profilingTimer);
diff --git a/x11/qt5-qtwebkit/patches/patch-Source_QtWebKit.pro b/x11/qt5-qtwebkit/patches/patch-Source_QtWebKit.pro
deleted file mode 100644
index 462d383500d..00000000000
--- a/x11/qt5-qtwebkit/patches/patch-Source_QtWebKit.pro
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-Source_QtWebKit.pro,v 1.1 2014/12/30 17:23:47 adam Exp $
-
-* Make all libraries as shared
-* Do not build examples
-
---- Source/QtWebKit.pro.orig	2014-09-11 10:48:24.000000000 +0000
-+++ Source/QtWebKit.pro
-@@ -5,7 +5,7 @@
- # -------------------------------------------------------------------
- 
- TEMPLATE = subdirs
--CONFIG += ordered
-+CONFIG += ordered force_static_libs_as_shared
- 
- api.file = api.pri
- SUBDIRS += api
-@@ -39,8 +39,4 @@ build?(webkit1) {
-         SUBDIRS += tests
-     }
- 
--    examples.file = WebKit/qt/examples/examples.pro
--    examples.CONFIG += no_default_target
--    examples.makefile = Makefile
--    SUBDIRS += examples
- }
diff --git a/x11/qt5-qtwebkit/patches/patch-Source_ThirdParty_ANGLE_Target.pri b/x11/qt5-qtwebkit/patches/patch-Source_ThirdParty_ANGLE_Target.pri
deleted file mode 100644
index 1387ceddcf7..00000000000
--- a/x11/qt5-qtwebkit/patches/patch-Source_ThirdParty_ANGLE_Target.pri
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-Source_ThirdParty_ANGLE_Target.pri,v 1.1 2014/12/30 17:23:47 adam Exp $
-
-* Libtoolized
-* Install libANGLE library
-
---- Source/ThirdParty/ANGLE/Target.pri.orig	2013-11-27 01:01:50.000000000 +0000
-+++ Source/ThirdParty/ANGLE/Target.pri
-@@ -9,7 +9,10 @@ TARGET = ANGLE
- 
- include(ANGLE.pri)
- 
--CONFIG += staticlib
-+#CONFIG += staticlib
-+
-+target.path = $$[QT_INSTALL_LIBS]
-+INSTALLS += target
- 
- INCLUDEPATH += \
-     $$SOURCE_DIR/src \
diff --git a/x11/qt5-qtwebkit/patches/patch-Source_ThirdParty_ANGLE_src_compiler_glslang.y b/x11/qt5-qtwebkit/patches/patch-Source_ThirdParty_ANGLE_src_compiler_glslang.y
deleted file mode 100644
index 3f6c5826708..00000000000
--- a/x11/qt5-qtwebkit/patches/patch-Source_ThirdParty_ANGLE_src_compiler_glslang.y
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-Source_ThirdParty_ANGLE_src_compiler_glslang.y,v 1.1 2014/12/30 17:23:47 adam Exp $
-
-* Fix build with bison 3
-
---- Source/ThirdParty/ANGLE/src/compiler/glslang.y.orig	2013-11-27 01:01:50.000000000 +0000
-+++ Source/ThirdParty/ANGLE/src/compiler/glslang.y
-@@ -47,7 +47,7 @@ WHICH GENERATES THE GLSL ES PARSER (glsl
- %pure-parser
- %parse-param {TParseContext* context}
- %locations
--%lex-param {YYLEX_PARAM}
-+%lex-param {TParseContext* context}
- 
- %union {
- #define YYLTYPE TSourceLoc
diff --git a/x11/qt5-qtwebkit/patches/patch-Source_ThirdParty_ANGLE_src_compiler_osinclude.h b/x11/qt5-qtwebkit/patches/patch-Source_ThirdParty_ANGLE_src_compiler_osinclude.h
deleted file mode 100644
index 1154268e8c5..00000000000
--- a/x11/qt5-qtwebkit/patches/patch-Source_ThirdParty_ANGLE_src_compiler_osinclude.h
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-Source_ThirdParty_ANGLE_src_compiler_osinclude.h,v 1.1 2014/12/30 17:23:47 adam Exp $
-
-* Add NetBSD support
-* Add DragonFly support
-
---- Source/ThirdParty/ANGLE/src/compiler/osinclude.h.orig	2013-11-27 01:01:50.000000000 +0000
-+++ Source/ThirdParty/ANGLE/src/compiler/osinclude.h
-@@ -18,7 +18,7 @@
-       defined(__FreeBSD__) || defined(__OpenBSD__) || \
-       defined(__sun) || defined(ANDROID) || \
-       defined(__GLIBC__) || defined(__GNU__) || \
--      defined(__QNX__)
-+      defined(__QNX__) || defined(__NetBSD__) || defined(__DragonFly__)
- #define ANGLE_OS_POSIX
- #else
- #error Unsupported platform.
diff --git a/x11/qt5-qtwebkit/patches/patch-Source_ThirdParty_leveldb_Target.pri b/x11/qt5-qtwebkit/patches/patch-Source_ThirdParty_leveldb_Target.pri
deleted file mode 100644
index ece23e10f08..00000000000
--- a/x11/qt5-qtwebkit/patches/patch-Source_ThirdParty_leveldb_Target.pri
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-Source_ThirdParty_leveldb_Target.pri,v 1.1 2014/12/30 17:23:47 adam Exp $
-
-Build as shared library.
-
---- Source/ThirdParty/leveldb/Target.pri.orig	2014-11-14 11:29:30.000000000 +0000
-+++ Source/ThirdParty/leveldb/Target.pri
-@@ -9,7 +9,9 @@ TARGET = leveldb
- 
- include(leveldb.pri)
- 
--CONFIG += staticlib
-+#CONFIG += staticlib
-+target.path = $$[QT_INSTALL_LIBS]
-+INSTALLS += target
- 
- HEADERS += \
-     db/builder.h \
diff --git a/x11/qt5-qtwebkit/patches/patch-Source_WTF_WTF.pro b/x11/qt5-qtwebkit/patches/patch-Source_WTF_WTF.pro
deleted file mode 100644
index 7276c5175d1..00000000000
--- a/x11/qt5-qtwebkit/patches/patch-Source_WTF_WTF.pro
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-Source_WTF_WTF.pro,v 1.1 2014/12/30 17:23:47 adam Exp $
-
-* Install libWTF shared library
-
---- Source/WTF/WTF.pro.orig	2014-09-11 10:48:11.000000000 +0000
-+++ Source/WTF/WTF.pro
-@@ -8,7 +8,9 @@ TARGET = WTF
- 
- include(WTF.pri)
- 
--CONFIG += staticlib optimize_full
-+CONFIG += optimize_full
-+target.path = $$[QT_INSTALL_LIBS]
-+INSTALLS += target
- 
- VPATH += $$PWD/wtf
- 
diff --git a/x11/qt5-qtwebkit/patches/patch-Source_WTF_wtf_Assertions.cpp b/x11/qt5-qtwebkit/patches/patch-Source_WTF_wtf_Assertions.cpp
index 38cf640cb4e..45911281e17 100644
--- a/x11/qt5-qtwebkit/patches/patch-Source_WTF_wtf_Assertions.cpp
+++ b/x11/qt5-qtwebkit/patches/patch-Source_WTF_wtf_Assertions.cpp
@@ -1,28 +1,28 @@
-$NetBSD: patch-Source_WTF_wtf_Assertions.cpp,v 1.1 2014/12/30 17:23:47 adam Exp $
+$NetBSD: patch-Source_WTF_wtf_Assertions.cpp,v 1.2 2018/01/17 19:37:33 markd Exp $
 
 * Add NetBSD support
 
---- Source/WTF/wtf/Assertions.cpp.orig	2013-11-27 01:01:21.000000000 +0000
+--- Source/WTF/wtf/Assertions.cpp.orig	2017-06-04 20:16:06.000000000 +0000
 +++ Source/WTF/wtf/Assertions.cpp
-@@ -61,7 +61,7 @@
- #include <windows.h>
+@@ -68,7 +68,7 @@
+ #include <unistd.h>
  #endif
  
--#if (OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__))) && !OS(ANDROID)
-+#if (OS(DARWIN) || OS(NETBSD) || (OS(LINUX) && !defined(__UCLIBC__))) && !OS(ANDROID)
+-#if OS(DARWIN) || (OS(LINUX) && defined(__GLIBC__) && !defined(__UCLIBC__))
++#if OS(DARWIN) || OS(NETBSD) || (OS(LINUX) && defined(__GLIBC__) && !defined(__UCLIBC__))
  #include <cxxabi.h>
  #include <dlfcn.h>
  #include <execinfo.h>
-@@ -245,7 +245,7 @@ void WTFReportArgumentAssertionFailure(c
+@@ -225,7 +225,7 @@ void WTFReportArgumentAssertionFailure(c
  
  void WTFGetBacktrace(void** stack, int* size)
  {
--#if (OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__))) && !OS(ANDROID)
-+#if (OS(DARWIN) || (OS_NETBSD) || (OS(LINUX) && !defined(__UCLIBC__))) && !OS(ANDROID)
+-#if OS(DARWIN) || (OS(LINUX) && defined(__GLIBC__) && !defined(__UCLIBC__))
++#if OS(DARWIN) || OS(NETBSD) || (OS(LINUX) && defined(__GLIBC__) && !defined(__UCLIBC__))
      *size = backtrace(stack, *size);
- #elif OS(WINDOWS) && !OS(WINCE)
+ #elif OS(WINDOWS)
      // The CaptureStackBackTrace function is available in XP, but it is not defined
-@@ -279,7 +279,7 @@ void WTFReportBacktrace()
+@@ -259,7 +259,7 @@ void WTFReportBacktrace()
      WTFPrintBacktrace(samples + framesToSkip, frames - framesToSkip);
  }
  
@@ -30,4 +30,4 @@ $NetBSD: patch-Source_WTF_wtf_Assertions.cpp,v 1.1 2014/12/30 17:23:47 adam Exp
 +#if OS(DARWIN) || OS(LINUX) || OS(NETBSD)
  #  if PLATFORM(QT) || PLATFORM(GTK)
  #    if defined(__GLIBC__) && !defined(__UCLIBC__)
- #      define WTF_USE_BACKTRACE_SYMBOLS 1
+ #      define USE_BACKTRACE_SYMBOLS 1
diff --git a/x11/qt5-qtwebkit/patches/patch-Source_WTF_wtf_Compiler.h b/x11/qt5-qtwebkit/patches/patch-Source_WTF_wtf_Compiler.h
deleted file mode 100644
index 6e46f90b565..00000000000
--- a/x11/qt5-qtwebkit/patches/patch-Source_WTF_wtf_Compiler.h
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-Source_WTF_wtf_Compiler.h,v 1.1 2017/04/26 10:27:43 wiz Exp $
-
-Fix build with icu-59.
-https://bugreports.qt.io/browse/QTBUG-35971
-
---- Source/WTF/wtf/Compiler.h.orig	2015-10-13 04:37:08.000000000 +0000
-+++ Source/WTF/wtf/Compiler.h
-@@ -61,6 +61,7 @@
- #define WTF_COMPILER_SUPPORTS_HAS_TRIVIAL_DESTRUCTOR __has_feature(has_trivial_destructor)
- #define WTF_COMPILER_SUPPORTS_CXX_STRONG_ENUMS __has_feature(cxx_strong_enums)
- #define WTF_COMPILER_SUPPORTS_CXX_REFERENCE_QUALIFIED_FUNCTIONS __has_feature(cxx_reference_qualified_functions)
-+#define WTF_COMPILER_SUPPORTS_CXX_NEW_CHAR_TYPES !defined(_LIBCPP_HAS_NO_UNICODE_CHARS)
- 
- #endif
- 
-@@ -142,6 +143,7 @@
- #define WTF_COMPILER_SUPPORTS_CXX_DELETED_FUNCTIONS 1
- #endif
- #if GCC_VERSION_AT_LEAST(4, 5, 0)
-+#define WTF_COMPILER_SUPPORTS_CXX_NEW_CHAR_TYPES 1
- #define WTF_COMPILER_SUPPORTS_CXX_EXPLICIT_CONVERSIONS 1
- #endif
- #if GCC_VERSION_AT_LEAST(4, 6, 0)
diff --git a/x11/qt5-qtwebkit/patches/patch-Source_WTF_wtf_MathExtras.h b/x11/qt5-qtwebkit/patches/patch-Source_WTF_wtf_MathExtras.h
index b7b1bd3c0d9..f65a28c5b40 100644
--- a/x11/qt5-qtwebkit/patches/patch-Source_WTF_wtf_MathExtras.h
+++ b/x11/qt5-qtwebkit/patches/patch-Source_WTF_wtf_MathExtras.h
@@ -1,11 +1,11 @@
-$NetBSD: patch-Source_WTF_wtf_MathExtras.h,v 1.1 2016/07/22 10:14:17 jperkin Exp $
+$NetBSD: patch-Source_WTF_wtf_MathExtras.h,v 1.2 2018/01/17 19:37:33 markd Exp $
 
 Fix SunOS build.
 
---- Source/WTF/wtf/MathExtras.h.orig	2015-10-13 04:37:09.000000000 +0000
+--- Source/WTF/wtf/MathExtras.h.orig	2017-06-04 20:16:06.000000000 +0000
 +++ Source/WTF/wtf/MathExtras.h
-@@ -88,7 +88,7 @@ inline double wtf_ceil(double x) { retur
- 
+@@ -75,7 +75,7 @@ const double sqrtOfTwoDouble = M_SQRT2;
+ const float sqrtOfTwoFloat = static_cast<float>(M_SQRT2);
  #endif
  
 -#if OS(SOLARIS)
diff --git a/x11/qt5-qtwebkit/patches/patch-Source_WTF_wtf_NumberOfCores.cpp b/x11/qt5-qtwebkit/patches/patch-Source_WTF_wtf_NumberOfCores.cpp
deleted file mode 100644
index 980eb4149d9..00000000000
--- a/x11/qt5-qtwebkit/patches/patch-Source_WTF_wtf_NumberOfCores.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-Source_WTF_wtf_NumberOfCores.cpp,v 1.1 2014/12/30 17:23:47 adam Exp $
-
-* Add NetBSD support
-
---- Source/WTF/wtf/NumberOfCores.cpp.orig	2013-12-08 17:09:59.000000000 +0000
-+++ Source/WTF/wtf/NumberOfCores.cpp
-@@ -32,6 +32,7 @@
- // data types defined in the former. See sysctl(3) and style(9).
- #include <sys/types.h>
- #include <sys/sysctl.h>
-+#include <unistd.h>
- #elif OS(LINUX) || OS(AIX) || OS(SOLARIS)
- #include <unistd.h>
- #elif OS(WINDOWS)
-@@ -50,7 +51,7 @@ int numberOfProcessorCores()
-     if (s_numberOfCores > 0)
-         return s_numberOfCores;
- 
--#if OS(DARWIN) || OS(OPENBSD) || OS(NETBSD) || OS(FREEBSD)
-+#if OS(DARWIN) || OS(OPENBSD) || OS(FREEBSD)
-     unsigned result;
-     size_t length = sizeof(result);
-     int name[] = {
-@@ -60,7 +61,7 @@ int numberOfProcessorCores()
-     int sysctlResult = sysctl(name, sizeof(name) / sizeof(int), &result, &length, 0, 0);
- 
-     s_numberOfCores = sysctlResult < 0 ? defaultIfUnavailable : result;
--#elif OS(LINUX) || OS(AIX) || OS(SOLARIS)
-+#elif OS(LINUX) || OS(AIX) || OS(SOLARIS) || OS(NETBSD)
-     long sysconfResult = sysconf(_SC_NPROCESSORS_ONLN);
- 
-     s_numberOfCores = sysconfResult < 0 ? defaultIfUnavailable : static_cast<int>(sysconfResult);
diff --git a/x11/qt5-qtwebkit/patches/patch-Source_WTF_wtf_Platform.h b/x11/qt5-qtwebkit/patches/patch-Source_WTF_wtf_Platform.h
index dc66e90de7d..9a0818a7762 100644
--- a/x11/qt5-qtwebkit/patches/patch-Source_WTF_wtf_Platform.h
+++ b/x11/qt5-qtwebkit/patches/patch-Source_WTF_wtf_Platform.h
@@ -1,4 +1,4 @@
-$NetBSD: patch-Source_WTF_wtf_Platform.h,v 1.2 2015/08/30 09:56:45 markd Exp $
+$NetBSD: patch-Source_WTF_wtf_Platform.h,v 1.3 2018/01/17 19:37:33 markd Exp $
 
 * Disable JIT support for NetBSD, fix segfault of qtwebkit consumers
 * Use system's malloc for NetBSD, do not use fastmalloc from qt5,
@@ -6,7 +6,8 @@ $NetBSD: patch-Source_WTF_wtf_Platform.h,v 1.2 2015/08/30 09:56:45 markd Exp $
 
 * Disable DISASSEMBLER on Linux. Unresolved symbols as not building
   UDis86Disassembler.cpp for some reason.
---- Source/WTF/wtf/Platform.h.orig	2013-11-27 01:01:21.000000000 +0000
+
+--- Source/WTF/wtf/Platform.h.orig	2017-06-04 20:16:06.000000000 +0000
 +++ Source/WTF/wtf/Platform.h
 @@ -36,6 +36,9 @@
     macros, policy decision macros, and top-level port definitions. ==== */
@@ -18,26 +19,27 @@ $NetBSD: patch-Source_WTF_wtf_Platform.h,v 1.2 2015/08/30 09:56:45 markd Exp $
  
  /* ==== Platform adaptation macros: these describe properties of the target environment. ==== */
  
-@@ -694,6 +697,11 @@
- #endif
+@@ -691,6 +694,12 @@
+ #define USE_SYSTEM_MALLOC 1
  #endif
  
 +/* Workaround an issue with fastMalloc on NetBSD */
 +#if OS(NETBSD)
 +#define USE_SYSTEM_MALLOC 1
++#define ENABLE_ASSEMBLER 1
 +#endif
 +
- #if PLATFORM(EFL)
- #define ENABLE_GLOBAL_FASTMALLOC_NEW 0
- #endif
-@@ -804,6 +812,10 @@
- #define WTF_USE_ARMV7_DISASSEMBLER 1
+ #define ENABLE_DEBUG_WITH_BREAKPOINT 0
+ #define ENABLE_SAMPLING_COUNTERS 0
+ #define ENABLE_SAMPLING_FLAGS 0
+@@ -746,6 +754,10 @@
+ #define USE_UDIS86 1
  #endif
  
 +#if OS(LINUX)
 +#define ENABLE_DISASSEMBLER 0
 +#endif
 +
- #if !defined(ENABLE_DISASSEMBLER) && (USE(UDIS86) || USE(ARMV7_DISASSEMBLER))
+ #if !defined(ENABLE_DISASSEMBLER) && USE(UDIS86)
  #define ENABLE_DISASSEMBLER 1
  #endif
diff --git a/x11/qt5-qtwebkit/patches/patch-Source_WTF_wtf_RAMSize.cpp b/x11/qt5-qtwebkit/patches/patch-Source_WTF_wtf_RAMSize.cpp
deleted file mode 100644
index 7a4209bb140..00000000000
--- a/x11/qt5-qtwebkit/patches/patch-Source_WTF_wtf_RAMSize.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-Source_WTF_wtf_RAMSize.cpp,v 1.1 2014/12/30 17:23:47 adam Exp $
-
-* Add NetBSD support
-
---- Source/WTF/wtf/RAMSize.cpp.orig	2013-11-27 01:01:20.000000000 +0000
-+++ Source/WTF/wtf/RAMSize.cpp
-@@ -27,7 +27,7 @@
- #include "RAMSize.h"
- 
- #include "StdLibExtras.h"
--#if OS(DARWIN)
-+#if OS(DARWIN) || OS(NETBSD)
- #include <sys/param.h>
- #include <sys/types.h>
- #include <sys/sysctl.h>
-@@ -45,13 +45,17 @@ static const size_t ramSizeGuess = 128 *
- 
- static size_t computeRAMSize()
- {
--#if OS(DARWIN)
-+#if OS(DARWIN) || OS(NETBSD)
-     int mib[2];
-     uint64_t ramSize;
-     size_t length;
- 
-     mib[0] = CTL_HW;
-+#if OS(DARWIN)
-     mib[1] = HW_MEMSIZE;
-+#else
-+    mib[1] = HW_PHYSMEM64;
-+#endif
-     length = sizeof(int64_t);
-     int sysctlResult = sysctl(mib, 2, &ramSize, &length, 0, 0);
-     if (sysctlResult == -1)
diff --git a/x11/qt5-qtwebkit/patches/patch-Source_WTF_wtf_ThreadIdentifierDataPthreads.cpp b/x11/qt5-qtwebkit/patches/patch-Source_WTF_wtf_ThreadIdentifierDataPthreads.cpp
index 42fa68f575a..3a30e7a0440 100644
--- a/x11/qt5-qtwebkit/patches/patch-Source_WTF_wtf_ThreadIdentifierDataPthreads.cpp
+++ b/x11/qt5-qtwebkit/patches/patch-Source_WTF_wtf_ThreadIdentifierDataPthreads.cpp
@@ -1,11 +1,11 @@
-$NetBSD: patch-Source_WTF_wtf_ThreadIdentifierDataPthreads.cpp,v 1.1 2014/12/30 17:23:47 adam Exp $
+$NetBSD: patch-Source_WTF_wtf_ThreadIdentifierDataPthreads.cpp,v 1.2 2018/01/17 19:37:33 markd Exp $
 
 * Add NetBSD support
 
---- Source/WTF/wtf/ThreadIdentifierDataPthreads.cpp.orig	2013-11-27 01:01:20.000000000 +0000
+--- Source/WTF/wtf/ThreadIdentifierDataPthreads.cpp.orig	2017-06-04 20:16:06.000000000 +0000
 +++ Source/WTF/wtf/ThreadIdentifierDataPthreads.cpp
 @@ -39,6 +39,12 @@
- #if OS(ANDROID) || OS(HURD)
+ #if OS(HURD)
  // PTHREAD_KEYS_MAX is not defined in bionic nor in Hurd, so explicitly define it here.
  #define PTHREAD_KEYS_MAX 1024
 +#elif OS(NETBSD)
diff --git a/x11/qt5-qtwebkit/patches/patch-Source_WTF_wtf_Threading.h b/x11/qt5-qtwebkit/patches/patch-Source_WTF_wtf_Threading.h
deleted file mode 100644
index 5d0314445c1..00000000000
--- a/x11/qt5-qtwebkit/patches/patch-Source_WTF_wtf_Threading.h
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-Source_WTF_wtf_Threading.h,v 1.1 2014/12/30 17:23:47 adam Exp $
-
-* Add Solaris/SunOS support
-
---- Source/WTF/wtf/Threading.h.orig	2013-11-27 01:01:21.000000000 +0000
-+++ Source/WTF/wtf/Threading.h
-@@ -112,6 +112,8 @@ using WTF::createThread;
- using WTF::currentThread;
- using WTF::detachThread;
- using WTF::waitForThreadCompletion;
-+#if !OS(SOLARIS)
- using WTF::yield;
-+#endif
- 
- #endif // Threading_h
diff --git a/x11/qt5-qtwebkit/patches/patch-Source_WTF_wtf_TypeTraits.h b/x11/qt5-qtwebkit/patches/patch-Source_WTF_wtf_TypeTraits.h
deleted file mode 100644
index 54d3b58c571..00000000000
--- a/x11/qt5-qtwebkit/patches/patch-Source_WTF_wtf_TypeTraits.h
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-Source_WTF_wtf_TypeTraits.h,v 1.1 2017/04/26 10:27:43 wiz Exp $
-
-Fix build with icu-59.
-https://bugreports.qt.io/browse/QTBUG-35971
-
---- Source/WTF/wtf/TypeTraits.h.orig	2015-10-13 04:37:08.000000000 +0000
-+++ Source/WTF/wtf/TypeTraits.h
-@@ -75,6 +75,10 @@ namespace WTF {
- #if !COMPILER(MSVC) || defined(_NATIVE_WCHAR_T_DEFINED)
-     template<> struct IsInteger<wchar_t>            { static const bool value = true; };
- #endif
-+#if COMPILER_SUPPORTS(CXX_NEW_CHAR_TYPES)
-+    template<> struct IsInteger<char16_t>           { static const bool value = true; };
-+    template<> struct IsInteger<char32_t>           { static const bool value = true; };
-+#endif
- 
-     template<typename T> struct IsFloatingPoint     { static const bool value = false; };
-     template<> struct IsFloatingPoint<float>        { static const bool value = true; };
diff --git a/x11/qt5-qtwebkit/patches/patch-Source_WTF_wtf_text_StringImpl.h b/x11/qt5-qtwebkit/patches/patch-Source_WTF_wtf_text_StringImpl.h
deleted file mode 100644
index 2db83b157fe..00000000000
--- a/x11/qt5-qtwebkit/patches/patch-Source_WTF_wtf_text_StringImpl.h
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-Source_WTF_wtf_text_StringImpl.h,v 1.1 2014/12/30 17:23:47 adam Exp $
-
---- Source/WTF/wtf/text/StringImpl.h.orig	2013-11-27 01:01:21.000000000 +0000
-+++ Source/WTF/wtf/text/StringImpl.h
-@@ -24,6 +24,7 @@
- #define StringImpl_h
- 
- #include <limits.h>
-+#include <unistd.h>
- #include <wtf/ASCIICType.h>
- #include <wtf/Forward.h>
- #include <wtf/StdLibExtras.h>
diff --git a/x11/qt5-qtwebkit/patches/patch-Source_WebCore_Target.pri b/x11/qt5-qtwebkit/patches/patch-Source_WebCore_Target.pri
deleted file mode 100644
index 5ae1886ba7f..00000000000
--- a/x11/qt5-qtwebkit/patches/patch-Source_WebCore_Target.pri
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-Source_WebCore_Target.pri,v 1.1 2014/12/30 17:23:47 adam Exp $
-
-* Build libWebCore with libtool
-* Install libWebCore libraries
-
---- Source/WebCore/Target.pri.orig	2013-11-27 01:01:46.000000000 +0000
-+++ Source/WebCore/Target.pri
-@@ -12,7 +12,8 @@ include(WebCore.pri)
- WEBKIT += wtf
- WEBKIT += javascriptcore
- 
--CONFIG += staticlib
-+target.path = $$[QT_INSTALL_LIBS]
-+INSTALLS += target
- 
- # Do it in the WebCore static lib to support force_static_libs_as_shared
- # since the QtWebKitWidgets lib wouldn't load QtWebKit in that case.
diff --git a/x11/qt5-qtwebkit/patches/patch-Source_WebCore_bindings_js_JSInspectorFrontendHostCustom.cpp b/x11/qt5-qtwebkit/patches/patch-Source_WebCore_bindings_js_JSInspectorFrontendHostCustom.cpp
deleted file mode 100644
index be5b38c2dd7..00000000000
--- a/x11/qt5-qtwebkit/patches/patch-Source_WebCore_bindings_js_JSInspectorFrontendHostCustom.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-Source_WebCore_bindings_js_JSInspectorFrontendHostCustom.cpp,v 1.1 2014/12/30 17:23:48 adam Exp $
-
-* Add NetBSD support
-
---- Source/WebCore/bindings/js/JSInspectorFrontendHostCustom.cpp.orig	2013-11-27 01:01:47.000000000 +0000
-+++ Source/WebCore/bindings/js/JSInspectorFrontendHostCustom.cpp
-@@ -63,6 +63,8 @@ JSValue JSInspectorFrontendHost::platfor
-     DEFINE_STATIC_LOCAL(const String, platform, (ASCIILiteral("freebsd")));
- #elif OS(OPENBSD)
-     DEFINE_STATIC_LOCAL(const String, platform, (ASCIILiteral("openbsd")));
-+#elif OS(NETBSD)
-+    DEFINE_STATIC_LOCAL(const String, platform, (ASCIILiteral("netbsd")));
- #elif OS(SOLARIS)
-     DEFINE_STATIC_LOCAL(const String, platform, (ASCIILiteral("solaris")));
- #else
diff --git a/x11/qt5-qtwebkit/patches/patch-Source_WebCore_editing_Editor.h b/x11/qt5-qtwebkit/patches/patch-Source_WebCore_editing_Editor.h
deleted file mode 100644
index 2d94a144855..00000000000
--- a/x11/qt5-qtwebkit/patches/patch-Source_WebCore_editing_Editor.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-Source_WebCore_editing_Editor.h,v 1.1 2014/12/30 17:23:48 adam Exp $
-
---- Source/WebCore/editing/Editor.h.orig	2013-11-27 01:01:43.000000000 +0000
-+++ Source/WebCore/editing/Editor.h
-@@ -416,7 +416,7 @@ public:
-     Vector<String> dictationAlternativesForMarker(const DocumentMarker*);
-     void applyDictationAlternativelternative(const String& alternativeString);
- private:
--    virtual void willDetachPage() OVERRIDE;
-+    virtual void willDetachPage();
- 
- #if ENABLE(DELETION_UI)
-     OwnPtr<DeleteButtonController> m_deleteButtonController;
diff --git a/x11/qt5-qtwebkit/patches/patch-Source_WebCore_page_NavigatorBase.cpp b/x11/qt5-qtwebkit/patches/patch-Source_WebCore_page_NavigatorBase.cpp
index bb6a6fcddef..09ed5d44ea2 100644
--- a/x11/qt5-qtwebkit/patches/patch-Source_WebCore_page_NavigatorBase.cpp
+++ b/x11/qt5-qtwebkit/patches/patch-Source_WebCore_page_NavigatorBase.cpp
@@ -1,11 +1,11 @@
-$NetBSD: patch-Source_WebCore_page_NavigatorBase.cpp,v 1.1 2014/12/30 17:23:48 adam Exp $
+$NetBSD: patch-Source_WebCore_page_NavigatorBase.cpp,v 1.2 2018/01/17 19:37:33 markd Exp $
 
 * Treat *BSD like Linux
 
---- Source/WebCore/page/NavigatorBase.cpp.orig	2013-11-27 01:01:47.000000000 +0000
+--- Source/WebCore/page/NavigatorBase.cpp.orig	2017-06-04 20:16:06.000000000 +0000
 +++ Source/WebCore/page/NavigatorBase.cpp
-@@ -30,7 +30,7 @@
- #include "NetworkStateNotifier.h"
+@@ -31,7 +31,7 @@
+ #include <wtf/NeverDestroyed.h>
  #include <wtf/text/WTFString.h>
  
 -#if OS(LINUX)
@@ -13,7 +13,7 @@ $NetBSD: patch-Source_WebCore_page_NavigatorBase.cpp,v 1.1 2014/12/30 17:23:48 a
  #include "sys/utsname.h"
  #include <wtf/StdLibExtras.h>
  #endif
-@@ -86,7 +86,7 @@ String NavigatorBase::appVersion() const
+@@ -90,7 +90,7 @@ String NavigatorBase::appVersion() const
  
  String NavigatorBase::platform() const
  {
diff --git a/x11/qt5-qtwebkit/patches/patch-Source_WebCore_platform_graphics_surfaces_mac_GraphicsSurfaceMac.cpp b/x11/qt5-qtwebkit/patches/patch-Source_WebCore_platform_graphics_surfaces_mac_GraphicsSurfaceMac.cpp
deleted file mode 100644
index 1a3fd00d6a6..00000000000
--- a/x11/qt5-qtwebkit/patches/patch-Source_WebCore_platform_graphics_surfaces_mac_GraphicsSurfaceMac.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-Source_WebCore_platform_graphics_surfaces_mac_GraphicsSurfaceMac.cpp,v 1.1 2014/12/30 17:23:48 adam Exp $
-
-Correct includes.
-
---- Source/WebCore/platform/graphics/surfaces/mac/GraphicsSurfaceMac.cpp.orig	2014-04-22 06:24:40.000000000 +0000
-+++ Source/WebCore/platform/graphics/surfaces/mac/GraphicsSurfaceMac.cpp
-@@ -23,9 +23,9 @@
- #if USE(GRAPHICS_SURFACE) && OS(DARWIN)
- #include "TextureMapperGL.h"
- #include <CoreFoundation/CFNumber.h>
--#include <CGLContext.h>
--#include <CGLCurrent.h>
--#include <CGLIOSurface.h>
-+#include <OpenGL/CGLContext.h>
-+#include <OpenGL/CGLCurrent.h>
-+#include <OpenGL/CGLIOSurface.h>
- #include <IOSurface/IOSurface.h>
- #include <OpenGL/OpenGL.h>
- #include <OpenGL/gl.h>
diff --git a/x11/qt5-qtwebkit/patches/patch-Source_WebCore_platform_sql_SQLiteDatabase.cpp b/x11/qt5-qtwebkit/patches/patch-Source_WebCore_platform_sql_SQLiteDatabase.cpp
deleted file mode 100644
index 247f4cc54d9..00000000000
--- a/x11/qt5-qtwebkit/patches/patch-Source_WebCore_platform_sql_SQLiteDatabase.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-Source_WebCore_platform_sql_SQLiteDatabase.cpp,v 1.1 2014/12/30 17:23:48 adam Exp $
-
---- Source/WebCore/platform/sql/SQLiteDatabase.cpp.orig	2013-11-27 01:01:43.000000000 +0000
-+++ Source/WebCore/platform/sql/SQLiteDatabase.cpp
-@@ -127,7 +127,7 @@ void SQLiteDatabase::interrupt()
-         if (!m_db)
-             return;
-         sqlite3_interrupt(m_db);
--        yield();
-+        WTF::yield();
-     }
- 
-     m_lockingMutex.unlock();
diff --git a/x11/qt5-qtwebkit/patches/patch-Source_WebKit2_DerivedSources.pri b/x11/qt5-qtwebkit/patches/patch-Source_WebKit2_DerivedSources.pri
deleted file mode 100644
index cf5ebf7b7d7..00000000000
--- a/x11/qt5-qtwebkit/patches/patch-Source_WebKit2_DerivedSources.pri
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-Source_WebKit2_DerivedSources.pri,v 1.1 2014/12/30 17:23:48 adam Exp $
-
-* Fix build from the lack of many headers, this is ugly hack
-
---- Source/WebKit2/DerivedSources.pri.orig	2013-11-27 01:01:50.000000000 +0000
-+++ Source/WebKit2/DerivedSources.pri
-@@ -4,6 +4,9 @@
- # See 'Tools/qmake/README' for an overview of the build system
- # -------------------------------------------------------------------
- 
-+# XXX Workaround for the lack of invocation of fwheader_generator target.
-+ALL_DEPS += fwheader_generator
-+
- # This file is both a top level target, and included from Target.pri,
- # so that the resulting generated sources can be added to SOURCES.
- # We only set the template if we're a top level target, so that we
diff --git a/x11/qt5-qtwebkit/patches/patch-Source_WebKit2_Platform_CoreIPC_MessageDecoder.cpp b/x11/qt5-qtwebkit/patches/patch-Source_WebKit2_Platform_CoreIPC_MessageDecoder.cpp
deleted file mode 100644
index 1268cee0412..00000000000
--- a/x11/qt5-qtwebkit/patches/patch-Source_WebKit2_Platform_CoreIPC_MessageDecoder.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-Source_WebKit2_Platform_CoreIPC_MessageDecoder.cpp,v 1.1 2014/12/30 17:23:48 adam Exp $
-
---- Source/WebKit2/Platform/CoreIPC/MessageDecoder.cpp.orig	2014-04-22 06:58:04.000000000 +0000
-+++ Source/WebKit2/Platform/CoreIPC/MessageDecoder.cpp
-@@ -31,7 +31,7 @@
- #include "MessageFlags.h"
- #include "StringReference.h"
- 
--#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
-+#if defined(Q_OS_MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
- #include "ImportanceAssertion.h"
- #endif
- 
-@@ -77,7 +77,7 @@ bool MessageDecoder::shouldDispatchMessa
-     return m_messageFlags & DispatchMessageWhenWaitingForSyncReply;
- }
- 
--#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
-+#if defined(Q_OS_MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
- void MessageDecoder::setImportanceAssertion(PassOwnPtr<ImportanceAssertion> assertion)
- {
-     m_importanceAssertion = assertion;
diff --git a/x11/qt5-qtwebkit/patches/patch-Source_WebKit2_Platform_CoreIPC_MessageDecoder.h b/x11/qt5-qtwebkit/patches/patch-Source_WebKit2_Platform_CoreIPC_MessageDecoder.h
deleted file mode 100644
index 2ab4226229c..00000000000
--- a/x11/qt5-qtwebkit/patches/patch-Source_WebKit2_Platform_CoreIPC_MessageDecoder.h
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-Source_WebKit2_Platform_CoreIPC_MessageDecoder.h,v 1.1 2014/12/30 17:23:48 adam Exp $
-
---- Source/WebKit2/Platform/CoreIPC/MessageDecoder.h.orig	2014-04-22 06:56:09.000000000 +0000
-+++ Source/WebKit2/Platform/CoreIPC/MessageDecoder.h
-@@ -46,7 +46,7 @@ public:
-     bool isSyncMessage() const;
-     bool shouldDispatchMessageWhenWaitingForSyncReply() const;
- 
--#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
-+#if defined(Q_OS_MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
-     void setImportanceAssertion(PassOwnPtr<ImportanceAssertion>);
- #endif
- 
-@@ -57,7 +57,7 @@ private:
-     StringReference m_messageReceiverName;
-     StringReference m_messageName;
- 
--#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
-+#if defined(Q_OS_MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
-     OwnPtr<ImportanceAssertion> m_importanceAssertion;
- #endif
- };
diff --git a/x11/qt5-qtwebkit/patches/patch-Source_WebKit2_Platform_unix_SharedMemoryUnix.cpp b/x11/qt5-qtwebkit/patches/patch-Source_WebKit2_Platform_unix_SharedMemoryUnix.cpp
index 580505373cb..121d354adee 100644
--- a/x11/qt5-qtwebkit/patches/patch-Source_WebKit2_Platform_unix_SharedMemoryUnix.cpp
+++ b/x11/qt5-qtwebkit/patches/patch-Source_WebKit2_Platform_unix_SharedMemoryUnix.cpp
@@ -1,11 +1,11 @@
-$NetBSD: patch-Source_WebKit2_Platform_unix_SharedMemoryUnix.cpp,v 1.1 2014/12/30 17:23:48 adam Exp $
+$NetBSD: patch-Source_WebKit2_Platform_unix_SharedMemoryUnix.cpp,v 1.2 2018/01/17 19:37:33 markd Exp $
 
 * Try to use /tmp/* file like shared memory, I am not sure.
 
---- Source/WebKit2/Platform/unix/SharedMemoryUnix.cpp.orig	2013-11-27 01:01:51.000000000 +0000
+--- Source/WebKit2/Platform/unix/SharedMemoryUnix.cpp.orig	2017-06-04 20:16:07.000000000 +0000
 +++ Source/WebKit2/Platform/unix/SharedMemoryUnix.cpp
-@@ -139,14 +139,25 @@ PassRefPtr<SharedMemory> SharedMemory::c
- PassRefPtr<SharedMemory> SharedMemory::create(size_t size)
+@@ -96,14 +96,25 @@ void SharedMemory::Handle::adoptAttachme
+ RefPtr<SharedMemory> SharedMemory::allocate(size_t size)
  {
      CString tempName;
 +    CString buf;
@@ -19,7 +19,7 @@ $NetBSD: patch-Source_WebKit2_Platform_unix_SharedMemoryUnix.cpp,v 1.1 2014/12/3
  
          do {
 +#if !defined(__NetBSD__)
-             fileDescriptor = shm_open(tempName.data(), O_CREAT | O_CLOEXEC | O_RDWR, S_IRUSR | S_IWUSR);
+             fileDescriptor = shm_open(tempName.data(), O_CREAT | O_RDWR, S_IRUSR | S_IWUSR);
 +#else
 +            fileDescriptor = open(buf.data(), O_CREAT | O_CLOEXEC | O_RDWR, S_IRUSR | S_IWUSR);
 +            if (fileDescriptor == -1 && errno == EEXIST) {
@@ -30,7 +30,7 @@ $NetBSD: patch-Source_WebKit2_Platform_unix_SharedMemoryUnix.cpp,v 1.1 2014/12/3
          } while (fileDescriptor == -1 && errno == EINTR);
      }
      if (fileDescriptor == -1) {
-@@ -157,7 +168,12 @@ PassRefPtr<SharedMemory> SharedMemory::c
+@@ -114,7 +125,12 @@ RefPtr<SharedMemory> SharedMemory::alloc
      while (ftruncate(fileDescriptor, size) == -1) {
          if (errno != EINTR) {
              closeWithRetry(fileDescriptor);
@@ -43,7 +43,7 @@ $NetBSD: patch-Source_WebKit2_Platform_unix_SharedMemoryUnix.cpp,v 1.1 2014/12/3
              return 0;
          }
      }
-@@ -165,11 +181,21 @@ PassRefPtr<SharedMemory> SharedMemory::c
+@@ -122,11 +138,21 @@ RefPtr<SharedMemory> SharedMemory::alloc
      void* data = mmap(0, size, PROT_READ | PROT_WRITE, MAP_SHARED, fileDescriptor, 0);
      if (data == MAP_FAILED) {
          closeWithRetry(fileDescriptor);
diff --git a/x11/qt5-qtwebkit/patches/patch-Source_WebKit2_Shared_API_c_WKString.cpp b/x11/qt5-qtwebkit/patches/patch-Source_WebKit2_Shared_API_c_WKString.cpp
deleted file mode 100644
index a978b21b3ef..00000000000
--- a/x11/qt5-qtwebkit/patches/patch-Source_WebKit2_Shared_API_c_WKString.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-Source_WebKit2_Shared_API_c_WKString.cpp,v 1.1 2017/04/26 10:27:43 wiz Exp $
-
-Fix build with icu-59.
-
---- Source/WebKit2/Shared/API/c/WKString.cpp.orig	2015-10-13 04:37:12.000000000 +0000
-+++ Source/WebKit2/Shared/API/c/WKString.cpp
-@@ -55,7 +55,7 @@ size_t WKStringGetLength(WKStringRef str
- size_t WKStringGetCharacters(WKStringRef stringRef, WKChar* buffer, size_t bufferLength)
- {
-     COMPILE_ASSERT(sizeof(WKChar) == sizeof(UChar), WKStringGetCharacters_sizeof_WKChar_matches_UChar);
--    return (toImpl(stringRef)->getCharacters(static_cast<UChar*>(buffer), bufferLength));
-+    return (toImpl(stringRef)->getCharacters((UChar*)(buffer), bufferLength));
- }
- 
- size_t WKStringGetMaximumUTF8CStringSize(WKStringRef stringRef)
diff --git a/x11/qt5-qtwebkit/patches/patch-Source_WebKit2_Target.pri b/x11/qt5-qtwebkit/patches/patch-Source_WebKit2_Target.pri
deleted file mode 100644
index d4f25853a2c..00000000000
--- a/x11/qt5-qtwebkit/patches/patch-Source_WebKit2_Target.pri
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-Source_WebKit2_Target.pri,v 1.1 2014/12/30 17:23:48 adam Exp $
-
-* Fix build from the lack of many headers, this is ugly hack
-* Build libWebKit2 with libtool
-* Install libWebKit2 libraries
-
---- Source/WebKit2/Target.pri.orig	2013-11-27 01:01:51.000000000 +0000
-+++ Source/WebKit2/Target.pri
-@@ -7,11 +7,16 @@
- TEMPLATE = lib
- TARGET = WebKit2
- 
-+QMAKE_EXTRA_TARGETS += fwheader_generator
-+
- include(WebKit2.pri)
- 
- WEBKIT += wtf javascriptcore webcore
- 
--CONFIG += staticlib
-+#CONFIG += staticlib
-+
-+target.path = $$[QT_INSTALL_LIBS]
-+INSTALLS += target
- 
- RESOURCES += $$PWD/WebKit2.qrc
- 
diff --git a/x11/qt5-qtwebkit/patches/patch-Source_WebKit_PlatformQt.cmake b/x11/qt5-qtwebkit/patches/patch-Source_WebKit_PlatformQt.cmake
new file mode 100644
index 00000000000..2a5e9dca4ed
--- /dev/null
+++ b/x11/qt5-qtwebkit/patches/patch-Source_WebKit_PlatformQt.cmake
@@ -0,0 +1,22 @@
+$NetBSD: patch-Source_WebKit_PlatformQt.cmake,v 1.1 2018/01/17 19:37:33 markd Exp $
+
+Fix build with CMake 3.10
+
+--- Source/WebKit/PlatformQt.cmake.orig	2017-06-09 14:11:36.000000000 +0000
++++ Source/WebKit/PlatformQt.cmake
+@@ -786,6 +786,7 @@ if (COMPILER_IS_GCC_OR_CLANG)
+     set_source_files_properties(
+         qt/Api/qwebdatabase.cpp
+         qt/Api/qwebelement.cpp
++        qt/Api/qwebfullscreenrequest.cpp
+         qt/Api/qwebhistory.cpp
+         qt/Api/qwebhistoryinterface.cpp
+         qt/Api/qwebpluginfactory.cpp
+@@ -795,7 +796,6 @@ if (COMPILER_IS_GCC_OR_CLANG)
+ 
+         qt/WidgetApi/qgraphicswebview.cpp
+         qt/WidgetApi/qwebframe.cpp
+-        qt/WidgetApi/qwebfullscreenrequest.cpp
+         qt/WidgetApi/qwebinspector.cpp
+         qt/WidgetApi/qwebpage.cpp
+         qt/WidgetApi/qwebview.cpp
diff --git a/x11/qt5-qtwebkit/patches/patch-Source_WebKit_WebKit1.pro b/x11/qt5-qtwebkit/patches/patch-Source_WebKit_WebKit1.pro
deleted file mode 100644
index 648a9adc763..00000000000
--- a/x11/qt5-qtwebkit/patches/patch-Source_WebKit_WebKit1.pro
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-Source_WebKit_WebKit1.pro,v 1.1 2014/12/30 17:23:48 adam Exp $
-
-* Build libWebKit libraries with libtool
-* Install libWebKit libraries
-
---- Source/WebKit/WebKit1.pro.orig	2013-11-27 01:01:39.000000000 +0000
-+++ Source/WebKit/WebKit1.pro
-@@ -16,7 +16,10 @@ QT += gui
- # defined by the logic in qt_module.prf as it should
- DEFINES += QT_BUILD_WEBKIT_LIB
- 
--CONFIG += staticlib
-+#CONFIG += staticlib
-+
-+target.path = $$[QT_INSTALL_LIBS]
-+INSTALLS += target
- 
- SOURCES += \
-     $$PWD/qt/Api/qhttpheader.cpp \
diff --git a/x11/qt5-qtwebkit/patches/patch-Source_WebKit_qt_examples_platformplugin_platformplugin.pro b/x11/qt5-qtwebkit/patches/patch-Source_WebKit_qt_examples_platformplugin_platformplugin.pro
deleted file mode 100644
index fb6c1be2d56..00000000000
--- a/x11/qt5-qtwebkit/patches/patch-Source_WebKit_qt_examples_platformplugin_platformplugin.pro
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-Source_WebKit_qt_examples_platformplugin_platformplugin.pro,v 1.1 2014/12/30 17:23:48 adam Exp $
-
-* Fix unprivileged build,
-  https://bugs.webkit.org/show_bug.cgi?id=117077
-
---- Source/WebKit/qt/examples/platformplugin/platformplugin.pro.orig	2013-11-27 01:01:40.000000000 +0000
-+++ Source/WebKit/qt/examples/platformplugin/platformplugin.pro
-@@ -20,7 +20,8 @@ load(mobilityconfig, true)
-     }
- }
- 
--DESTDIR = $$[QT_INSTALL_PLUGINS]/webkit
-+target.path = $$[QT_INSTALL_PLUGINS]/webkit
-+INSTALLS += target
- 
- SOURCES += \
-     WebPlugin.cpp \
diff --git a/x11/qt5-qtwebkit/patches/patch-Source_api.pri b/x11/qt5-qtwebkit/patches/patch-Source_api.pri
deleted file mode 100644
index 1d81abfb55e..00000000000
--- a/x11/qt5-qtwebkit/patches/patch-Source_api.pri
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-Source_api.pri,v 1.1 2014/12/30 17:23:48 adam Exp $
-
-OS X also requires dummy object file, otherwise 'ar' would fail.
-
---- Source/api.pri.orig	2014-11-17 12:03:52.000000000 +0000
-+++ Source/api.pri
-@@ -102,7 +102,7 @@ load(qt_module)
-     }
- }
- 
--qnx {
-+macx|qnx {
-     # see: https://bugs.webkit.org/show_bug.cgi?id=93460
-     # the gcc 4.4.2 used in the qnx bbndk cannot cope with
-     # the linkage step of libQtWebKit, adding a dummy .cpp
diff --git a/x11/qt5-qtwebkit/patches/patch-Source_cmake_OptionsQt.cmake b/x11/qt5-qtwebkit/patches/patch-Source_cmake_OptionsQt.cmake
new file mode 100644
index 00000000000..2e37171be0c
--- /dev/null
+++ b/x11/qt5-qtwebkit/patches/patch-Source_cmake_OptionsQt.cmake
@@ -0,0 +1,15 @@
+$NetBSD: patch-Source_cmake_OptionsQt.cmake,v 1.1 2018/01/17 19:37:33 markd Exp $
+
+ECM_MODULE_DIR wants a single directory, not a path
+
+--- Source/cmake/OptionsQt.cmake.orig	2017-06-15 23:36:48.000000000 +0000
++++ Source/cmake/OptionsQt.cmake
+@@ -1,7 +1,7 @@
+ include(FeatureSummary)
+ include(ECMPackageConfigHelpers)
+ 
+-set(ECM_MODULE_DIR ${CMAKE_MODULE_PATH})
++set(ECM_MODULE_DIR "${CMAKE_SOURCE_DIR}/Source/cmake")
+ 
+ set(PROJECT_VERSION_MAJOR 5)
+ set(PROJECT_VERSION_MINOR 212)
diff --git a/x11/qt5-qtwebkit/patches/patch-Tools_Scripts_webkitdirs.pm b/x11/qt5-qtwebkit/patches/patch-Tools_Scripts_webkitdirs.pm
deleted file mode 100644
index 4bf720e36ab..00000000000
--- a/x11/qt5-qtwebkit/patches/patch-Tools_Scripts_webkitdirs.pm
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-Tools_Scripts_webkitdirs.pm,v 1.1 2014/12/30 17:23:48 adam Exp $
-
-* Add NetBSD support
-
---- Tools/Scripts/webkitdirs.pm.orig	2013-11-27 01:01:20.000000000 +0000
-+++ Tools/Scripts/webkitdirs.pm
-@@ -355,7 +355,7 @@ sub determineNumberOfCPUs
-     } elsif (isWindows() || isCygwin()) {
-         # Assumes cygwin
-         $numberOfCPUs = `ls /proc/registry/HKEY_LOCAL_MACHINE/HARDWARE/DESCRIPTION/System/CentralProcessor | wc -w`;
--    } elsif (isDarwin() || isFreeBSD()) {
-+    } elsif (isDarwin() || isFreeBSD() || isNetBSD()) {
-         chomp($numberOfCPUs = `sysctl -n hw.ncpu`);
-     }
- }
-@@ -1253,6 +1253,11 @@ sub isFreeBSD()
-     return ($^O eq "freebsd") || 0;
- }
- 
-+sub isNetBSD()
-+{
-+    return ($^O eq "netbsd") || 0;
-+}
-+
- sub isARM()
- {
-     return $Config{archname} =~ /^arm[v\-]/;
diff --git a/x11/qt5-qtwebkit/patches/patch-Tools_WebKitTestRunner_InjectedBundle_Target.pri b/x11/qt5-qtwebkit/patches/patch-Tools_WebKitTestRunner_InjectedBundle_Target.pri
deleted file mode 100644
index a2e7e22c84a..00000000000
--- a/x11/qt5-qtwebkit/patches/patch-Tools_WebKitTestRunner_InjectedBundle_Target.pri
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-Tools_WebKitTestRunner_InjectedBundle_Target.pri,v 1.1 2014/12/30 17:23:48 adam Exp $
-
-* Treat NetBSD like Linux
-
---- Tools/WebKitTestRunner/InjectedBundle/Target.pri.orig	2013-11-27 01:01:19.000000000 +0000
-+++ Tools/WebKitTestRunner/InjectedBundle/Target.pri
-@@ -67,6 +67,6 @@ INCLUDEPATH += \
- PREFIX_HEADER = $$PWD/../WebKitTestRunnerPrefix.h
- *-g++*:QMAKE_CXXFLAGS += "-include $$PREFIX_HEADER"
- 
--linux-* {
-+linux-*|netbsd-* {
-     QMAKE_LFLAGS += -Wl,--no-undefined
- }
diff --git a/x11/qt5-qtwebkit/patches/patch-Tools_qmake_mkspecs_features_functions.prf b/x11/qt5-qtwebkit/patches/patch-Tools_qmake_mkspecs_features_functions.prf
deleted file mode 100644
index d0ac2644e9d..00000000000
--- a/x11/qt5-qtwebkit/patches/patch-Tools_qmake_mkspecs_features_functions.prf
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-Tools_qmake_mkspecs_features_functions.prf,v 1.1 2014/12/30 17:23:48 adam Exp $
-
-* Use libtool manner for libtool build
-
---- Tools/qmake/mkspecs/features/functions.prf.orig	2013-11-27 01:01:20.000000000 +0000
-+++ Tools/qmake/mkspecs/features/functions.prf
-@@ -262,8 +262,8 @@ defineTest(linkAgainstLibrary) {
- 
-     path = $$replace(source_dir, $$re_escape($${ROOT_WEBKIT_DIR}), $${ROOT_BUILD_DIR})/$$targetSubDir()
- 
--    force_static_libs_as_shared {
--            LIBS += -L$${ROOT_BUILD_DIR}/lib -l$$target
-+    !staticlib {
-+            LIBS += $${path}$${QMAKE_DIR_SEP}lib$${target}.la
-     } else {
- 
-         mac {
diff --git a/x11/qt5-qtwebkit/patches/patch-Tools_qmake_mkspecs_features_production__build.prf b/x11/qt5-qtwebkit/patches/patch-Tools_qmake_mkspecs_features_production__build.prf
deleted file mode 100644
index c79a4e2eb26..00000000000
--- a/x11/qt5-qtwebkit/patches/patch-Tools_qmake_mkspecs_features_production__build.prf
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-Tools_qmake_mkspecs_features_production__build.prf,v 1.1 2014/12/30 17:23:48 adam Exp $
-
-* Set CONFIGs for non-static (libtoolized) build
-
---- Tools/qmake/mkspecs/features/production_build.prf.orig	2014-09-11 10:48:10.000000000 +0000
-+++ Tools/qmake/mkspecs/features/production_build.prf
-@@ -7,7 +7,7 @@ CONFIG *= use_all_in_one_files
- # resulting in the need of several gigabytes of memory at link-time. Reduce the pressure
- # by compiling any static library like WTF or JSC with release flags instead and keep debug
- # symbols for the static libraries that implement API.
--if(linux-*:!contains(QMAKE_HOST.arch, x86_64))|mingw:if(CONFIG(debug, debug|release)|contains(QT_CONFIG,separate_debug_info)):contains(TEMPLATE, lib):staticlib {
-+if(linux-*:!contains(QMAKE_HOST.arch, x86_64))|mingw:if(CONFIG(debug, debug|release)|contains(QT_CONFIG,separate_debug_info)):contains(TEMPLATE, lib) {
-     !equals(TARGET, WebKit2):!equals(TARGET, WebKitWidgets) {
-         CONFIG += no_debug_info
-         CONFIG -= separate_debug_info