webkit-gtk: Update to 2.24.0 pkgsrc patches: - Remove patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp: logic changed upstream and there is no longer a function that check for a VFP. Changes: 2.24.0 ------ - Added support fot content filtering. - Variation fonts support. - Fully emoji rendering support. - Added navigation and pinch zoom gestures for touchpads. - Support for JPEG2000 images. - Script dialogs are now modal to the current web view only. - New API to convert URI to format for display. Index: Makefile =================================================================== RCS file: /cvsroot/pkgsrc/www/webkit-gtk/Makefile,v retrieving revision 1.158 diff -u -p -r1.158 Makefile --- Makefile 1 Mar 2019 18:53:17 -0000 1.158 +++ Makefile 13 Mar 2019 12:20:29 -0000 @@ -1,6 +1,6 @@ # $NetBSD: Makefile,v 1.158 2019/03/01 18:53:17 leot Exp $ -DISTNAME= webkitgtk-2.22.7 +DISTNAME= webkitgtk-2.24.0 PKGNAME= ${DISTNAME:S/webkitgtk/webkit-gtk/} CATEGORIES= www MASTER_SITES= https://www.webkitgtk.org/releases/ Index: distinfo =================================================================== RCS file: /cvsroot/pkgsrc/www/webkit-gtk/distinfo,v retrieving revision 1.117 diff -u -p -r1.117 distinfo --- distinfo 1 Mar 2019 18:53:17 -0000 1.117 +++ distinfo 13 Mar 2019 12:20:29 -0000 @@ -1,28 +1,27 @@ $NetBSD: distinfo,v 1.117 2019/03/01 18:53:17 leot Exp $ -SHA1 (webkitgtk-2.22.7.tar.xz) = 5f45147f6fc4b6a0dd3c545bf857679313230507 -RMD160 (webkitgtk-2.22.7.tar.xz) = ec7badb02357401ed264e1055c6a2ace84aa9a10 -SHA512 (webkitgtk-2.22.7.tar.xz) = c11f60b14f279752bb75efce4b69cbfd75e854bfb16772edc3b24d28eff2fb65090e03f24c1cfaf1f27668e017d877e04d5210560da70568029c5af33a916126 -Size (webkitgtk-2.22.7.tar.xz) = 16777676 bytes -SHA1 (patch-CMakeLists.txt) = 93466370f447c6be9008512aa1fc2dc0bd2b843b -SHA1 (patch-Source_JavaScriptCore_assembler_ARM64Assembler.h) = a41e02c7a1f9bfb91a2af36ec0410e1bf2b9a745 -SHA1 (patch-Source_JavaScriptCore_assembler_ARMAssembler.h) = bae08310572c2e23c69cbf6aa9760a67345dcfe3 -SHA1 (patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp) = ab75ef8714e5071fcd094735717a2f5d0321c747 +SHA1 (webkitgtk-2.24.0.tar.xz) = 737fc7a6f5b5b5e2844c8488e60196d61802a952 +RMD160 (webkitgtk-2.24.0.tar.xz) = 6527bf43374911dd82943757ae2ba622d1792722 +SHA512 (webkitgtk-2.24.0.tar.xz) = 7a1444b22fb59ecdd638344acf3525f1ef9204215a568e185f2ac7f4e43cf89c7be307be31d51ec46231bbf5e9470e48d56395873d7368aca8022ff5c4100dab +Size (webkitgtk-2.24.0.tar.xz) = 17894000 bytes +SHA1 (patch-CMakeLists.txt) = 571c65d258b6e12503971145777a8d442578145f +SHA1 (patch-Source_JavaScriptCore_assembler_ARM64Assembler.h) = f80d9811f108a72efe16f0e39b97f503d7738840 +SHA1 (patch-Source_JavaScriptCore_assembler_ARMv7Assembler.h) = 985c19ffb6a16df031bd284f7e79041adb8cd311 SHA1 (patch-Source_JavaScriptCore_heap_MarkedSpace.cpp) = e6a23d5ef22bddd0a9606fb0e472960e4cf5673e -SHA1 (patch-Source_JavaScriptCore_jit_ExecutableAllocator.cpp) = 36d29a5db03c2413ae93224ac391f3ff248983e8 -SHA1 (patch-Source_JavaScriptCore_offlineasm_arm64.rb) = 784baf6f3baba2986fbcb7aa10e7abed8f8c6336 +SHA1 (patch-Source_JavaScriptCore_jit_ExecutableAllocator.cpp) = d600887955128cecece21ba401f6f53ba5cfbeb6 +SHA1 (patch-Source_JavaScriptCore_offlineasm_arm64.rb) = 8c05dafa317667bbf55504d05eeb8ae06fba4e93 SHA1 (patch-Source_JavaScriptCore_runtime_MachineContext.h) = 23bc86a389f8009ec829c3ee0fe3effe3f20b012 -SHA1 (patch-Source_ThirdParty_gtest_include_gtest_internal_gtest-port.h) = f1eee7f9d3012edee1915234c837cff820f97092 -SHA1 (patch-Source_WTF_wtf_Platform.h) = 5cf36cf7cca8a39d75a788ca988758927b421d95 -SHA1 (patch-Source_WTF_wtf_RAMSize.cpp) = aa36df14e9715a47a386c37082a540390e30efa4 +SHA1 (patch-Source_ThirdParty_gtest_include_gtest_internal_gtest-port.h) = a5454eb891ad1f9d8285c28af2e9efb4ff439e6b +SHA1 (patch-Source_WTF_wtf_FileSystem.cpp) = 9d6204ce6663f3b32d195e307540c5cc5e7a7988 +SHA1 (patch-Source_WTF_wtf_Platform.h) = 584720f4e248ff7e51166c267d08954786c28ab7 +SHA1 (patch-Source_WTF_wtf_RAMSize.cpp) = 21e442fc0025f7eb0a90f491d4bdfd35e26baadb SHA1 (patch-Source_WTF_wtf_StackBounds.cpp) = 22a71daac8443f079ad8bcc7285cfd7319c972b3 SHA1 (patch-Source_WebCore_inspector_InspectorFrontendHost.cpp) = daf6351a1a0b5a49592a2bb6db0d54620c7b09e3 -SHA1 (patch-Source_WebCore_platform_FileSystem.cpp) = adef1a42c4e210f0a3dcb82807e2d2039684a0ec SHA1 (patch-Source_WebCore_platform_graphics_filters_FEMorphology.cpp) = 16b36d2d91fd7f43156b9ee09bcafd19602ebbd9 SHA1 (patch-Source_WebCore_rendering_shapes_RasterShape.cpp) = 551e47698dee50d097b11e3218f13bb3447edfea SHA1 (patch-Source_WebKit_CMakeLists.txt) = 228cc4734de3b08a3877ac839b1ffa2fbf2d3aa8 -SHA1 (patch-Source_WebKit_NetworkProcess_cache_NetworkCacheFileSystem.cpp) = 810dfbd5be6a6a2fd2c70795ed257d973fc3e4fe -SHA1 (patch-Source_WebKit_PlatformGTK.cmake) = 91a7e63ebeac06cca21547aa7025a55a4d174b6d +SHA1 (patch-Source_WebKit_NetworkProcess_cache_NetworkCacheFileSystem.cpp) = 8c19692e78b1cfb021b95435508a10bc6542b173 +SHA1 (patch-Source_WebKit_PlatformGTK.cmake) = 61d2b4942b83d3f3c1b642d122f109ba90bbff9d SHA1 (patch-Source_WebKit_Platform_IPC_unix_ConnectionUnix.cpp) = 9c58253868e06b3dd3cac936651ba7e6a1437fc6 SHA1 (patch-Source_WebKit_Platform_classifier_ResourceLoadStatisticsClassifier.cpp) = 920376ec8697780637f376b2fff312b7e214a7f6 SHA1 (patch-Source_bmalloc_bmalloc_BPlatform.h) = ad6c6f93732a4bb355ac2b65bff8968aae0460ba Index: patches/patch-CMakeLists.txt =================================================================== RCS file: /cvsroot/pkgsrc/www/webkit-gtk/patches/patch-CMakeLists.txt,v retrieving revision 1.7 diff -u -p -r1.7 patch-CMakeLists.txt --- patches/patch-CMakeLists.txt 23 Dec 2018 22:22:47 -0000 1.7 +++ patches/patch-CMakeLists.txt 13 Mar 2019 12:20:29 -0000 @@ -3,18 +3,18 @@ $NetBSD: patch-CMakeLists.txt,v 1.7 2018 - Fix support for arm - Fix support for ppc, from FreeBSD. ---- CMakeLists.txt.orig 2018-12-13 01:57:34.000000000 +0000 +--- CMakeLists.txt.orig 2019-02-12 11:20:53.000000000 +0000 +++ CMakeLists.txt -@@ -85,6 +85,8 @@ else () +@@ -86,7 +86,7 @@ else () endif () - if (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^arm") - set(WTF_CPU_ARM 1) -+elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^earm") -+ set(WTF_CPU_ARM 1) - elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^aarch64") + if (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(^aarch64|^arm64)") set(WTF_CPU_ARM64 1) +-elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^arm") ++elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(^arm|^earm)") + set(WTF_CPU_ARM 1) elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^mips64") -@@ -95,9 +97,9 @@ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR + set(WTF_CPU_MIPS64 1) +@@ -96,9 +96,9 @@ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR set(WTF_CPU_X86_64 1) elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(i[3-6]86|x86)") set(WTF_CPU_X86 1) Index: patches/patch-Source_JavaScriptCore_assembler_ARM64Assembler.h =================================================================== RCS file: /cvsroot/pkgsrc/www/webkit-gtk/patches/patch-Source_JavaScriptCore_assembler_ARM64Assembler.h,v retrieving revision 1.2 diff -u -p -r1.2 patch-Source_JavaScriptCore_assembler_ARM64Assembler.h --- patches/patch-Source_JavaScriptCore_assembler_ARM64Assembler.h 23 Dec 2018 22:18:14 -0000 1.2 +++ patches/patch-Source_JavaScriptCore_assembler_ARM64Assembler.h 13 Mar 2019 12:20:29 -0000 @@ -5,9 +5,9 @@ $NetBSD: patch-Source_JavaScriptCore_ass Based on patch from FreeBSD ports but using __builtin___clear_cache() instead of __clear_cache() (the former is also available in gcc). ---- Source/JavaScriptCore/assembler/ARM64Assembler.h.orig 2018-12-13 01:57:37.000000000 +0000 +--- Source/JavaScriptCore/assembler/ARM64Assembler.h.orig 2019-02-12 11:21:03.000000000 +0000 +++ Source/JavaScriptCore/assembler/ARM64Assembler.h -@@ -456,7 +456,7 @@ public: +@@ -462,7 +462,7 @@ public: JumpLinkType m_linkType : 8; Condition m_condition : 4; unsigned m_bitNumber : 6; @@ -16,9 +16,9 @@ $NetBSD: patch-Source_JavaScriptCore_ass bool m_is64Bit : 1; } realTypes; struct CopyTypes { -@@ -2863,6 +2863,8 @@ public: +@@ -2874,6 +2874,8 @@ public: { - #if OS(IOS) + #if OS(IOS_FAMILY) sys_cache_control(kCacheFunctionPrepareForExecution, code, size); +#elif OS(FREEBSD) || OS(NETBSD) + __builtin___clear_cache(code, reinterpret_cast(code) + size); Index: patches/patch-Source_JavaScriptCore_assembler_ARMAssembler.h =================================================================== RCS file: patches/patch-Source_JavaScriptCore_assembler_ARMAssembler.h diff -N patches/patch-Source_JavaScriptCore_assembler_ARMAssembler.h --- patches/patch-Source_JavaScriptCore_assembler_ARMAssembler.h 24 Oct 2018 18:31:07 -0000 1.7 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,30 +0,0 @@ -$NetBSD: patch-Source_JavaScriptCore_assembler_ARMAssembler.h,v 1.7 2018/10/24 18:31:07 leot Exp $ - -Add support for NetBSD. - ---- Source/JavaScriptCore/assembler/ARMAssembler.h.orig 2016-01-20 12:12:59.000000000 +0000 -+++ Source/JavaScriptCore/assembler/ARMAssembler.h -@@ -29,6 +29,11 @@ - - #if ENABLE(ASSEMBLER) && CPU(ARM_TRADITIONAL) - -+#if OS(NETBSD) -+#include -+#include -+#endif -+ - #include "AssemblerBufferWithConstantPool.h" - #include "JITCompilationEffort.h" - #include -@@ -1128,6 +1133,11 @@ namespace JSC { - linuxPageFlush(current, current + page); - - linuxPageFlush(current, end); -+#elif OS(NETBSD) -+ struct arm_sync_icache_args arg; -+ arg.addr = reinterpret_cast(code); -+ arg.len = size; -+ sysarch(ARM_SYNC_ICACHE, (void *)&arg); - #else - #error "The cacheFlush support is missing on this platform." - #endif Index: patches/patch-Source_JavaScriptCore_assembler_ARMv7Assembler.h =================================================================== RCS file: patches/patch-Source_JavaScriptCore_assembler_ARMv7Assembler.h diff -N patches/patch-Source_JavaScriptCore_assembler_ARMv7Assembler.h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-Source_JavaScriptCore_assembler_ARMv7Assembler.h 13 Mar 2019 12:20:29 -0000 @@ -0,0 +1,30 @@ +$NetBSD$ + +Add support for NetBSD. + +--- Source/JavaScriptCore/assembler/ARMv7Assembler.h.orig 2019-02-12 11:21:03.000000000 +0000 ++++ Source/JavaScriptCore/assembler/ARMv7Assembler.h +@@ -28,6 +28,11 @@ + + #if ENABLE(ASSEMBLER) && CPU(ARM_THUMB2) + ++#if OS(NETBSD) ++#include ++#include ++#endif ++ + #include "AssemblerBuffer.h" + #include "AssemblerCommon.h" + #include +@@ -2488,6 +2493,11 @@ public: + linuxPageFlush(current, current + page); + + linuxPageFlush(current, end); ++#elif OS(NETBSD) ++ struct arm_sync_icache_args arg; ++ arg.addr = reinterpret_cast(code); ++ arg.len = size; ++ sysarch(ARM_SYNC_ICACHE, (void *)&arg); + #else + #error "The cacheFlush support is missing on this platform." + #endif Index: patches/patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp =================================================================== RCS file: patches/patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp diff -N patches/patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp --- patches/patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp 24 Oct 2018 18:31:07 -0000 1.6 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,32 +0,0 @@ -$NetBSD: patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp,v 1.6 2018/10/24 18:31:07 leot Exp $ - -Add support for NetBSD. - ---- Source/JavaScriptCore/assembler/MacroAssemblerARM.cpp.orig 2016-01-20 12:12:59.000000000 +0000 -+++ Source/JavaScriptCore/assembler/MacroAssemblerARM.cpp -@@ -38,6 +38,8 @@ - #include - #include - #include -+#elif OS(NETBSD) -+#include - #endif - - namespace JSC { -@@ -57,6 +59,16 @@ static bool isVFPPresent() - close(fd); - } - #endif // OS(LINUX) -+ -+#if OS(NETBSD) -+ size_t len; -+ int flag; -+ -+ len = sizeof(flag); -+ if (sysctlbyname("machdep.fpu_present", &flag, &len, NULL, 0) == 0) { -+ return flag == 1; -+ } -+#endif // OS(NETBSD) - - #if (COMPILER(GCC_OR_CLANG) && defined(__VFP_FP__)) - return true; Index: patches/patch-Source_JavaScriptCore_jit_ExecutableAllocator.cpp =================================================================== RCS file: /cvsroot/pkgsrc/www/webkit-gtk/patches/patch-Source_JavaScriptCore_jit_ExecutableAllocator.cpp,v retrieving revision 1.2 diff -u -p -r1.2 patch-Source_JavaScriptCore_jit_ExecutableAllocator.cpp --- patches/patch-Source_JavaScriptCore_jit_ExecutableAllocator.cpp 24 Oct 2018 18:31:07 -0000 1.2 +++ patches/patch-Source_JavaScriptCore_jit_ExecutableAllocator.cpp 13 Mar 2019 12:20:29 -0000 @@ -6,12 +6,12 @@ Avoid to (pre)allocate 1GB of memory on From OpenBSD ports. ---- Source/JavaScriptCore/jit/ExecutableAllocator.cpp.orig 2017-08-09 09:13:42.000000000 +0000 +--- Source/JavaScriptCore/jit/ExecutableAllocator.cpp.orig 2019-02-12 11:21:03.000000000 +0000 +++ Source/JavaScriptCore/jit/ExecutableAllocator.cpp -@@ -88,7 +88,7 @@ static const size_t fixedExecutableMemor +@@ -92,7 +92,7 @@ static const size_t fixedExecutableMemor static const size_t fixedExecutableMemoryPoolSize = 16 * 1024 * 1024; #elif CPU(ARM64) - static const size_t fixedExecutableMemoryPoolSize = 64 * 1024 * 1024; + static const size_t fixedExecutableMemoryPoolSize = 128 * 1024 * 1024; -#elif CPU(X86_64) +#elif CPU(X86_64) && !OS(OPENBSD) static const size_t fixedExecutableMemoryPoolSize = 1024 * 1024 * 1024; Index: patches/patch-Source_JavaScriptCore_offlineasm_arm64.rb =================================================================== RCS file: /cvsroot/pkgsrc/www/webkit-gtk/patches/patch-Source_JavaScriptCore_offlineasm_arm64.rb,v retrieving revision 1.1 diff -u -p -r1.1 patch-Source_JavaScriptCore_offlineasm_arm64.rb --- patches/patch-Source_JavaScriptCore_offlineasm_arm64.rb 13 Nov 2018 20:11:38 -0000 1.1 +++ patches/patch-Source_JavaScriptCore_offlineasm_arm64.rb 13 Mar 2019 12:20:29 -0000 @@ -4,14 +4,16 @@ Add support for FreeBSD and NetBSD. From FreeBSD ports. ---- Source/JavaScriptCore/offlineasm/arm64.rb.orig 2018-10-27 21:20:55.000000000 +0000 +--- Source/JavaScriptCore/offlineasm/arm64.rb.orig 2019-02-12 11:21:03.000000000 +0000 +++ Source/JavaScriptCore/offlineasm/arm64.rb -@@ -938,7 +938,7 @@ class Instruction - $asm.puts "ldr #{operands[1].arm64Operand(:ptr)}, [#{operands[1].arm64Operand(:ptr)}, #{operands[0].asmLabel}@GOTPAGEOFF]" +@@ -1033,8 +1033,8 @@ class Instruction + $asm.puts "L_offlineasm_loh_ldr_#{uid}:" + $asm.puts "ldr #{operands[1].arm64Operand(:quad)}, [#{operands[1].arm64Operand(:quad)}, #{operands[0].asmLabel}@GOTPAGEOFF]" - # On Linux, use ELF GOT relocation specifiers. +- # On Linux, use ELF GOT relocation specifiers. - $asm.putStr("#elif OS(LINUX)") ++ # On Linux, FreeBSD and NetBSD, use ELF GOT relocation specifiers. + $asm.putStr("#elif OS(LINUX) || OS(FREEBSD) || OS(NETBSD)") - $asm.puts "adrp #{operands[1].arm64Operand(:ptr)}, :got:#{operands[0].asmLabel}" - $asm.puts "ldr #{operands[1].arm64Operand(:ptr)}, [#{operands[1].arm64Operand(:ptr)}, :got_lo12:#{operands[0].asmLabel}]" + $asm.puts "adrp #{operands[1].arm64Operand(:quad)}, :got:#{operands[0].asmLabel}" + $asm.puts "ldr #{operands[1].arm64Operand(:quad)}, [#{operands[1].arm64Operand(:quad)}, :got_lo12:#{operands[0].asmLabel}]" Index: patches/patch-Source_ThirdParty_gtest_include_gtest_internal_gtest-port.h =================================================================== RCS file: /cvsroot/pkgsrc/www/webkit-gtk/patches/patch-Source_ThirdParty_gtest_include_gtest_internal_gtest-port.h,v retrieving revision 1.3 diff -u -p -r1.3 patch-Source_ThirdParty_gtest_include_gtest_internal_gtest-port.h --- patches/patch-Source_ThirdParty_gtest_include_gtest_internal_gtest-port.h 3 Aug 2014 22:30:05 -0000 1.3 +++ patches/patch-Source_ThirdParty_gtest_include_gtest_internal_gtest-port.h 13 Mar 2019 12:20:29 -0000 @@ -1,28 +1,28 @@ $NetBSD: patch-Source_ThirdParty_gtest_include_gtest_internal_gtest-port.h,v 1.3 2014/08/03 22:30:05 wiz Exp $ ---- Source/ThirdParty/gtest/include/gtest/internal/gtest-port.h.orig 2013-09-09 09:20:59.000000000 +0000 +--- Source/ThirdParty/gtest/include/gtest/internal/gtest-port.h.orig 2019-02-12 11:21:03.000000000 +0000 +++ Source/ThirdParty/gtest/include/gtest/internal/gtest-port.h -@@ -35,6 +35,7 @@ +@@ -42,6 +42,7 @@ #ifndef GTEST_INCLUDE_GTEST_INTERNAL_GTEST_PORT_H_ #define GTEST_INCLUDE_GTEST_INTERNAL_GTEST_PORT_H_ +#include - // The user can define the following macros in the build script to - // control Google Test's behavior. If the user doesn't define a macro -@@ -175,6 +176,7 @@ + // Environment-describing macros + // ----------------------------- +@@ -268,6 +269,7 @@ #include #include #include +#include #ifndef _WIN32_WCE - #include - #endif // !_WIN32_WCE -@@ -448,7 +450,14 @@ + # include + # include +@@ -755,7 +757,14 @@ typedef struct _RTL_CRITICAL_SECTION GTE // GCC 4.0+ implements tr1/tuple in the header. This does // not conform to the TR1 spec, which requires the header to be . --#if !GTEST_HAS_RTTI && GTEST_GCC_VER_ < 40302 +-# if !GTEST_HAS_RTTI && GTEST_GCC_VER_ < 40302 +#if defined(_LIBCPP_VERSION) +#include +namespace std { Index: patches/patch-Source_WTF_wtf_FileSystem.cpp =================================================================== RCS file: patches/patch-Source_WTF_wtf_FileSystem.cpp diff -N patches/patch-Source_WTF_wtf_FileSystem.cpp --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-Source_WTF_wtf_FileSystem.cpp 13 Mar 2019 12:20:29 -0000 @@ -0,0 +1,16 @@ +$NetBSD$ + +Support MAP_FILE if unavailable. + +--- Source/WTF/wtf/FileSystem.cpp.orig 2019-02-12 11:21:17.000000000 +0000 ++++ Source/WTF/wtf/FileSystem.cpp +@@ -316,6 +316,9 @@ MappedFileData::MappedFileData(const Str + return; + } + ++#ifndef MAP_FILE ++#define MAP_FILE 0 ++#endif + void* data = mmap(0, size, PROT_READ, MAP_FILE | MAP_SHARED, fd, 0); + close(fd); + Index: patches/patch-Source_WTF_wtf_Platform.h =================================================================== RCS file: /cvsroot/pkgsrc/www/webkit-gtk/patches/patch-Source_WTF_wtf_Platform.h,v retrieving revision 1.12 diff -u -p -r1.12 patch-Source_WTF_wtf_Platform.h --- patches/patch-Source_WTF_wtf_Platform.h 24 Oct 2018 18:31:07 -0000 1.12 +++ patches/patch-Source_WTF_wtf_Platform.h 13 Mar 2019 12:20:29 -0000 @@ -6,9 +6,9 @@ $NetBSD: patch-Source_WTF_wtf_Platform.h MADV_FREE. - Add support for NetBSD. ---- Source/WTF/wtf/Platform.h.orig 2018-09-21 19:59:47.000000000 +0000 +--- Source/WTF/wtf/Platform.h.orig 2019-03-05 15:32:47.000000000 +0000 +++ Source/WTF/wtf/Platform.h -@@ -410,6 +410,11 @@ +@@ -413,6 +413,11 @@ #define WTF_OS_OPENBSD 1 #endif @@ -20,7 +20,7 @@ $NetBSD: patch-Source_WTF_wtf_Platform.h /* OS(WINDOWS) - Any version of Windows */ #if defined(WIN32) || defined(_WIN32) #define WTF_OS_WINDOWS 1 -@@ -427,6 +432,7 @@ +@@ -430,6 +435,7 @@ || OS(LINUX) \ || OS(NETBSD) \ || OS(OPENBSD) \ @@ -28,7 +28,7 @@ $NetBSD: patch-Source_WTF_wtf_Platform.h || defined(unix) \ || defined(__unix) \ || defined(__unix__) -@@ -567,8 +573,10 @@ +@@ -578,8 +584,10 @@ #define USE_HARFBUZZ 1 #define USE_SOUP 1 #define USE_WEBP 1 @@ -39,25 +39,21 @@ $NetBSD: patch-Source_WTF_wtf_Platform.h #if PLATFORM(GTK) #define GLIB_VERSION_MIN_REQUIRED GLIB_VERSION_2_36 -@@ -693,11 +701,16 @@ +@@ -710,7 +718,12 @@ #endif /* OS(DARWIN) */ +-#if OS(DARWIN) || OS(FUCHSIA) || ((OS(FREEBSD) || defined(__GLIBC__) || defined(__BIONIC__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS))) +#if OS(FREEBSD) || OS(NETBSD) || OS(OPENBSD) +#define HAVE_MADV_FREE 1 +#define HAVE_MADV_DONTNEED 1 +#endif + - #if PLATFORM(COCOA) - #define HAVE_CFNETWORK_STORAGE_PARTITIONING 1 - #endif - --#if OS(DARWIN) || OS(FUCHSIA) || ((OS(FREEBSD) || defined(__GLIBC__) || defined(__BIONIC__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS))) +#if OS(DARWIN) || OS(FUCHSIA) || ((OS(FREEBSD) || OS(NETBSD) || defined(__GLIBC__) || defined(__BIONIC__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS))) #define HAVE_MACHINE_CONTEXT 1 #endif -@@ -786,11 +799,11 @@ +@@ -818,11 +831,11 @@ #if !defined(ENABLE_DFG_JIT) && ENABLE(JIT) /* Enable the DFG JIT on X86 and X86_64. */ @@ -65,9 +61,10 @@ $NetBSD: patch-Source_WTF_wtf_Platform.h +#if (CPU(X86) || CPU(X86_64)) && (OS(DARWIN) || OS(LINUX) || OS(FREEBSD) || OS(NETBSD) || OS(HURD) || OS(WINDOWS)) #define ENABLE_DFG_JIT 1 #endif - /* Enable the DFG JIT on ARMv7. Only tested on iOS, Linux, and FreeBSD. */ --#if (CPU(ARM_THUMB2) || CPU(ARM64)) && (PLATFORM(IOS) || OS(LINUX) || OS(FREEBSD)) -+#if (CPU(ARM_THUMB2) || CPU(ARM64)) && (PLATFORM(IOS) || OS(LINUX) || OS(FREEBSD) || OS(NETBSD)) +-/* Enable the DFG JIT on ARMv7. Only tested on iOS, Linux, and FreeBSD. */ +-#if (CPU(ARM_THUMB2) || CPU(ARM64)) && (PLATFORM(IOS_FAMILY) || OS(LINUX) || OS(FREEBSD)) ++/* Enable the DFG JIT on ARMv7. Only tested on iOS, Linux, FreeBSD and NetBSD. */ ++#if (CPU(ARM_THUMB2) || CPU(ARM64)) && (PLATFORM(IOS_FAMILY) || OS(LINUX) || OS(FREEBSD) || OS(NETBSD)) #define ENABLE_DFG_JIT 1 #endif - /* Enable the DFG JIT on ARM. */ + /* Enable the DFG JIT on MIPS. */ Index: patches/patch-Source_WTF_wtf_RAMSize.cpp =================================================================== RCS file: /cvsroot/pkgsrc/www/webkit-gtk/patches/patch-Source_WTF_wtf_RAMSize.cpp,v retrieving revision 1.1 diff -u -p -r1.1 patch-Source_WTF_wtf_RAMSize.cpp --- patches/patch-Source_WTF_wtf_RAMSize.cpp 25 Oct 2018 09:58:18 -0000 1.1 +++ patches/patch-Source_WTF_wtf_RAMSize.cpp 13 Mar 2019 12:20:29 -0000 @@ -2,20 +2,18 @@ $NetBSD: patch-Source_WTF_wtf_RAMSize.cp Add support for NetBSD. ---- Source/WTF/wtf/RAMSize.cpp.orig 2017-08-03 11:00:07.000000000 +0000 +--- Source/WTF/wtf/RAMSize.cpp.orig 2019-02-12 11:21:17.000000000 +0000 +++ Source/WTF/wtf/RAMSize.cpp -@@ -32,7 +32,9 @@ - #if OS(WINDOWS) - #include - #elif defined(USE_SYSTEM_MALLOC) && USE_SYSTEM_MALLOC --#if OS(UNIX) +@@ -35,13 +35,16 @@ + #if OS(LINUX) + #include + #endif // OS(LINUX) +#if OS(NETBSD) +#include -+#elif OS(UNIX) - #include - #endif // OS(UNIX) ++#endif // OS(NETBSD) #else -@@ -41,7 +43,7 @@ + #include + #endif namespace WTF { @@ -24,12 +22,11 @@ Add support for NetBSD. static const size_t ramSizeGuess = 512 * MB; #endif -@@ -55,13 +57,22 @@ static size_t computeRAMSize() - return ramSizeGuess; - return status.ullTotalPhys; - #elif defined(USE_SYSTEM_MALLOC) && USE_SYSTEM_MALLOC --#if OS(UNIX) -+#if OS(NETBSD) +@@ -59,9 +62,18 @@ static size_t computeRAMSize() + struct sysinfo si; + sysinfo(&si); + return si.totalram * si.mem_unit; ++#elif OS(NETBSD) + int mib[2]; + size_t len, totalram; + mib[0] = CTL_HW; @@ -38,13 +35,9 @@ Add support for NetBSD. + if (sysctl(mib, 2, &totalram, &len, NULL, 0)) + return ramSizeGuess; + return totalram; -+#elif OS(UNIX) - struct sysinfo si; - sysinfo(&si); - return si.totalram * si.mem_unit; #else #error "Missing a platform specific way of determining the available RAM" --#endif // OS(UNIX) +-#endif // OS(LINUX) +#endif // USE_SYSTEM_MALLOC #else return bmalloc::api::availableMemory(); Index: patches/patch-Source_WebCore_platform_FileSystem.cpp =================================================================== RCS file: patches/patch-Source_WebCore_platform_FileSystem.cpp diff -N patches/patch-Source_WebCore_platform_FileSystem.cpp --- patches/patch-Source_WebCore_platform_FileSystem.cpp 13 Apr 2017 16:58:14 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,16 +0,0 @@ -$NetBSD: patch-Source_WebCore_platform_FileSystem.cpp,v 1.1 2017/04/13 16:58:14 jperkin Exp $ - -Support MAP_FILE if unavailable. - ---- Source/WebCore/platform/FileSystem.cpp.orig 2016-08-22 12:21:08.000000000 +0000 -+++ Source/WebCore/platform/FileSystem.cpp -@@ -189,6 +189,9 @@ MappedFileData::MappedFileData(const Str - return; - } - -+#ifndef MAP_FILE -+#define MAP_FILE 0 -+#endif - void* data = mmap(0, size, PROT_READ, MAP_FILE | MAP_SHARED, fd, 0); - close(fd); - Index: patches/patch-Source_WebKit_NetworkProcess_cache_NetworkCacheFileSystem.cpp =================================================================== RCS file: /cvsroot/pkgsrc/www/webkit-gtk/patches/patch-Source_WebKit_NetworkProcess_cache_NetworkCacheFileSystem.cpp,v retrieving revision 1.2 diff -u -p -r1.2 patch-Source_WebKit_NetworkProcess_cache_NetworkCacheFileSystem.cpp --- patches/patch-Source_WebKit_NetworkProcess_cache_NetworkCacheFileSystem.cpp 24 Oct 2018 18:31:07 -0000 1.2 +++ patches/patch-Source_WebKit_NetworkProcess_cache_NetworkCacheFileSystem.cpp 13 Mar 2019 12:20:29 -0000 @@ -2,11 +2,11 @@ $NetBSD: patch-Source_WebKit_NetworkProc SunOS does not support DT_{DIR,REG} ---- Source/WebKit/NetworkProcess/cache/NetworkCacheFileSystem.cpp.orig 2018-07-25 11:56:32.000000000 +0000 +--- Source/WebKit/NetworkProcess/cache/NetworkCacheFileSystem.cpp.orig 2019-02-12 11:21:18.000000000 +0000 +++ Source/WebKit/NetworkProcess/cache/NetworkCacheFileSystem.cpp -@@ -54,6 +54,12 @@ namespace NetworkCache { - static DirectoryEntryType directoryEntryType(uint8_t dtype) - { +@@ -52,6 +52,12 @@ namespace WebKit { + namespace NetworkCache { + #if !OS(WINDOWS) +#ifndef DT_DIR +#define DT_DIR S_IFDIR @@ -14,17 +14,18 @@ SunOS does not support DT_{DIR,REG} +#ifndef DT_REG +#define DT_REG S_IFREG +#endif + static DirectoryEntryType directoryEntryType(uint8_t dtype) + { switch (dtype) { - case DT_DIR: - return DirectoryEntryType::Directory; -@@ -71,12 +77,20 @@ static DirectoryEntryType directoryEntry +@@ -69,13 +75,21 @@ static DirectoryEntryType directoryEntry + void traverseDirectory(const String& path, const Function& function) { - #if !OS(WINDOWS) +#if OS(SOLARIS) + struct stat s; +#endif - DIR* dir = opendir(WebCore::FileSystem::fileSystemRepresentation(path).data()); + #if !OS(WINDOWS) + DIR* dir = opendir(FileSystem::fileSystemRepresentation(path).data()); if (!dir) return; dirent* dp; @@ -38,7 +39,7 @@ SunOS does not support DT_{DIR,REG} continue; const char* name = dp->d_name; if (!strcmp(name, ".") || !strcmp(name, "..")) -@@ -84,7 +98,11 @@ void traverseDirectory(const String& pat +@@ -83,7 +97,11 @@ void traverseDirectory(const String& pat auto nameString = String::fromUTF8(name); if (nameString.isNull()) continue; Index: patches/patch-Source_WebKit_PlatformGTK.cmake =================================================================== RCS file: /cvsroot/pkgsrc/www/webkit-gtk/patches/patch-Source_WebKit_PlatformGTK.cmake,v retrieving revision 1.2 diff -u -p -r1.2 patch-Source_WebKit_PlatformGTK.cmake --- patches/patch-Source_WebKit_PlatformGTK.cmake 24 Oct 2018 18:31:07 -0000 1.2 +++ patches/patch-Source_WebKit_PlatformGTK.cmake 13 Mar 2019 12:20:29 -0000 @@ -2,10 +2,10 @@ $NetBSD: patch-Source_WebKit_PlatformGTK SunOS ld does not support --version-script. ---- Source/WebKit/PlatformGTK.cmake.orig 2018-08-21 16:06:11.000000000 +0000 +--- Source/WebKit/PlatformGTK.cmake.orig 2019-02-20 11:21:53.000000000 +0000 +++ Source/WebKit/PlatformGTK.cmake -@@ -22,7 +22,7 @@ add_definitions(-DPKGLIBEXECDIR="${LIBEX - add_definitions(-DLOCALEDIR="${CMAKE_INSTALL_FULL_LOCALEDIR}") +@@ -22,7 +22,7 @@ add_definitions(-DLOCALEDIR="${CMAKE_INS + add_definitions(-DDATADIR="${CMAKE_INSTALL_FULL_DATADIR}") add_definitions(-DLIBDIR="${LIB_INSTALL_DIR}") -if (NOT DEVELOPER_MODE AND NOT CMAKE_SYSTEM_NAME MATCHES "Darwin")