From 7533a63b3aba3b230ee8cdb92baac9d678551d2a Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Tue, 4 Sep 2018 07:12:47 +0000 Subject: [PATCH] Update to webkitgtk4-2.22.0. --- www/webkitgtk4/Makefile | 8 ++--- www/webkitgtk4/distinfo | 4 +-- www/webkitgtk4/patches/patch-CMakeLists_txt | 4 +-- ..._JavaScriptCore_assembler_ARM64Assembler_h | 10 +++---- ...ce_JavaScriptCore_assembler_ARMAssembler_h | 4 +-- ...ptCore_assembler_MacroAssemblerX86Common_h | 8 ++--- ...rce_JavaScriptCore_javascriptcoregtk_pc_in | 9 +++--- ...JavaScriptCore_jit_ExecutableAllocator_cpp | 4 +-- ...-Source_JavaScriptCore_offlineasm_arm64_rb | 4 +-- ...ce_JavaScriptCore_runtime_MachineContext_h | 20 ++++++------- .../patches/patch-Source_WTF_wtf_Platform_h | 16 +++++----- ...atch-Source_WebCore_PAL_pal_CMakeLists_txt | 4 +-- ...t_Shared_Plugins_unix_PluginSearchPath_cpp | 4 +-- .../patch-Source_cmake_OptionsCommon_cmake | 29 +++++++------------ ...tch-Source_cmake_WebKitCompilerFlags_cmake | 4 +-- .../patch-Source_cmake_WebKitFeatures_cmake | 14 +++++++++ www/webkitgtk4/pkg/PLIST | 13 ++++++++- 17 files changed, 88 insertions(+), 71 deletions(-) create mode 100644 www/webkitgtk4/patches/patch-Source_cmake_WebKitFeatures_cmake diff --git a/www/webkitgtk4/Makefile b/www/webkitgtk4/Makefile index bbf3fc39c78..e5cafd7d795 100644 --- a/www/webkitgtk4/Makefile +++ b/www/webkitgtk4/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.85 2018/08/20 12:45:08 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.86 2018/09/04 07:12:47 ajacoutot Exp $ # patches/patch-Source_JavaScriptCore_javascriptcoregtk_pc_in # patches/patch-Source_WebKit_gtk_webkit2gtk-web-extension_pc_in @@ -12,7 +12,7 @@ PORTROACH = limitw:1,even COMMENT = GTK+ port of the WebKit rendering engine -V = 2.20.5 +V = 2.22.0 DISTNAME = webkitgtk-${V} PKGNAME = webkitgtk4-${V} EXTRACT_SUFX = .tar.xz @@ -20,8 +20,8 @@ API = 4.0 SUBST_VARS = API DPB_PROPERTIES = parallel -SHARED_LIBS += javascriptcoregtk-${API} 2.4 # 18.6 -SHARED_LIBS += webkit2gtk-${API} 2.4 # 37.24 +SHARED_LIBS += javascriptcoregtk-${API} 2.5 # 18.6 +SHARED_LIBS += webkit2gtk-${API} 2.5 # 37.24 CATEGORIES = www diff --git a/www/webkitgtk4/distinfo b/www/webkitgtk4/distinfo index d5e40316d79..0c2776dbd20 100644 --- a/www/webkitgtk4/distinfo +++ b/www/webkitgtk4/distinfo @@ -1,2 +1,2 @@ -SHA256 (webkitgtk-2.20.5.tar.xz) = FcD40m6WBa/glI0WG6X9gu/ujtot69QJ/UCkQKw6+ZA= -SIZE (webkitgtk-2.20.5.tar.xz) = 16625200 +SHA256 (webkitgtk-2.22.0.tar.xz) = +kK1SpiDFAXIo+f0A3Huw/C9XNuxJIE6XjKeep+Mbyo= +SIZE (webkitgtk-2.22.0.tar.xz) = 17095588 diff --git a/www/webkitgtk4/patches/patch-CMakeLists_txt b/www/webkitgtk4/patches/patch-CMakeLists_txt index 1cbfbc590cb..9e80f2ef747 100644 --- a/www/webkitgtk4/patches/patch-CMakeLists_txt +++ b/www/webkitgtk4/patches/patch-CMakeLists_txt @@ -1,9 +1,9 @@ -$OpenBSD: patch-CMakeLists_txt,v 1.13 2018/03/19 08:13:15 ajacoutot Exp $ +$OpenBSD: patch-CMakeLists_txt,v 1.14 2018/09/04 07:12:47 ajacoutot Exp $ Index: CMakeLists.txt --- CMakeLists.txt.orig +++ CMakeLists.txt -@@ -93,12 +93,14 @@ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(x64 +@@ -95,12 +95,14 @@ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(x64 set(WTF_CPU_X86_64 1) elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(i[3-6]86|x86)") set(WTF_CPU_X86 1) diff --git a/www/webkitgtk4/patches/patch-Source_JavaScriptCore_assembler_ARM64Assembler_h b/www/webkitgtk4/patches/patch-Source_JavaScriptCore_assembler_ARM64Assembler_h index 91ee1507a27..f4018bdca7f 100644 --- a/www/webkitgtk4/patches/patch-Source_JavaScriptCore_assembler_ARM64Assembler_h +++ b/www/webkitgtk4/patches/patch-Source_JavaScriptCore_assembler_ARM64Assembler_h @@ -1,14 +1,14 @@ -$OpenBSD: patch-Source_JavaScriptCore_assembler_ARM64Assembler_h,v 1.2 2017/09/15 07:43:42 ajacoutot Exp $ +$OpenBSD: patch-Source_JavaScriptCore_assembler_ARM64Assembler_h,v 1.3 2018/09/04 07:12:47 ajacoutot Exp $ Index: Source/JavaScriptCore/assembler/ARM64Assembler.h --- Source/JavaScriptCore/assembler/ARM64Assembler.h.orig +++ Source/JavaScriptCore/assembler/ARM64Assembler.h -@@ -2856,6 +2856,8 @@ class ARM64Assembler { (public) +@@ -2863,6 +2863,8 @@ class ARM64Assembler { (public) { #if OS(IOS) sys_cache_control(kCacheFunctionPrepareForExecution, code, size); +#elif OS(FREEBSD) || OS(NETBSD) || OS(OPENBSD) -+ __clear_cache(code, reinterpret_cast(code) + size); ++ __clear_cache(code, reinterpret_cast(code) + size); + #elif OS(FUCHSIA) + zx_cache_flush(code, size, ZX_CACHE_FLUSH_INSN); #elif OS(LINUX) - size_t page = pageSize(); - uintptr_t current = reinterpret_cast(code); diff --git a/www/webkitgtk4/patches/patch-Source_JavaScriptCore_assembler_ARMAssembler_h b/www/webkitgtk4/patches/patch-Source_JavaScriptCore_assembler_ARMAssembler_h index df6eded31a0..8ba4066a1e2 100644 --- a/www/webkitgtk4/patches/patch-Source_JavaScriptCore_assembler_ARMAssembler_h +++ b/www/webkitgtk4/patches/patch-Source_JavaScriptCore_assembler_ARMAssembler_h @@ -1,9 +1,9 @@ -$OpenBSD: patch-Source_JavaScriptCore_assembler_ARMAssembler_h,v 1.3 2018/03/19 08:13:15 ajacoutot Exp $ +$OpenBSD: patch-Source_JavaScriptCore_assembler_ARMAssembler_h,v 1.4 2018/09/04 07:12:47 ajacoutot Exp $ Index: Source/JavaScriptCore/assembler/ARMAssembler.h --- Source/JavaScriptCore/assembler/ARMAssembler.h.orig +++ Source/JavaScriptCore/assembler/ARMAssembler.h -@@ -1202,6 +1202,8 @@ namespace JSC { +@@ -1201,6 +1201,8 @@ namespace JSC { linuxPageFlush(current, current + page); linuxPageFlush(current, end); diff --git a/www/webkitgtk4/patches/patch-Source_JavaScriptCore_assembler_MacroAssemblerX86Common_h b/www/webkitgtk4/patches/patch-Source_JavaScriptCore_assembler_MacroAssemblerX86Common_h index a5cf9aa5def..0d1a2166821 100644 --- a/www/webkitgtk4/patches/patch-Source_JavaScriptCore_assembler_MacroAssemblerX86Common_h +++ b/www/webkitgtk4/patches/patch-Source_JavaScriptCore_assembler_MacroAssemblerX86Common_h @@ -1,4 +1,4 @@ -$OpenBSD: patch-Source_JavaScriptCore_assembler_MacroAssemblerX86Common_h,v 1.4 2018/03/19 08:13:15 ajacoutot Exp $ +$OpenBSD: patch-Source_JavaScriptCore_assembler_MacroAssemblerX86Common_h,v 1.5 2018/09/04 07:12:47 ajacoutot Exp $ XXX error: macro "swap32" passed 2 arguments, but takes just 1 XXX error: macro "swap64" passed 2 arguments, but takes just 1 @@ -6,9 +6,9 @@ XXX error: macro "swap64" passed 2 arguments, but takes just 1 Index: Source/JavaScriptCore/assembler/MacroAssemblerX86Common.h --- Source/JavaScriptCore/assembler/MacroAssemblerX86Common.h.orig +++ Source/JavaScriptCore/assembler/MacroAssemblerX86Common.h -@@ -35,6 +35,12 @@ - #include - #endif +@@ -32,6 +32,12 @@ + #include + #include +/* conflicting definition in endian.h */ +#if OS(OPENBSD) diff --git a/www/webkitgtk4/patches/patch-Source_JavaScriptCore_javascriptcoregtk_pc_in b/www/webkitgtk4/patches/patch-Source_JavaScriptCore_javascriptcoregtk_pc_in index 9a3bf2e00e8..94d661c1c92 100644 --- a/www/webkitgtk4/patches/patch-Source_JavaScriptCore_javascriptcoregtk_pc_in +++ b/www/webkitgtk4/patches/patch-Source_JavaScriptCore_javascriptcoregtk_pc_in @@ -1,11 +1,12 @@ -$OpenBSD: patch-Source_JavaScriptCore_javascriptcoregtk_pc_in,v 1.2 2018/03/19 08:13:15 ajacoutot Exp $ +$OpenBSD: patch-Source_JavaScriptCore_javascriptcoregtk_pc_in,v 1.3 2018/09/04 07:12:47 ajacoutot Exp $ ---- Source/JavaScriptCore/javascriptcoregtk.pc.in.orig Tue Aug 9 01:03:49 2016 -+++ Source/JavaScriptCore/javascriptcoregtk.pc.in Tue Aug 9 01:03:57 2016 +Index: Source/JavaScriptCore/javascriptcoregtk.pc.in +--- Source/JavaScriptCore/javascriptcoregtk.pc.in.orig ++++ Source/JavaScriptCore/javascriptcoregtk.pc.in @@ -7,5 +7,5 @@ Name: JavaScriptCoreGTK+ Description: GTK+ version of the JavaScriptCore engine Version: @PROJECT_VERSION@ - Requires: glib-2.0 + Requires: glib-2.0 gobject-2.0 -Libs: -L${libdir} -ljavascriptcoregtk-@WEBKITGTK_API_VERSION@ +Libs: -L${libdir} -ljavascriptcoregtk-@WEBKITGTK_API_VERSION@ -Wl,-z,wxneeded Cflags: -I${includedir}/webkitgtk-@WEBKITGTK_API_VERSION@ diff --git a/www/webkitgtk4/patches/patch-Source_JavaScriptCore_jit_ExecutableAllocator_cpp b/www/webkitgtk4/patches/patch-Source_JavaScriptCore_jit_ExecutableAllocator_cpp index c02c6f0edb4..094caff3236 100644 --- a/www/webkitgtk4/patches/patch-Source_JavaScriptCore_jit_ExecutableAllocator_cpp +++ b/www/webkitgtk4/patches/patch-Source_JavaScriptCore_jit_ExecutableAllocator_cpp @@ -1,9 +1,9 @@ -$OpenBSD: patch-Source_JavaScriptCore_jit_ExecutableAllocator_cpp,v 1.1 2017/09/15 07:43:42 ajacoutot Exp $ +$OpenBSD: patch-Source_JavaScriptCore_jit_ExecutableAllocator_cpp,v 1.2 2018/09/04 07:12:47 ajacoutot Exp $ Index: Source/JavaScriptCore/jit/ExecutableAllocator.cpp --- Source/JavaScriptCore/jit/ExecutableAllocator.cpp.orig +++ Source/JavaScriptCore/jit/ExecutableAllocator.cpp -@@ -88,7 +88,8 @@ static const size_t fixedExecutableMemoryPoolSize = FI +@@ -92,7 +92,8 @@ static const size_t fixedExecutableMemoryPoolSize = FI static const size_t fixedExecutableMemoryPoolSize = 16 * 1024 * 1024; #elif CPU(ARM64) static const size_t fixedExecutableMemoryPoolSize = 64 * 1024 * 1024; diff --git a/www/webkitgtk4/patches/patch-Source_JavaScriptCore_offlineasm_arm64_rb b/www/webkitgtk4/patches/patch-Source_JavaScriptCore_offlineasm_arm64_rb index 7d0404ef844..a14bb774a56 100644 --- a/www/webkitgtk4/patches/patch-Source_JavaScriptCore_offlineasm_arm64_rb +++ b/www/webkitgtk4/patches/patch-Source_JavaScriptCore_offlineasm_arm64_rb @@ -1,9 +1,9 @@ -$OpenBSD: patch-Source_JavaScriptCore_offlineasm_arm64_rb,v 1.1 2018/05/17 09:14:05 kettenis Exp $ +$OpenBSD: patch-Source_JavaScriptCore_offlineasm_arm64_rb,v 1.2 2018/09/04 07:12:47 ajacoutot Exp $ Index: Source/JavaScriptCore/offlineasm/arm64.rb --- Source/JavaScriptCore/offlineasm/arm64.rb.orig +++ Source/JavaScriptCore/offlineasm/arm64.rb -@@ -945,7 +945,7 @@ class Instruction +@@ -938,7 +938,7 @@ class Instruction $asm.puts "ldr #{operands[1].arm64Operand(:ptr)}, [#{operands[1].arm64Operand(:ptr)}, #{operands[0].asmLabel}@GOTPAGEOFF]" # On Linux, use ELF GOT relocation specifiers. diff --git a/www/webkitgtk4/patches/patch-Source_JavaScriptCore_runtime_MachineContext_h b/www/webkitgtk4/patches/patch-Source_JavaScriptCore_runtime_MachineContext_h index 98f9bf35802..70106e97df2 100644 --- a/www/webkitgtk4/patches/patch-Source_JavaScriptCore_runtime_MachineContext_h +++ b/www/webkitgtk4/patches/patch-Source_JavaScriptCore_runtime_MachineContext_h @@ -1,9 +1,9 @@ -$OpenBSD: patch-Source_JavaScriptCore_runtime_MachineContext_h,v 1.3 2018/05/17 09:14:05 kettenis Exp $ +$OpenBSD: patch-Source_JavaScriptCore_runtime_MachineContext_h,v 1.4 2018/09/04 07:12:47 ajacoutot Exp $ Index: Source/JavaScriptCore/runtime/MachineContext.h --- Source/JavaScriptCore/runtime/MachineContext.h.orig +++ Source/JavaScriptCore/runtime/MachineContext.h -@@ -146,6 +146,24 @@ inline void*& stackPointer(mcontext_t& machineContext) +@@ -188,6 +188,24 @@ static inline void*& stackPointerImpl(mcontext_t& mach #error Unknown Architecture #endif @@ -25,10 +25,10 @@ Index: Source/JavaScriptCore/runtime/MachineContext.h +#error Unknown Architecture +#endif + - #elif defined(__GLIBC__) || defined(__BIONIC__) + #elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__) #if CPU(X86) -@@ -251,6 +269,24 @@ inline void*& framePointer(mcontext_t& machineContext) +@@ -335,6 +353,24 @@ static inline void*& framePointerImpl(mcontext_t& mach #error Unknown Architecture #endif @@ -50,10 +50,10 @@ Index: Source/JavaScriptCore/runtime/MachineContext.h +#error Unknown Architecture +#endif + - #elif defined(__GLIBC__) || defined(__BIONIC__) + #elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__) // The following sequence depends on glibc's sys/ucontext.h. -@@ -354,6 +390,24 @@ inline void*& instructionPointer(mcontext_t& machineCo +@@ -482,6 +518,24 @@ static inline void*& instructionPointerImpl(mcontext_t #error Unknown Architecture #endif @@ -75,10 +75,10 @@ Index: Source/JavaScriptCore/runtime/MachineContext.h +#error Unknown Architecture +#endif + - #elif defined(__GLIBC__) || defined(__BIONIC__) + #elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__) // The following sequence depends on glibc's sys/ucontext.h. -@@ -466,6 +520,24 @@ inline void*& argumentPointer<1>(mcontext_t& machineCo +@@ -639,6 +693,24 @@ inline void*& argumentPointer<1>(mcontext_t& machineCo #error Unknown Architecture #endif @@ -100,10 +100,10 @@ Index: Source/JavaScriptCore/runtime/MachineContext.h +#error Unknown Architecture +#endif + - #elif defined(__GLIBC__) || defined(__BIONIC__) + #elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__) // The following sequence depends on glibc's sys/ucontext.h. -@@ -579,6 +651,24 @@ inline void*& llintInstructionPointer(mcontext_t& mach +@@ -752,6 +824,24 @@ inline void*& llintInstructionPointer(mcontext_t& mach return reinterpret_cast((uintptr_t&) machineContext.mc_gpregs.gp_x[4]); #elif CPU(MIPS) return reinterpret_cast((uintptr_t&) machineContext.mc_regs[12]); diff --git a/www/webkitgtk4/patches/patch-Source_WTF_wtf_Platform_h b/www/webkitgtk4/patches/patch-Source_WTF_wtf_Platform_h index 01b132e20d7..def722c0a1b 100644 --- a/www/webkitgtk4/patches/patch-Source_WTF_wtf_Platform_h +++ b/www/webkitgtk4/patches/patch-Source_WTF_wtf_Platform_h @@ -1,11 +1,11 @@ -$OpenBSD: patch-Source_WTF_wtf_Platform_h,v 1.12 2018/03/19 08:13:15 ajacoutot Exp $ +$OpenBSD: patch-Source_WTF_wtf_Platform_h,v 1.13 2018/09/04 07:12:47 ajacoutot Exp $ https://bugs.webkit.org/show_bug.cgi?id=129963 Index: Source/WTF/wtf/Platform.h --- Source/WTF/wtf/Platform.h.orig +++ Source/WTF/wtf/Platform.h -@@ -114,6 +114,13 @@ +@@ -115,6 +115,13 @@ #define WTF_CPU_KNOWN 1 #endif @@ -19,7 +19,7 @@ Index: Source/WTF/wtf/Platform.h /* CPU(X86) - i386 / x86 32-bit */ #if defined(__i386__) \ || defined(i386) \ -@@ -322,7 +329,7 @@ +@@ -323,7 +330,7 @@ #define WTF_CPU_UNKNOWN 1 #endif @@ -28,16 +28,16 @@ Index: Source/WTF/wtf/Platform.h #define WTF_CPU_NEEDS_ALIGNED_ACCESS 1 #endif -@@ -679,7 +686,7 @@ +@@ -697,7 +704,7 @@ #define HAVE_CFNETWORK_STORAGE_PARTITIONING 1 #endif --#if OS(DARWIN) || ((OS(FREEBSD) || defined(__GLIBC__) || defined(__BIONIC__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS))) -+#if OS(DARWIN) || ((OS(FREEBSD) || OS(OPENBSD) || defined(__GLIBC__) || defined(__BIONIC__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS) || CPU(SPARC64))) +-#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(OPENBSD) || defined(__GLIBC__) || defined(__BIONIC__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS) || CPU(SPARC64))) #define HAVE_MACHINE_CONTEXT 1 #endif -@@ -790,7 +797,7 @@ +@@ -786,7 +793,7 @@ #if !defined(ENABLE_DFG_JIT) && ENABLE(JIT) /* Enable the DFG JIT on X86 and X86_64. */ @@ -45,4 +45,4 @@ Index: Source/WTF/wtf/Platform.h +#if (CPU(X86) || CPU(X86_64)) && (OS(DARWIN) || OS(LINUX) || OS(FREEBSD) || OS(OPENBSD) || OS(HURD) || OS(WINDOWS)) #define ENABLE_DFG_JIT 1 #endif - /* Enable the DFG JIT on ARMv7. Only tested on iOS and GTK+/WPE Linux. */ + /* Enable the DFG JIT on ARMv7. Only tested on iOS, Linux, and FreeBSD. */ diff --git a/www/webkitgtk4/patches/patch-Source_WebCore_PAL_pal_CMakeLists_txt b/www/webkitgtk4/patches/patch-Source_WebCore_PAL_pal_CMakeLists_txt index fc2d58628a6..2c52fe0e7a7 100644 --- a/www/webkitgtk4/patches/patch-Source_WebCore_PAL_pal_CMakeLists_txt +++ b/www/webkitgtk4/patches/patch-Source_WebCore_PAL_pal_CMakeLists_txt @@ -1,9 +1,9 @@ -$OpenBSD: patch-Source_WebCore_PAL_pal_CMakeLists_txt,v 1.3 2018/03/19 08:13:15 ajacoutot Exp $ +$OpenBSD: patch-Source_WebCore_PAL_pal_CMakeLists_txt,v 1.4 2018/09/04 07:12:47 ajacoutot Exp $ Index: Source/WebCore/PAL/pal/CMakeLists.txt --- Source/WebCore/PAL/pal/CMakeLists.txt.orig +++ Source/WebCore/PAL/pal/CMakeLists.txt -@@ -16,6 +16,7 @@ set(PAL_PRIVATE_INCLUDE_DIRECTORIES +@@ -33,6 +33,7 @@ set(PAL_PRIVATE_INCLUDE_DIRECTORIES "${PAL_DIR}/pal/crypto" "${PAL_DIR}/pal/system" "${PAL_DIR}/pal/text" diff --git a/www/webkitgtk4/patches/patch-Source_WebKit_Shared_Plugins_unix_PluginSearchPath_cpp b/www/webkitgtk4/patches/patch-Source_WebKit_Shared_Plugins_unix_PluginSearchPath_cpp index dc16e3f7b33..145d59f57f7 100644 --- a/www/webkitgtk4/patches/patch-Source_WebKit_Shared_Plugins_unix_PluginSearchPath_cpp +++ b/www/webkitgtk4/patches/patch-Source_WebKit_Shared_Plugins_unix_PluginSearchPath_cpp @@ -1,9 +1,9 @@ -$OpenBSD: patch-Source_WebKit_Shared_Plugins_unix_PluginSearchPath_cpp,v 1.2 2018/03/19 08:13:15 ajacoutot Exp $ +$OpenBSD: patch-Source_WebKit_Shared_Plugins_unix_PluginSearchPath_cpp,v 1.3 2018/09/04 07:12:47 ajacoutot Exp $ Index: Source/WebKit/Shared/Plugins/unix/PluginSearchPath.cpp --- Source/WebKit/Shared/Plugins/unix/PluginSearchPath.cpp.orig +++ Source/WebKit/Shared/Plugins/unix/PluginSearchPath.cpp -@@ -50,7 +50,7 @@ Vector pluginsDirectories() +@@ -49,7 +49,7 @@ Vector pluginsDirectories() result.append(FileSystem::homeDirectoryPath() + "/.mozilla/plugins"); result.append(FileSystem::homeDirectoryPath() + "/.netscape/plugins"); result.append("/usr/lib/browser/plugins"); diff --git a/www/webkitgtk4/patches/patch-Source_cmake_OptionsCommon_cmake b/www/webkitgtk4/patches/patch-Source_cmake_OptionsCommon_cmake index ffa8a104dc9..9f8a3a1f138 100644 --- a/www/webkitgtk4/patches/patch-Source_cmake_OptionsCommon_cmake +++ b/www/webkitgtk4/patches/patch-Source_cmake_OptionsCommon_cmake @@ -1,4 +1,4 @@ -$OpenBSD: patch-Source_cmake_OptionsCommon_cmake,v 1.12 2017/09/15 07:43:42 ajacoutot Exp $ +$OpenBSD: patch-Source_cmake_OptionsCommon_cmake,v 1.13 2018/09/04 07:12:47 ajacoutot Exp $ Our ar(1) is too old and have not support for `T'. @@ -22,21 +22,12 @@ Index: Source/cmake/OptionsCommon.cmake endif () endif () -@@ -116,7 +116,7 @@ endif () - - # Macros for determining HAVE values. - macro(_HAVE_CHECK_INCLUDE _variable _header) -- check_include_file(${_header} ${_variable}_value) -+ check_include_files("${_header}" ${_variable}_value) - SET_AND_EXPOSE_TO_BUILD(${_variable} ${_variable}_value) - endmacro() - -@@ -143,7 +143,7 @@ _HAVE_CHECK_INCLUDE(HAVE_FEATURES_H features.h) - _HAVE_CHECK_INCLUDE(HAVE_ERRNO_H errno.h) - _HAVE_CHECK_INCLUDE(HAVE_LANGINFO_H langinfo.h) - _HAVE_CHECK_INCLUDE(HAVE_MMAP sys/mman.h) --_HAVE_CHECK_INCLUDE(HAVE_PTHREAD_NP_H pthread_np.h) -+_HAVE_CHECK_INCLUDE(HAVE_PTHREAD_NP_H "pthread.h;pthread_np.h") - _HAVE_CHECK_INCLUDE(HAVE_STRINGS_H strings.h) - _HAVE_CHECK_INCLUDE(HAVE_SYS_PARAM_H sys/param.h) - _HAVE_CHECK_INCLUDE(HAVE_SYS_TIME_H sys/time.h) +@@ -117,7 +117,7 @@ WEBKIT_CHECK_HAVE_INCLUDE(HAVE_FEATURES_H features.h) + WEBKIT_CHECK_HAVE_INCLUDE(HAVE_ERRNO_H errno.h) + WEBKIT_CHECK_HAVE_INCLUDE(HAVE_LANGINFO_H langinfo.h) + WEBKIT_CHECK_HAVE_INCLUDE(HAVE_MMAP sys/mman.h) +-WEBKIT_CHECK_HAVE_INCLUDE(HAVE_PTHREAD_NP_H pthread_np.h) ++WEBKIT_CHECK_HAVE_INCLUDE(HAVE_PTHREAD_NP_H "pthread.h;pthread_np.h") + WEBKIT_CHECK_HAVE_INCLUDE(HAVE_STRINGS_H strings.h) + WEBKIT_CHECK_HAVE_INCLUDE(HAVE_SYS_PARAM_H sys/param.h) + WEBKIT_CHECK_HAVE_INCLUDE(HAVE_SYS_TIME_H sys/time.h) diff --git a/www/webkitgtk4/patches/patch-Source_cmake_WebKitCompilerFlags_cmake b/www/webkitgtk4/patches/patch-Source_cmake_WebKitCompilerFlags_cmake index f782e3b1a07..3e5b17a4331 100644 --- a/www/webkitgtk4/patches/patch-Source_cmake_WebKitCompilerFlags_cmake +++ b/www/webkitgtk4/patches/patch-Source_cmake_WebKitCompilerFlags_cmake @@ -1,9 +1,9 @@ -$OpenBSD: patch-Source_cmake_WebKitCompilerFlags_cmake,v 1.2 2018/03/19 08:13:15 ajacoutot Exp $ +$OpenBSD: patch-Source_cmake_WebKitCompilerFlags_cmake,v 1.3 2018/09/04 07:12:47 ajacoutot Exp $ Index: Source/cmake/WebKitCompilerFlags.cmake --- Source/cmake/WebKitCompilerFlags.cmake.orig +++ Source/cmake/WebKitCompilerFlags.cmake -@@ -175,9 +175,9 @@ if (NOT MSVC) +@@ -182,9 +182,9 @@ if (NOT MSVC) string(REGEX MATCHALL "-fsanitize=[^ ]*" ENABLED_COMPILER_SANITIZERS ${CMAKE_CXX_FLAGS}) endif () diff --git a/www/webkitgtk4/patches/patch-Source_cmake_WebKitFeatures_cmake b/www/webkitgtk4/patches/patch-Source_cmake_WebKitFeatures_cmake new file mode 100644 index 00000000000..af0984d0ef3 --- /dev/null +++ b/www/webkitgtk4/patches/patch-Source_cmake_WebKitFeatures_cmake @@ -0,0 +1,14 @@ +$OpenBSD: patch-Source_cmake_WebKitFeatures_cmake,v 1.1 2018/09/04 07:12:47 ajacoutot Exp $ + +Index: Source/cmake/WebKitFeatures.cmake +--- Source/cmake/WebKitFeatures.cmake.orig ++++ Source/cmake/WebKitFeatures.cmake +@@ -361,7 +361,7 @@ macro(SET_CONFIGURATION_FOR_UNIFIED_SOURCE_LISTS) + endmacro() + + macro(WEBKIT_CHECK_HAVE_INCLUDE _variable _header) +- check_include_file(${_header} ${_variable}_value) ++ check_include_files("${_header}" ${_variable}_value) + SET_AND_EXPOSE_TO_BUILD(${_variable} ${_variable}_value) + endmacro() + diff --git a/www/webkitgtk4/pkg/PLIST b/www/webkitgtk4/pkg/PLIST index 4b9c699062d..3fa887a8955 100644 --- a/www/webkitgtk4/pkg/PLIST +++ b/www/webkitgtk4/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.12 2018/05/15 06:51:59 ajacoutot Exp $ +@comment $OpenBSD: PLIST,v 1.13 2018/09/04 07:12:47 ajacoutot Exp $ @bin bin/WebKitWebDriver include/webkitgtk-${API}/ include/webkitgtk-${API}/JavaScriptCore/ @@ -10,6 +10,17 @@ include/webkitgtk-${API}/JavaScriptCore/JSTypedArray.h include/webkitgtk-${API}/JavaScriptCore/JSValueRef.h include/webkitgtk-${API}/JavaScriptCore/JavaScript.h include/webkitgtk-${API}/JavaScriptCore/WebKitAvailability.h +include/webkitgtk-${API}/jsc/ +include/webkitgtk-${API}/jsc/JSCAutocleanups.h +include/webkitgtk-${API}/jsc/JSCClass.h +include/webkitgtk-${API}/jsc/JSCContext.h +include/webkitgtk-${API}/jsc/JSCDefines.h +include/webkitgtk-${API}/jsc/JSCException.h +include/webkitgtk-${API}/jsc/JSCValue.h +include/webkitgtk-${API}/jsc/JSCVersion.h +include/webkitgtk-${API}/jsc/JSCVirtualMachine.h +include/webkitgtk-${API}/jsc/JSCWeakValue.h +include/webkitgtk-${API}/jsc/jsc.h include/webkitgtk-${API}/webkit2/ include/webkitgtk-${API}/webkit2/WebKitApplicationInfo.h include/webkitgtk-${API}/webkit2/WebKitAuthenticationRequest.h