diff --git a/webkit-gtk/Makefile b/webkit-gtk/Makefile index 0135f72a1a..1ec48c6d8f 100644 --- a/webkit-gtk/Makefile +++ b/webkit-gtk/Makefile @@ -1,6 +1,6 @@ # $NetBSD: Makefile,v 1.126 2017/05/03 08:38:45 jperkin Exp $ -DISTNAME= webkitgtk-2.16.6 +DISTNAME= webkitgtk-2.18.2 PKGNAME= ${DISTNAME:S/webkitgtk/webkit-gtk/} CATEGORIES= www MASTER_SITES= https://www.webkitgtk.org/releases/ @@ -21,12 +21,7 @@ USE_LANGUAGES= c c++11 #USE_LIBTOOL= yes USE_TOOLS+= automake bison gmake perl:build pkg-config msgfmt -# GCC >= 4.7 or Clang >= 3.3 -# XXX: Kludge, upstream needs GCC 4.9.0 for IndexedDB support. -# XXX: patches/patch-Source_cmake_OptionsGTK.cmake and -# XXX: patches/patch-Source_WTF_wtf_Compiler.h disables that to -# XXX: avoid requiring GCC 4.9.0. -GCC_REQD+= 4.7 +GCC_REQD+= 5.0 # Using ld.gold subverts Pkgsrc wrappers, and this package also crashes buggy # versions of ld.gold. @@ -41,8 +36,9 @@ CMAKE_ARGS+= -DPORT=GTK CMAKE_ARGS+= -DENABLE_X11_TARGET=ON CMAKE_ARGS+= -DENABLE_MINIBROWSER=ON CMAKE_ARGS+= -DENABLE_GEOLOCATION=OFF +CMAKE_ARGS+= -DUSE_GSTREAMER_GL=OFF CMAKE_ARGS+= -DUSE_LIBHYPHEN=OFF -CMAKE_ARGS+= -DUSE_SYSTEM_MALLOC=ON +#CMAKE_ARGS+= -DUSE_SYSTEM_MALLOC=ON # XXX: needs adjustements for sysinfo() stuffs in Source/WTF/wtf/RAMSize.cpp REPLACE_PERL+= Source/JavaScriptCore/create_hash_table \ Source/WebCore/bindings/scripts/*.pl \ diff --git a/webkit-gtk/PLIST b/webkit-gtk/PLIST index ced3e00633..962e9b9ae5 100644 --- a/webkit-gtk/PLIST +++ b/webkit-gtk/PLIST @@ -1,4 +1,5 @@ @comment $NetBSD$ +bin/WebKitWebDriver include/webkitgtk-4.0/JavaScriptCore/JSBase.h include/webkitgtk-4.0/JavaScriptCore/JSContextRef.h include/webkitgtk-4.0/JavaScriptCore/JSObjectRef.h @@ -7,8 +8,10 @@ include/webkitgtk-4.0/JavaScriptCore/JSTypedArray.h include/webkitgtk-4.0/JavaScriptCore/JSValueRef.h include/webkitgtk-4.0/JavaScriptCore/JavaScript.h include/webkitgtk-4.0/JavaScriptCore/WebKitAvailability.h +include/webkitgtk-4.0/webkit2/WebKitApplicationInfo.h include/webkitgtk-4.0/webkit2/WebKitAuthenticationRequest.h include/webkitgtk-4.0/webkit2/WebKitAutocleanups.h +include/webkitgtk-4.0/webkit2/WebKitAutomationSession.h include/webkitgtk-4.0/webkit2/WebKitBackForwardList.h include/webkitgtk-4.0/webkit2/WebKitBackForwardListItem.h include/webkitgtk-4.0/webkit2/WebKitColorChooserRequest.h @@ -40,6 +43,8 @@ include/webkitgtk-4.0/webkit2/WebKitNavigationPolicyDecision.h include/webkitgtk-4.0/webkit2/WebKitNetworkProxySettings.h include/webkitgtk-4.0/webkit2/WebKitNotification.h include/webkitgtk-4.0/webkit2/WebKitNotificationPermissionRequest.h +include/webkitgtk-4.0/webkit2/WebKitOptionMenu.h +include/webkitgtk-4.0/webkit2/WebKitOptionMenuItem.h include/webkitgtk-4.0/webkit2/WebKitPermissionRequest.h include/webkitgtk-4.0/webkit2/WebKitPlugin.h include/webkitgtk-4.0/webkit2/WebKitPolicyDecision.h @@ -83,6 +88,8 @@ include/webkitgtk-4.0/webkitdom/WebKitDOMCSSStyleDeclaration.h include/webkitgtk-4.0/webkitdom/WebKitDOMCSSStyleSheet.h include/webkitgtk-4.0/webkitdom/WebKitDOMCSSValue.h include/webkitgtk-4.0/webkitdom/WebKitDOMCharacterData.h +include/webkitgtk-4.0/webkitdom/WebKitDOMClientRect.h +include/webkitgtk-4.0/webkitdom/WebKitDOMClientRectList.h include/webkitgtk-4.0/webkitdom/WebKitDOMComment.h include/webkitgtk-4.0/webkitdom/WebKitDOMCustom.h include/webkitgtk-4.0/webkitdom/WebKitDOMCustomUnstable.h @@ -185,28 +192,29 @@ include/webkitgtk-4.0/webkitdom/WebKitDOMXPathResult.h include/webkitgtk-4.0/webkitdom/webkitdom.h include/webkitgtk-4.0/webkitdom/webkitdomautocleanups.h include/webkitgtk-4.0/webkitdom/webkitdomdefines.h -${PLIST.introspection}lib/girepository-1.0/JavaScriptCore-4.0.typelib -${PLIST.introspection}lib/girepository-1.0/WebKit2-4.0.typelib -${PLIST.introspection}lib/girepository-1.0/WebKit2WebExtension-4.0.typelib -lib/libjavascriptcoregtk-4.0.so +lib/girepository-1.0/JavaScriptCore-4.0.typelib +lib/girepository-1.0/WebKit2-4.0.typelib +lib/girepository-1.0/WebKit2WebExtension-4.0.typelib +lib/libjavascriptcoregtk-4.0.${RUBY_DLEXT} lib/libjavascriptcoregtk-4.0.so.18 -lib/libjavascriptcoregtk-4.0.so.18.5.13 -lib/libwebkit2gtk-4.0.so +lib/libjavascriptcoregtk-4.0.so.18.6.11 +lib/libwebkit2gtk-4.0.${RUBY_DLEXT} lib/libwebkit2gtk-4.0.so.37 -lib/libwebkit2gtk-4.0.so.37.19.9 +lib/libwebkit2gtk-4.0.so.37.24.5 lib/pkgconfig/javascriptcoregtk-4.0.pc lib/pkgconfig/webkit2gtk-4.0.pc lib/pkgconfig/webkit2gtk-web-extension-4.0.pc -lib/webkit2gtk-4.0/injected-bundle/libwebkit2gtkinjectedbundle.so +lib/webkit2gtk-4.0/injected-bundle/libwebkit2gtkinjectedbundle.${RUBY_DLEXT} libexec/webkit2gtk-4.0/MiniBrowser libexec/webkit2gtk-4.0/WebKitNetworkProcess libexec/webkit2gtk-4.0/WebKitPluginProcess libexec/webkit2gtk-4.0/WebKitPluginProcess2 +libexec/webkit2gtk-4.0/WebKitStorageProcess libexec/webkit2gtk-4.0/WebKitWebProcess libexec/webkit2gtk-4.0/jsc -${PLIST.introspection}share/gir-1.0/JavaScriptCore-4.0.gir -${PLIST.introspection}share/gir-1.0/WebKit2-4.0.gir -${PLIST.introspection}share/gir-1.0/WebKit2WebExtension-4.0.gir +share/gir-1.0/JavaScriptCore-4.0.gir +share/gir-1.0/WebKit2-4.0.gir +share/gir-1.0/WebKit2WebExtension-4.0.gir share/locale/ar/LC_MESSAGES/WebKit2GTK-4.0.mo share/locale/as/LC_MESSAGES/WebKit2GTK-4.0.mo share/locale/bg/LC_MESSAGES/WebKit2GTK-4.0.mo diff --git a/webkit-gtk/distinfo b/webkit-gtk/distinfo index 6299fa8f1f..53ee909cc4 100644 --- a/webkit-gtk/distinfo +++ b/webkit-gtk/distinfo @@ -1,25 +1,25 @@ $NetBSD: distinfo,v 1.95 2017/04/25 10:37:26 wiz Exp $ -SHA1 (webkitgtk-2.16.6.tar.xz) = f7fca3fbac3dc99e39f353a6df250635e684c922 -RMD160 (webkitgtk-2.16.6.tar.xz) = f819384dddcb4cef90ddfe8f9e1fb2d11c95533c -SHA512 (webkitgtk-2.16.6.tar.xz) = bb488d7a60e4d6f9683ac343852a75854ef73e6b5aa093361ffe2d08e71e2f11c19da4447f9937221e518cda784bdacfcfd151f9395605a1957380fbc5b1533b -Size (webkitgtk-2.16.6.tar.xz) = 14658120 bytes -SHA1 (patch-CMakeLists.txt) = 07293fd11d19b6f09120a89a08ff612c36644649 +SHA1 (webkitgtk-2.18.2.tar.xz) = 75571807a1f8c9efdf62f1c37e9fadf52b73d367 +RMD160 (webkitgtk-2.18.2.tar.xz) = 3b925da56482670a6faebbcb28424bc77b95d872 +SHA512 (webkitgtk-2.18.2.tar.xz) = 94c8ce0fcee741dc9c054fa3f8ecac9756245c623f36e6b0bb5588d12b660aaa8bbbe28e82d0f694b94b75f1985f9dbf9231a4b63832fcf4efbe7a0116c7585c +Size (webkitgtk-2.18.2.tar.xz) = 14823612 bytes +SHA1 (patch-CMakeLists.txt) = 0ecf9070dc387b206b8c8083914c1fa0514a8ecc SHA1 (patch-Source_JavaScriptCore_CMakeLists.txt) = 1b3485f72d809b2a1d6ec047b36331a6489fd10d SHA1 (patch-Source_JavaScriptCore_assembler_ARMAssembler.h) = 99e46f9d9b26a8d9ba6b29c66d7ce5326c4ffeb6 SHA1 (patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp) = f78e6150ed8901b3fe046b2ef182f50f1c7500a4 -SHA1 (patch-Source_JavaScriptCore_heap_MachineStackMarker.cpp) = dd8c03f924d9b96abc9ba5d3a315fefc096be7b0 -SHA1 (patch-Source_JavaScriptCore_jit_ExecutableAllocator.h) = 7160b0b3006f21e2f73075072b76bb65fcbf5e49 +SHA1 (patch-Source_JavaScriptCore_heap_MachineStackMarker.cpp) = b23aeb61101d29c5d35bc8249cc04bcd28071d49 +SHA1 (patch-Source_JavaScriptCore_jit_ExecutableAllocator.cpp) = 06e8d6c0f0822e55e414685388788395640324a3 +SHA1 (patch-Source_JavaScriptCore_jit_ExecutableAllocator.h) = 151e9871be2056eea0cb1fc69735e36a92f85a20 SHA1 (patch-Source_ThirdParty_gtest_include_gtest_internal_gtest-port.h) = f1eee7f9d3012edee1915234c837cff820f97092 -SHA1 (patch-Source_WTF_wtf_Compiler.h) = f4f7771e4b421dddf9f73c7131e671d0c34b906c +SHA1 (patch-Source_WTF_wtf_Compiler.h) = a998482341444da104948ad7637da3f2df9628df SHA1 (patch-Source_WTF_wtf_MathExtras.h) = 01195978abe07154fbc28de9efc47b3f3105fd89 -SHA1 (patch-Source_WTF_wtf_Platform.h) = 54244d8d53b319f9a520a2f8072a79dd5b48c7f8 +SHA1 (patch-Source_WTF_wtf_Platform.h) = 3253f20593d5a92869da74774609a57eb289148b SHA1 (patch-Source_WTF_wtf_dtoa_utils.h) = 192bb016ef584f26967de94d29ee5e43db6fb1f0 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) = 2b38628e1e617ef87b20faabbbcd8be8b2cbc058 +SHA1 (patch-Source_WebKit2_CMakeLists.txt) = 26717b7743f9aa7b314c3fa972a2587f6eee8c08 +SHA1 (patch-Source_WebKit2_NetworkProcess_cache_NetworkCacheFileSystem.cpp) = 99192d0551e18f3373324d5be8bbeab00a2f79e8 SHA1 (patch-Source_cmake_OptionsCommon.cmake) = 03b72552414e7114bfa7ddc2d68fd97009a5ff7d -SHA1 (patch-Source_cmake_OptionsGTK.cmake) = ba31938e47e117449f1bb8527c50d9af88d616c5 -SHA1 (patch-ai) = b8a45f2f5c1aa5aed178527ecd6cbd93baf76f8e +SHA1 (patch-Source_cmake_OptionsGTK.cmake) = 8eb8e9c2c9aeaed86cd95c61c86e0f3786385ac9 SHA1 (patch-aj) = cd9a280c3bbab82c1a7aeb62a27ee6eb96c67ec2 diff --git a/webkit-gtk/patches/patch-CMakeLists.txt b/webkit-gtk/patches/patch-CMakeLists.txt index 1fb1066099..ee62ca98cf 100644 --- a/webkit-gtk/patches/patch-CMakeLists.txt +++ b/webkit-gtk/patches/patch-CMakeLists.txt @@ -4,9 +4,9 @@ $NetBSD$ - Fix support for ppc and add support for sparc64. From FreeBSD and OpenBSD ports. ---- CMakeLists.txt.orig 2017-02-20 16:19:36.000000000 +0000 +--- CMakeLists.txt.orig 2017-10-17 10:07:00.000000000 +0000 +++ CMakeLists.txt -@@ -61,6 +61,8 @@ else () +@@ -78,6 +78,8 @@ else () endif () if (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^arm") set(WTF_CPU_ARM 1) @@ -14,8 +14,8 @@ $NetBSD$ + set(WTF_CPU_ARM 1) elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^aarch64") set(WTF_CPU_ARM64 1) - elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^mips") -@@ -71,7 +73,7 @@ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR + elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "alpha*") +@@ -90,7 +92,7 @@ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR set(WTF_CPU_X86_64 1) elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(i[3-6]86|x86)") set(WTF_CPU_X86 1) @@ -24,7 +24,7 @@ $NetBSD$ set(WTF_CPU_PPC 1) elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64") set(WTF_CPU_PPC64 1) -@@ -83,6 +85,8 @@ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR +@@ -102,6 +104,8 @@ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR set(WTF_CPU_S390 1) elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "s390x") set(WTF_CPU_S390X 1) diff --git a/webkit-gtk/patches/patch-Source_JavaScriptCore_heap_MachineStackMarker.cpp b/webkit-gtk/patches/patch-Source_JavaScriptCore_heap_MachineStackMarker.cpp index 9165b20e0a..09c40521ae 100644 --- a/webkit-gtk/patches/patch-Source_JavaScriptCore_heap_MachineStackMarker.cpp +++ b/webkit-gtk/patches/patch-Source_JavaScriptCore_heap_MachineStackMarker.cpp @@ -3,26 +3,3 @@ $NetBSD: patch-Source_JavaScriptCore_heap_MachineStackMarker.cpp,v 1.5 2017/04/1 SunOS compatibility, though newer illumos has pthread_getattr_np so we should really add functionality tests for it and use it where available. ---- Source/JavaScriptCore/heap/MachineStackMarker.cpp.orig 2016-08-22 12:21:07.000000000 +0000 -+++ Source/JavaScriptCore/heap/MachineStackMarker.cpp -@@ -52,11 +52,7 @@ - #include - #include - --#if OS(SOLARIS) --#include --#else - #include --#endif - - #if HAVE(PTHREAD_NP_H) - #include -@@ -488,7 +484,7 @@ size_t MachineThreads::Thread::getRegist - // e.g. on FreeBSD 5.4, neundorf@kde.org - pthread_attr_get_np(platformThread, ®s.attribute); - #endif --#else -+#elif !OS(SOLARIS) - // FIXME: this function is non-portable; other POSIX systems may have different np alternatives - pthread_getattr_np(platformThread, ®s.attribute); - #endif diff --git a/webkit-gtk/patches/patch-Source_JavaScriptCore_jit_ExecutableAllocator.h b/webkit-gtk/patches/patch-Source_JavaScriptCore_jit_ExecutableAllocator.h index d0179a9565..2e01563582 100644 --- a/webkit-gtk/patches/patch-Source_JavaScriptCore_jit_ExecutableAllocator.h +++ b/webkit-gtk/patches/patch-Source_JavaScriptCore_jit_ExecutableAllocator.h @@ -6,14 +6,3 @@ Avoid to (pre)allocate 1GB of memory: From FreeBSD and OpenBSD ports. ---- Source/JavaScriptCore/jit/ExecutableAllocator.h.orig Tue Feb 28 09:34:11 2017 -+++ Source/JavaScriptCore/jit/ExecutableAllocator.h Sun Mar 26 13:55:13 2017 -@@ -66,7 +66,7 @@ static const size_t fixedExecutableMemoryPoolSize = FI - static const size_t fixedExecutableMemoryPoolSize = 16 * 1024 * 1024; - #elif CPU(ARM64) - static const size_t fixedExecutableMemoryPoolSize = 32 * 1024 * 1024; --#elif CPU(X86_64) -+#elif CPU(X86_64) && !defined(__OpenBSD__) && !defined(__FreeBSD__) && !defined(__NetBSD__) - static const size_t fixedExecutableMemoryPoolSize = 1024 * 1024 * 1024; - #else - static const size_t fixedExecutableMemoryPoolSize = 32 * 1024 * 1024; diff --git a/webkit-gtk/patches/patch-Source_WTF_wtf_Compiler.h b/webkit-gtk/patches/patch-Source_WTF_wtf_Compiler.h index 34146eba0a..3e1e991454 100644 --- a/webkit-gtk/patches/patch-Source_WTF_wtf_Compiler.h +++ b/webkit-gtk/patches/patch-Source_WTF_wtf_Compiler.h @@ -8,25 +8,3 @@ XXX: Actually in pkgsrc we are using a kludge in order to avoid a pretty new gcc XXX: version, that in reality is needed only for IndexedDB support (disabled in XXX: the pkgsrc case). ---- Source/WTF/wtf/Compiler.h.orig 2016-04-11 06:18:43.000000000 +0000 -+++ Source/WTF/wtf/Compiler.h -@@ -70,15 +70,17 @@ - #define GCC_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) - #define GCC_VERSION_AT_LEAST(major, minor, patch) (GCC_VERSION >= (major * 10000 + minor * 100 + patch)) - --#if !GCC_VERSION_AT_LEAST(4, 9, 0) --#error "Please use a newer version of GCC. WebKit requires GCC 4.9.0 or newer to compile." -+#if !GCC_VERSION_AT_LEAST(4, 7, 0) -+#error "Please use a newer version of GCC. WebKit requires GCC 4.7.0 or newer to compile." - #endif - - #if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L - #define WTF_COMPILER_SUPPORTS_C_STATIC_ASSERT 1 - #endif - -+#if GCC_VERSION_AT_LEAST(4, 8, 0) - #pragma GCC diagnostic ignored "-Wmaybe-uninitialized" -+#endif - - #endif /* COMPILER(GCC) */ - diff --git a/webkit-gtk/patches/patch-Source_WTF_wtf_Platform.h b/webkit-gtk/patches/patch-Source_WTF_wtf_Platform.h index 9f512f41ff..dc0e492d52 100644 --- a/webkit-gtk/patches/patch-Source_WTF_wtf_Platform.h +++ b/webkit-gtk/patches/patch-Source_WTF_wtf_Platform.h @@ -6,8 +6,8 @@ Add support for sparc64: From OpenBSD ports. ---- Source/WTF/wtf/Platform.h.orig Tue Feb 28 09:34:11 2017 -+++ Source/WTF/wtf/Platform.h Sun Mar 26 13:55:13 2017 +--- Source/WTF/wtf/Platform.h.orig 2017-10-16 12:18:56.000000000 +0000 ++++ Source/WTF/wtf/Platform.h @@ -155,6 +155,12 @@ #define WTF_CPU_BIG_ENDIAN 1 #endif @@ -21,16 +21,16 @@ From OpenBSD ports. /* CPU(X86) - i386 / x86 32-bit */ #if defined(__i386__) \ || defined(i386) \ -@@ -348,7 +354,7 @@ +@@ -353,7 +359,7 @@ #endif /* ARM */ --#if CPU(ARM) || CPU(MIPS) || CPU(SH4) -+#if CPU(ARM) || CPU(MIPS) || CPU(SH4) || CPU(SPARC64) +-#if CPU(ARM) || CPU(MIPS) || CPU(SH4) || CPU(ALPHA) || CPU(HPPA) ++#if CPU(ARM) || CPU(MIPS) || CPU(SH4) || CPU(ALPHA) || CPU(HPPA) || CPU(SPARC64) #define WTF_CPU_NEEDS_ALIGNED_ACCESS 1 #endif -@@ -680,7 +686,8 @@ +@@ -713,7 +719,8 @@ || CPU(S390X) \ || CPU(MIPS64) \ || CPU(PPC64) \ @@ -40,7 +40,7 @@ From OpenBSD ports. #define USE_JSVALUE64 1 #else #define USE_JSVALUE32_64 1 -@@ -736,7 +743,7 @@ +@@ -770,7 +777,7 @@ #if !defined(ENABLE_DFG_JIT) && ENABLE(JIT) /* Enable the DFG JIT on X86 and X86_64. */ diff --git a/webkit-gtk/patches/patch-Source_WebKit2_CMakeLists.txt b/webkit-gtk/patches/patch-Source_WebKit2_CMakeLists.txt index c2e1b228b1..7b85ec5bad 100644 --- a/webkit-gtk/patches/patch-Source_WebKit2_CMakeLists.txt +++ b/webkit-gtk/patches/patch-Source_WebKit2_CMakeLists.txt @@ -2,17 +2,3 @@ $NetBSD: patch-Source_WebKit2_CMakeLists.txt,v 1.1 2017/04/13 16:58:14 jperkin E Use -lsocket on SunOS. ---- Source/WebKit2/CMakeLists.txt.orig 2016-08-22 12:21:08.000000000 +0000 -+++ Source/WebKit2/CMakeLists.txt -@@ -740,6 +740,11 @@ mark_as_advanced(LIBRT_LIBRARIES) - if (LIBRT_LIBRARIES) - list(APPEND WebKit2_LIBRARIES ${LIBRT_LIBRARIES}) - endif () -+find_library(LIBSOCKET_LIBRARIES NAMES socket) -+mark_as_advanced(LIBSOCKET_LIBRARIES) -+if (LIBSOCKET_LIBRARIES) -+ list(APPEND WebKit2_LIBRARIES ${LIBSOCKET_LIBRARIES}) -+endif () - - macro(ADD_WEBKIT2_PREFIX_HEADER _target) - if (WebKit2_USE_PREFIX_HEADER) diff --git a/webkit-gtk/patches/patch-Source_WebKit2_NetworkProcess_cache_NetworkCacheFileSystem.cpp b/webkit-gtk/patches/patch-Source_WebKit2_NetworkProcess_cache_NetworkCacheFileSystem.cpp index 4446109112..200b921ebd 100644 --- a/webkit-gtk/patches/patch-Source_WebKit2_NetworkProcess_cache_NetworkCacheFileSystem.cpp +++ b/webkit-gtk/patches/patch-Source_WebKit2_NetworkProcess_cache_NetworkCacheFileSystem.cpp @@ -2,8 +2,8 @@ $NetBSD: patch-Source_WebKit2_NetworkProcess_cache_NetworkCacheFileSystem.cpp,v SunOS does not support dirent d_type. ---- Source/WebKit2/NetworkProcess/cache/NetworkCacheFileSystem.cpp.orig 2017-02-20 16:20:17.000000000 +0000 -+++ Source/WebKit2/NetworkProcess/cache/NetworkCacheFileSystem.cpp +--- Source/WebKit/NetworkProcess/cache/NetworkCacheFileSystem.cpp.orig 2017-02-20 16:20:17.000000000 +0000 ++++ Source/WebKit/NetworkProcess/cache/NetworkCacheFileSystem.cpp @@ -52,6 +52,12 @@ namespace NetworkCache { static DirectoryEntryType directoryEntryType(uint8_t dtype) diff --git a/webkit-gtk/patches/patch-Source_cmake_OptionsGTK.cmake b/webkit-gtk/patches/patch-Source_cmake_OptionsGTK.cmake index 5023aa3078..02c7870f37 100644 --- a/webkit-gtk/patches/patch-Source_cmake_OptionsGTK.cmake +++ b/webkit-gtk/patches/patch-Source_cmake_OptionsGTK.cmake @@ -1,6 +1,5 @@ $NetBSD: patch-Source_cmake_OptionsGTK.cmake,v 1.12 2017/04/13 16:58:14 jperkin Exp $ -o Do not require GCC 4.9.0 (should be build *without* IndexedDB support) o Do not conflict with CMAKE_MODULE_PATH during the linking phase of libwebkit2gtk-4.0.so: @@ -11,25 +10,11 @@ o Do not conflict with CMAKE_MODULE_PATH during the linking phase of Source/WebKit2/CMakeFiles/WebKit2.dir/build.make:16139: recipe for target 'lib/libwebkit2gtk-4.0.so.37.2.6' failed [...] -o Disable DatabaseProcess and IndexedDB support. o Do not use --version-script on SunOS ---- Source/cmake/OptionsGTK.cmake.orig 2017-07-24 11:57:56.000000000 +0000 +--- Source/cmake/OptionsGTK.cmake.orig 2017-10-27 09:31:34.000000000 +0000 +++ Source/cmake/OptionsGTK.cmake -@@ -6,12 +6,6 @@ set(PROJECT_VERSION_MICRO 6) - set(PROJECT_VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_MICRO}) - set(WEBKITGTK_API_VERSION 4.0) - --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") -- endif () --endif () -- - # 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 56 9 19) -@@ -122,8 +116,8 @@ if (DEVELOPER_MODE) +@@ -108,8 +108,8 @@ if (DEVELOPER_MODE) else () WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MINIBROWSER PUBLIC OFF) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_API_TESTS PRIVATE OFF) @@ -40,18 +25,3 @@ o Do not use --version-script on SunOS endif () endif () -@@ -159,12 +153,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 ON) - WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_COLOR PRIVATE ON) - WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_CONTROLS_SCRIPT PRIVATE ON) diff --git a/webkit-gtk/patches/patch-ai b/webkit-gtk/patches/patch-ai index 724604d1ac..e69de29bb2 100644 --- a/webkit-gtk/patches/patch-ai +++ b/webkit-gtk/patches/patch-ai @@ -1,17 +0,0 @@ -$NetBSD: patch-ai,v 1.7 2016/01/21 13:42:33 leot Exp $ - ---- Source/WTF/wtf/ThreadIdentifierDataPthreads.cpp.orig 2016-01-04 10:38:34.000000000 +0000 -+++ Source/WTF/wtf/ThreadIdentifierDataPthreads.cpp -@@ -39,6 +39,12 @@ - #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) -+#include -+// PTHREAD_KEYS_MAX is not defined in 5.x -+#ifndef PTHREAD_KEYS_MAX -+#define PTHREAD_KEYS_MAX 256 -+#endif - #else - #include - #endif