Index: Makefile =================================================================== RCS file: /cvsroot/pkgsrc/www/webkit-gtk/Makefile,v retrieving revision 1.125 diff -u -p -r1.125 Makefile --- Makefile 22 Apr 2017 21:03:18 -0000 1.125 +++ Makefile 2 May 2017 12:35:34 -0000 @@ -1,8 +1,7 @@ # $NetBSD: Makefile,v 1.125 2017/04/22 21:03:18 adam Exp $ -DISTNAME= webkitgtk-2.12.4 +DISTNAME= webkitgtk-2.16.1 PKGNAME= ${DISTNAME:S/webkitgtk/webkit-gtk/} -PKGREVISION= 6 CATEGORIES= www MASTER_SITES= http://www.webkitgtk.org/releases/ EXTRACT_SUFX= .tar.xz Index: distinfo =================================================================== RCS file: /cvsroot/pkgsrc/www/webkit-gtk/distinfo,v retrieving revision 1.95 diff -u -p -r1.95 distinfo --- distinfo 25 Apr 2017 10:37:26 -0000 1.95 +++ distinfo 2 May 2017 12:35:34 -0000 @@ -1,14 +1,13 @@ $NetBSD: distinfo,v 1.95 2017/04/25 10:37:26 wiz Exp $ -SHA1 (webkitgtk-2.12.4.tar.xz) = ebfe6015d81129b6a13a9596d065c54e9c1b93f6 -RMD160 (webkitgtk-2.12.4.tar.xz) = 9bccd3c05f3c6a28d36f2bb5fdb3a9a58be10539 -SHA512 (webkitgtk-2.12.4.tar.xz) = c512f36679e0f8278544faad70e3b79108ddb4cd52339c5fb784cbb83857c2d30fd240b3e91dd9ecc1b1195f3086844e0716c8284d992b75b4feffda749d73be -Size (webkitgtk-2.12.4.tar.xz) = 11708368 bytes +SHA1 (webkitgtk-2.16.1.tar.xz) = d0b367ca1ac89da57b7068aa37efcc101aeb97f8 +RMD160 (webkitgtk-2.16.1.tar.xz) = 82e198ac35993d0e5a2ff9a76755b1c33849458f +SHA512 (webkitgtk-2.16.1.tar.xz) = 4b8de15644d0d0f9814c674020cbbab8628347915b8010977dbe2365ce276ea05b3bf86171400ae8eb5bfdebbadcfabd1efce34a177b5c82aa765bd3351e7010 +Size (webkitgtk-2.16.1.tar.xz) = 14675996 bytes SHA1 (patch-CMakeLists.txt) = c48c0e5d33f378b7ecf31fffef609fb2501e5cd3 SHA1 (patch-Source_JavaScriptCore_API_JSStringRef.cpp) = 419425db19f685335eab01099d0a941614a2a99c SHA1 (patch-Source_JavaScriptCore_assembler_ARMAssembler.h) = 99e46f9d9b26a8d9ba6b29c66d7ce5326c4ffeb6 SHA1 (patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp) = f78e6150ed8901b3fe046b2ef182f50f1c7500a4 -SHA1 (patch-Source_JavaScriptCore_dfg_DFGNode.h) = 0d82552c6cc1f4885a2bcc539963c966216c977c SHA1 (patch-Source_JavaScriptCore_heap_MachineStackMarker.cpp) = dd8c03f924d9b96abc9ba5d3a315fefc096be7b0 SHA1 (patch-Source_ThirdParty_gtest_include_gtest_internal_gtest-port.h) = f1eee7f9d3012edee1915234c837cff820f97092 SHA1 (patch-Source_WTF_wtf_Compiler.h) = f4f7771e4b421dddf9f73c7131e671d0c34b906c @@ -16,10 +15,9 @@ SHA1 (patch-Source_WTF_wtf_MathExtras.h) SHA1 (patch-Source_WebCore_platform_FileSystem.cpp) = adef1a42c4e210f0a3dcb82807e2d2039684a0ec SHA1 (patch-Source_WebCore_rendering_shapes_RasterShape.cpp) = 551e47698dee50d097b11e3218f13bb3447edfea SHA1 (patch-Source_WebKit2_CMakeLists.txt) = 10a3fca678095ad04ce43e6d291e3907a44f67b4 -SHA1 (patch-Source_WebKit2_NetworkProcess_cache_NetworkCacheFileSystem.cpp) = 7fbaf11853209cbfea5bb370d35ac985eb30f7ef +SHA1 (patch-Source_WebKit2_NetworkProcess_cache_NetworkCacheFileSystem.cpp) = 2b38628e1e617ef87b20faabbbcd8be8b2cbc058 SHA1 (patch-Source_WebKit2_Shared_API_c_WKString.cpp) = 0a735e069ad6412e5c7850067ade0abe24487c1f -SHA1 (patch-Source_WebKit2_UIProcess_UserContent_WebUserContentControllerProxy.cpp) = 8af6225e01c0fbae866110c3aad46eae5c55ac9e -SHA1 (patch-Source_cmake_OptionsCommon.cmake) = 09a837ee65cdc79cc22220ce713e346fe8752c50 -SHA1 (patch-Source_cmake_OptionsGTK.cmake) = 92a0d1563eda8a30a80c4ca3e115e8320d306bf5 +SHA1 (patch-Source_cmake_OptionsCommon.cmake) = 03b72552414e7114bfa7ddc2d68fd97009a5ff7d +SHA1 (patch-Source_cmake_OptionsGTK.cmake) = 459bf361b03b8f4be57813d146423064adc47d8f SHA1 (patch-ai) = b8a45f2f5c1aa5aed178527ecd6cbd93baf76f8e SHA1 (patch-aj) = 8247194bd8d62fcc356650c946756898fbe22982 Index: patches/patch-Source_JavaScriptCore_dfg_DFGNode.h =================================================================== RCS file: patches/patch-Source_JavaScriptCore_dfg_DFGNode.h diff -N patches/patch-Source_JavaScriptCore_dfg_DFGNode.h --- patches/patch-Source_JavaScriptCore_dfg_DFGNode.h 21 Jan 2016 13:42:33 -0000 1.5 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,13 +0,0 @@ -$NetBSD: patch-Source_JavaScriptCore_dfg_DFGNode.h,v 1.5 2016/01/21 13:42:33 leot Exp $ - ---- Source/JavaScriptCore/dfg/DFGNode.h.orig 2016-01-20 12:12:59.000000000 +0000 -+++ Source/JavaScriptCore/dfg/DFGNode.h -@@ -221,7 +221,7 @@ struct OpInfo { - OpInfo() : m_value(0) { } - explicit OpInfo(int32_t value) : m_value(static_cast(value)) { } - explicit OpInfo(uint32_t value) : m_value(static_cast(value)) { } --#if OS(DARWIN) || USE(JSVALUE64) -+#if OS(DARWIN) || (CPU(ARM) && OS(NETBSD)) || USE(JSVALUE64) - explicit OpInfo(size_t value) : m_value(static_cast(value)) { } - #endif - explicit OpInfo(void* value) : m_value(reinterpret_cast(value)) { } Index: patches/patch-Source_WebKit2_NetworkProcess_cache_NetworkCacheFileSystem.cpp =================================================================== RCS file: /cvsroot/pkgsrc/www/webkit-gtk/patches/patch-Source_WebKit2_NetworkProcess_cache_NetworkCacheFileSystem.cpp,v retrieving revision 1.1 diff -u -p -r1.1 patch-Source_WebKit2_NetworkProcess_cache_NetworkCacheFileSystem.cpp --- patches/patch-Source_WebKit2_NetworkProcess_cache_NetworkCacheFileSystem.cpp 13 Apr 2017 16:58:14 -0000 1.1 +++ patches/patch-Source_WebKit2_NetworkProcess_cache_NetworkCacheFileSystem.cpp 2 May 2017 12:35:34 -0000 @@ -2,9 +2,9 @@ $NetBSD: patch-Source_WebKit2_NetworkPro SunOS does not support dirent d_type. ---- Source/WebKit2/NetworkProcess/cache/NetworkCacheFileSystem.cpp.orig 2016-07-20 12:15:24.000000000 +0000 +--- Source/WebKit2/NetworkProcess/cache/NetworkCacheFileSystem.cpp.orig 2017-02-20 16:20:17.000000000 +0000 +++ Source/WebKit2/NetworkProcess/cache/NetworkCacheFileSystem.cpp -@@ -44,6 +44,12 @@ namespace NetworkCache { +@@ -52,6 +52,12 @@ namespace NetworkCache { static DirectoryEntryType directoryEntryType(uint8_t dtype) { @@ -17,9 +17,9 @@ SunOS does not support dirent d_type. switch (dtype) { case DT_DIR: return DirectoryEntryType::Directory; -@@ -57,12 +63,20 @@ static DirectoryEntryType directoryEntry +@@ -65,12 +71,20 @@ static DirectoryEntryType directoryEntry - void traverseDirectory(const String& path, const std::function& function) + void traverseDirectory(const String& path, const Function& function) { +#ifdef __sun + struct stat s; @@ -38,7 +38,7 @@ SunOS does not support dirent d_type. continue; const char* name = dp->d_name; if (!strcmp(name, ".") || !strcmp(name, "..")) -@@ -70,7 +84,11 @@ void traverseDirectory(const String& pat +@@ -78,7 +92,11 @@ void traverseDirectory(const String& pat auto nameString = String::fromUTF8(name); if (nameString.isNull()) continue; Index: patches/patch-Source_WebKit2_UIProcess_UserContent_WebUserContentControllerProxy.cpp =================================================================== RCS file: patches/patch-Source_WebKit2_UIProcess_UserContent_WebUserContentControllerProxy.cpp diff -N patches/patch-Source_WebKit2_UIProcess_UserContent_WebUserContentControllerProxy.cpp --- patches/patch-Source_WebKit2_UIProcess_UserContent_WebUserContentControllerProxy.cpp 10 Oct 2016 21:11:48 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,22 +0,0 @@ -$NetBSD: patch-Source_WebKit2_UIProcess_UserContent_WebUserContentControllerProxy.cpp,v 1.1 2016/10/10 21:11:48 joerg Exp $ - ---- Source/WebKit2/UIProcess/UserContent/WebUserContentControllerProxy.cpp.orig 2016-10-09 14:17:57.000000000 +0000 -+++ Source/WebKit2/UIProcess/UserContent/WebUserContentControllerProxy.cpp -@@ -116,7 +116,7 @@ void WebUserContentControllerProxy::addU - void WebUserContentControllerProxy::removeUserScript(const API::UserScript& userScript) - { - for (WebProcessProxy* process : m_processes) -- process->connection()->send(Messages::WebUserContentController::RemoveUserScript({ userScript.userScript().url().string() }), m_identifier); -+ process->connection()->send(Messages::WebUserContentController::RemoveUserScript(userScript.userScript().url()), m_identifier); - - m_userScripts->elements().removeAll(&userScript); - } -@@ -140,7 +140,7 @@ void WebUserContentControllerProxy::addU - void WebUserContentControllerProxy::removeUserStyleSheet(const API::UserStyleSheet& userStyleSheet) - { - for (WebProcessProxy* process : m_processes) -- process->connection()->send(Messages::WebUserContentController::RemoveUserStyleSheet({ userStyleSheet.userStyleSheet().url().string() }), m_identifier); -+ process->connection()->send(Messages::WebUserContentController::RemoveUserStyleSheet(userStyleSheet.userStyleSheet().url()), m_identifier); - - m_userStyleSheets->elements().removeAll(&userStyleSheet); - } Index: patches/patch-Source_cmake_OptionsCommon.cmake =================================================================== RCS file: /cvsroot/pkgsrc/www/webkit-gtk/patches/patch-Source_cmake_OptionsCommon.cmake,v retrieving revision 1.3 diff -u -p -r1.3 patch-Source_cmake_OptionsCommon.cmake --- patches/patch-Source_cmake_OptionsCommon.cmake 21 Jan 2016 13:42:33 -0000 1.3 +++ patches/patch-Source_cmake_OptionsCommon.cmake 2 May 2017 12:35:34 -0000 @@ -2,20 +2,20 @@ $NetBSD: patch-Source_cmake_OptionsCommo Using the T option of GNU ar lead to malformed .a archive on NetBSD. Disable it. ---- Source/cmake/OptionsCommon.cmake.orig 2016-01-20 12:13:00.000000000 +0000 +--- Source/cmake/OptionsCommon.cmake.orig 2017-02-27 07:11:15.000000000 +0000 +++ Source/cmake/OptionsCommon.cmake -@@ -17,10 +17,10 @@ endif () - - execute_process(COMMAND ${CMAKE_AR} -V OUTPUT_VARIABLE AR_VERSION) - if ("${AR_VERSION}" MATCHES "^GNU ar") -- set(CMAKE_CXX_ARCHIVE_CREATE " crT ") -- set(CMAKE_C_ARCHIVE_CREATE " crT ") -- set(CMAKE_CXX_ARCHIVE_APPEND " rT ") -- set(CMAKE_C_ARCHIVE_APPEND " rT ") -+ set(CMAKE_CXX_ARCHIVE_CREATE " cr ") -+ set(CMAKE_C_ARCHIVE_CREATE " cr ") -+ set(CMAKE_CXX_ARCHIVE_APPEND " r ") -+ set(CMAKE_C_ARCHIVE_APPEND " r ") +@@ -27,10 +27,10 @@ option(USE_THIN_ARCHIVES "Produce all st + if (USE_THIN_ARCHIVES) + execute_process(COMMAND ${CMAKE_AR} -V OUTPUT_VARIABLE AR_VERSION) + if ("${AR_VERSION}" MATCHES "^GNU ar") +- set(CMAKE_CXX_ARCHIVE_CREATE " crT ") +- set(CMAKE_C_ARCHIVE_CREATE " crT ") +- set(CMAKE_CXX_ARCHIVE_APPEND " rT ") +- set(CMAKE_C_ARCHIVE_APPEND " rT ") ++ set(CMAKE_CXX_ARCHIVE_CREATE " cr ") ++ set(CMAKE_C_ARCHIVE_CREATE " cr ") ++ set(CMAKE_CXX_ARCHIVE_APPEND " r ") ++ set(CMAKE_C_ARCHIVE_APPEND " r ") + endif () endif () - set_property(GLOBAL PROPERTY USE_FOLDERS ON) Index: patches/patch-Source_cmake_OptionsGTK.cmake =================================================================== RCS file: /cvsroot/pkgsrc/www/webkit-gtk/patches/patch-Source_cmake_OptionsGTK.cmake,v retrieving revision 1.12 diff -u -p -r1.12 patch-Source_cmake_OptionsGTK.cmake --- patches/patch-Source_cmake_OptionsGTK.cmake 13 Apr 2017 16:58:14 -0000 1.12 +++ patches/patch-Source_cmake_OptionsGTK.cmake 2 May 2017 12:35:34 -0000 @@ -14,13 +14,12 @@ o Do not conflict with CMAKE_MODULE_PATH o Disable DatabaseProcess and IndexedDB support. o Do not use --version-script on SunOS ---- Source/cmake/OptionsGTK.cmake.orig 2016-08-24 06:45:01.000000000 +0000 +--- Source/cmake/OptionsGTK.cmake.orig 2017-04-04 07:31:58.000000000 +0000 +++ Source/cmake/OptionsGTK.cmake -@@ -6,13 +6,6 @@ set(PROJECT_VERSION_MICRO 4) +@@ -6,12 +6,6 @@ set(PROJECT_VERSION_MICRO 1) set(PROJECT_VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_MICRO}) set(WEBKITGTK_API_VERSION 4.0) --# IndexedDB support requires GCC 4.9, see https://bugs.webkit.org/show_bug.cgi?id=98932. -if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU") - if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.9.0") - message(FATAL_ERROR "GCC 4.9.0 is required to build WebKitGTK+, use a newer GCC version or clang") @@ -29,8 +28,8 @@ o Do not use --version-script on SunOS - # Libtool library version, not to be confused with API version. # See http://www.gnu.org/software/libtool/manual/html_node/Libtool-versioning.html - CALCULATE_LIBRARY_VERSIONS_FROM_LIBTOOL_TRIPLE(WEBKIT2 50 10 13) -@@ -116,8 +109,8 @@ if (DEVELOPER_MODE) + CALCULATE_LIBRARY_VERSIONS_FROM_LIBTOOL_TRIPLE(WEBKIT2 56 4 19) +@@ -123,8 +117,8 @@ if (DEVELOPER_MODE) else () WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MINIBROWSER PUBLIC OFF) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_API_TESTS PRIVATE OFF) @@ -41,17 +40,18 @@ o Do not use --version-script on SunOS endif () endif () -@@ -152,11 +145,11 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ - WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_IMAGE_SET PRIVATE ON) +@@ -160,12 +154,12 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ + WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CANVAS_PATH PRIVATE OFF) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_REGIONS PRIVATE ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_SELECTORS_LEVEL4 PRIVATE ON) -WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DATABASE_PROCESS PRIVATE ON) +WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DATABASE_PROCESS PRIVATE OFF) + WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DOWNLOAD_ATTRIBUTE PRIVATE ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FTL_JIT PRIVATE ${ENABLE_FTL_DEFAULT}) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FTPDIR PRIVATE OFF) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FULLSCREEN_API PRIVATE ON) -WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INDEXED_DATABASE PRIVATE ON) +WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INDEXED_DATABASE PRIVATE OFF) - WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INDEXED_DATABASE_IN_WORKERS PRIVATE OFF) + WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INDEXED_DATABASE_IN_WORKERS PRIVATE ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_COLOR PRIVATE ON) - WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LEGACY_WEB_AUDIO PRIVATE OFF) + WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_CONTROLS_SCRIPT PRIVATE ON)