pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/x11/qt5-qtwebkit
Module Name: pkgsrc
Committed By: markd
Date: Wed Jan 17 19:37:33 UTC 2018
Modified Files:
pkgsrc/x11/qt5-qtwebkit: Makefile PLIST buildlink3.mk distinfo
pkgsrc/x11/qt5-qtwebkit/patches:
patch-Source_JavaScriptCore_assembler_ARMAssembler.h
patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp
patch-Source_JavaScriptCore_dfg_DFGNode.h
patch-Source_JavaScriptCore_heap_MachineStackMarker.cpp
patch-Source_JavaScriptCore_tools_CodeProfiling.cpp
patch-Source_WTF_wtf_Assertions.cpp
patch-Source_WTF_wtf_MathExtras.h patch-Source_WTF_wtf_Platform.h
patch-Source_WTF_wtf_ThreadIdentifierDataPthreads.cpp
patch-Source_WebCore_page_NavigatorBase.cpp
patch-Source_WebKit2_Platform_unix_SharedMemoryUnix.cpp
Added Files:
pkgsrc/x11/qt5-qtwebkit/patches: patch-Source_WebKit_PlatformQt.cmake
patch-Source_cmake_OptionsQt.cmake
Removed Files:
pkgsrc/x11/qt5-qtwebkit/patches:
patch-Source_JavaScriptCore_API_JSStringRef.cpp
patch-Source_JavaScriptCore_DerivedSources.pri
patch-Source_JavaScriptCore_JavaScriptCore.pri
patch-Source_JavaScriptCore_Target.pri
patch-Source_JavaScriptCore_runtime_DatePrototype.cpp
patch-Source_QtWebKit.pro patch-Source_ThirdParty_ANGLE_Target.pri
patch-Source_ThirdParty_ANGLE_src_compiler_glslang.y
patch-Source_ThirdParty_ANGLE_src_compiler_osinclude.h
patch-Source_ThirdParty_leveldb_Target.pri patch-Source_WTF_WTF.pro
patch-Source_WTF_wtf_Compiler.h
patch-Source_WTF_wtf_NumberOfCores.cpp
patch-Source_WTF_wtf_RAMSize.cpp patch-Source_WTF_wtf_Threading.h
patch-Source_WTF_wtf_TypeTraits.h
patch-Source_WTF_wtf_text_StringImpl.h
patch-Source_WebCore_Target.pri
patch-Source_WebCore_bindings_js_JSInspectorFrontendHostCustom.cpp
patch-Source_WebCore_editing_Editor.h
patch-Source_WebCore_platform_graphics_surfaces_mac_GraphicsSurfaceMac.cpp
patch-Source_WebCore_platform_sql_SQLiteDatabase.cpp
patch-Source_WebKit2_DerivedSources.pri
patch-Source_WebKit2_Platform_CoreIPC_MessageDecoder.cpp
patch-Source_WebKit2_Platform_CoreIPC_MessageDecoder.h
patch-Source_WebKit2_Shared_API_c_WKString.cpp
patch-Source_WebKit2_Target.pri patch-Source_WebKit_WebKit1.pro
patch-Source_WebKit_qt_examples_platformplugin_platformplugin.pro
patch-Source_api.pri patch-Tools_Scripts_webkitdirs.pm
patch-Tools_WebKitTestRunner_InjectedBundle_Target.pri
patch-Tools_qmake_mkspecs_features_functions.prf
patch-Tools_qmake_mkspecs_features_production__build.prf
Log Message:
qt5-qtwebkit: update to 5.212.0.alpha2
Version of qtwebkit that is being updated with webkit changes.
To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 pkgsrc/x11/qt5-qtwebkit/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/x11/qt5-qtwebkit/PLIST
cvs rdiff -u -r1.32 -r1.33 pkgsrc/x11/qt5-qtwebkit/buildlink3.mk
cvs rdiff -u -r1.10 -r1.11 pkgsrc/x11/qt5-qtwebkit/distinfo
cvs rdiff -u -r1.1 -r0 \
pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_API_JSStringRef.cpp \
pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_DerivedSources.pri \
pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_JavaScriptCore.pri \
pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_Target.pri \
pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_runtime_DatePrototype.cpp \
pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_QtWebKit.pro \
pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_ThirdParty_ANGLE_Target.pri \
pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_ThirdParty_ANGLE_src_compiler_glslang.y \
pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_ThirdParty_ANGLE_src_compiler_osinclude.h \
pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_ThirdParty_leveldb_Target.pri \
pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_WTF_WTF.pro \
pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_WTF_wtf_Compiler.h \
pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_WTF_wtf_NumberOfCores.cpp \
pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_WTF_wtf_RAMSize.cpp \
pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_WTF_wtf_Threading.h \
pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_WTF_wtf_TypeTraits.h \
pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_WTF_wtf_text_StringImpl.h \
pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_WebCore_Target.pri \
pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_WebCore_bindings_js_JSInspectorFrontendHostCustom.cpp \
pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_WebCore_editing_Editor.h \
pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_WebCore_platform_graphics_surfaces_mac_GraphicsSurfaceMac.cpp \
pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_WebCore_platform_sql_SQLiteDatabase.cpp \
pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_WebKit2_DerivedSources.pri \
pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_WebKit2_Platform_CoreIPC_MessageDecoder.cpp \
pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_WebKit2_Platform_CoreIPC_MessageDecoder.h \
pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_WebKit2_Shared_API_c_WKString.cpp \
pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_WebKit2_Target.pri \
pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_WebKit_WebKit1.pro \
pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_WebKit_qt_examples_platformplugin_platformplugin.pro \
pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_api.pri \
pkgsrc/x11/qt5-qtwebkit/patches/patch-Tools_Scripts_webkitdirs.pm \
pkgsrc/x11/qt5-qtwebkit/patches/patch-Tools_WebKitTestRunner_InjectedBundle_Target.pri \
pkgsrc/x11/qt5-qtwebkit/patches/patch-Tools_qmake_mkspecs_features_functions.prf \
pkgsrc/x11/qt5-qtwebkit/patches/patch-Tools_qmake_mkspecs_features_production__build.prf
cvs rdiff -u -r1.1 -r1.2 \
pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_assembler_ARMAssembler.h \
pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp \
pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_dfg_DFGNode.h \
pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_heap_MachineStackMarker.cpp \
pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_WTF_wtf_Assertions.cpp \
pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_WTF_wtf_MathExtras.h \
pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_WTF_wtf_ThreadIdentifierDataPthreads.cpp \
pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_WebCore_page_NavigatorBase.cpp \
pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_WebKit2_Platform_unix_SharedMemoryUnix.cpp
cvs rdiff -u -r1.3 -r1.4 \
pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_tools_CodeProfiling.cpp
cvs rdiff -u -r1.2 -r1.3 \
pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_WTF_wtf_Platform.h
cvs rdiff -u -r0 -r1.1 \
pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_WebKit_PlatformQt.cmake \
pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_cmake_OptionsQt.cmake
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/x11/qt5-qtwebkit/Makefile
diff -u pkgsrc/x11/qt5-qtwebkit/Makefile:1.46 pkgsrc/x11/qt5-qtwebkit/Makefile:1.47
--- pkgsrc/x11/qt5-qtwebkit/Makefile:1.46 Thu Nov 30 16:45:13 2017
+++ pkgsrc/x11/qt5-qtwebkit/Makefile Wed Jan 17 19:37:33 2018
@@ -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@localhost
+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"
Index: pkgsrc/x11/qt5-qtwebkit/PLIST
diff -u pkgsrc/x11/qt5-qtwebkit/PLIST:1.4 pkgsrc/x11/qt5-qtwebkit/PLIST:1.5
--- pkgsrc/x11/qt5-qtwebkit/PLIST:1.4 Tue Dec 30 17:23:47 2014
+++ pkgsrc/x11/qt5-qtwebkit/PLIST Wed Jan 17 19:37:33 2018
@@ -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/qwebkitplatformplug
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
Index: pkgsrc/x11/qt5-qtwebkit/buildlink3.mk
diff -u pkgsrc/x11/qt5-qtwebkit/buildlink3.mk:1.32 pkgsrc/x11/qt5-qtwebkit/buildlink3.mk:1.33
--- pkgsrc/x11/qt5-qtwebkit/buildlink3.mk:1.32 Thu Nov 30 16:45:13 2017
+++ pkgsrc/x11/qt5-qtwebkit/buildlink3.mk Wed Jan 17 19:37:33 2018
@@ -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
Index: pkgsrc/x11/qt5-qtwebkit/distinfo
diff -u pkgsrc/x11/qt5-qtwebkit/distinfo:1.10 pkgsrc/x11/qt5-qtwebkit/distinfo:1.11
--- pkgsrc/x11/qt5-qtwebkit/distinfo:1.10 Tue Nov 21 17:00:28 2017
+++ pkgsrc/x11/qt5-qtwebkit/distinfo Wed Jan 17 19:37:33 2018
@@ -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
Index: pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_assembler_ARMAssembler.h
diff -u pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_assembler_ARMAssembler.h:1.1 pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_assembler_ARMAssembler.h:1.2
--- pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_assembler_ARMAssembler.h:1.1 Tue Dec 30 17:23:47 2014
+++ pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_assembler_ARMAssembler.h Wed Jan 17 19:37:33 2018
@@ -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_ass
#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);
Index: pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp
diff -u pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp:1.1 pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp:1.2
--- pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp:1.1 Tue Dec 30 17:23:47 2014
+++ pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp Wed Jan 17 19:37:33 2018
@@ -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_ass
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_ass
+ }
+#endif
+
- #if (COMPILER(RVCT) && defined(__TARGET_FPU_VFP)) || (COMPILER(GCC) && defined(__VFP_FP__))
+ #if (COMPILER(GCC_OR_CLANG) && defined(__VFP_FP__))
return true;
#else
Index: pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_dfg_DFGNode.h
diff -u pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_dfg_DFGNode.h:1.1 pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_dfg_DFGNode.h:1.2
--- pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_dfg_DFGNode.h:1.1 Tue Dec 30 17:23:47 2014
+++ pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_dfg_DFGNode.h Wed Jan 17 19:37:33 2018
@@ -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)
Index: pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_heap_MachineStackMarker.cpp
diff -u pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_heap_MachineStackMarker.cpp:1.1 pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_heap_MachineStackMarker.cpp:1.2
--- pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_heap_MachineStackMarker.cpp:1.1 Tue Dec 30 17:23:47 2014
+++ pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_heap_MachineStackMarker.cpp Wed Jan 17 19:37:33 2018
@@ -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*>(®s), static_cast<void*>(reinterpret_cast<char*>(®s) + 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.
Index: pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_WTF_wtf_Assertions.cpp
diff -u pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_WTF_wtf_Assertions.cpp:1.1 pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_WTF_wtf_Assertions.cpp:1.2
--- pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_WTF_wtf_Assertions.cpp:1.1 Tue Dec 30 17:23:47 2014
+++ pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_WTF_wtf_Assertions.cpp Wed Jan 17 19:37:33 2018
@@ -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
+#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
Index: pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_WTF_wtf_MathExtras.h
diff -u pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_WTF_wtf_MathExtras.h:1.1 pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_WTF_wtf_MathExtras.h:1.2
--- pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_WTF_wtf_MathExtras.h:1.1 Fri Jul 22 10:14:17 2016
+++ pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_WTF_wtf_MathExtras.h Wed Jan 17 19:37:33 2018
@@ -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)
Index: pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_WTF_wtf_ThreadIdentifierDataPthreads.cpp
diff -u pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_WTF_wtf_ThreadIdentifierDataPthreads.cpp:1.1 pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_WTF_wtf_ThreadIdentifierDataPthreads.cpp:1.2
--- pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_WTF_wtf_ThreadIdentifierDataPthreads.cpp:1.1 Tue Dec 30 17:23:47 2014
+++ pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_WTF_wtf_ThreadIdentifierDataPthreads.cpp Wed Jan 17 19:37:33 2018
@@ -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)
Index: pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_WebCore_page_NavigatorBase.cpp
diff -u pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_WebCore_page_NavigatorBase.cpp:1.1 pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_WebCore_page_NavigatorBase.cpp:1.2
--- pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_WebCore_page_NavigatorBase.cpp:1.1 Tue Dec 30 17:23:48 2014
+++ pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_WebCore_page_NavigatorBase.cpp Wed Jan 17 19:37:33 2018
@@ -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_Navig
#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
{
Index: pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_WebKit2_Platform_unix_SharedMemoryUnix.cpp
diff -u pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_WebKit2_Platform_unix_SharedMemoryUnix.cpp:1.1 pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_WebKit2_Platform_unix_SharedMemoryUnix.cpp:1.2
--- pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_WebKit2_Platform_unix_SharedMemoryUnix.cpp:1.1 Tue Dec 30 17:23:48 2014
+++ pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_WebKit2_Platform_unix_SharedMemoryUnix.cpp Wed Jan 17 19:37:33 2018
@@ -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_u
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_u
} 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_u
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);
Index: pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_tools_CodeProfiling.cpp
diff -u pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_tools_CodeProfiling.cpp:1.3 pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_tools_CodeProfiling.cpp:1.4
--- pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_tools_CodeProfiling.cpp:1.3 Fri Mar 18 07:37:38 2016
+++ pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_tools_CodeProfiling.cpp Wed Jan 17 19:37:33 2018
@@ -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_too
#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_too
#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);
Index: pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_WTF_wtf_Platform.h
diff -u pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_WTF_wtf_Platform.h:1.2 pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_WTF_wtf_Platform.h:1.3
--- pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_WTF_wtf_Platform.h:1.2 Sun Aug 30 09:56:45 2015
+++ pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_WTF_wtf_Platform.h Wed Jan 17 19:37:33 2018
@@ -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
* 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
/* ==== 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
Added files:
Index: pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_WebKit_PlatformQt.cmake
diff -u /dev/null pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_WebKit_PlatformQt.cmake:1.1
--- /dev/null Wed Jan 17 19:37:33 2018
+++ pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_WebKit_PlatformQt.cmake Wed Jan 17 19:37:33 2018
@@ -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
Index: pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_cmake_OptionsQt.cmake
diff -u /dev/null pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_cmake_OptionsQt.cmake:1.1
--- /dev/null Wed Jan 17 19:37:33 2018
+++ pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_cmake_OptionsQt.cmake Wed Jan 17 19:37:33 2018
@@ -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)
Home |
Main Index |
Thread Index |
Old Index