Update to webkitgtk4-2.24.0.
This commit is contained in:
ajacoutot
parent
afba767c21
commit
7dfca19c94
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.97 2019/03/05 16:24:23 jca Exp $
|
||||
# $OpenBSD: Makefile,v 1.98 2019/03/14 09:48:28 ajacoutot Exp $
|
||||
|
||||
# patches/patch-Source_JavaScriptCore_javascriptcoregtk_pc_in
|
||||
# patches/patch-Source_WebKit_gtk_webkit2gtk-web-extension_pc_in
|
||||
@ -12,8 +12,7 @@ PORTROACH = limitw:1,even
|
||||
|
||||
COMMENT = GTK+ port of the WebKit rendering engine
|
||||
|
||||
V = 2.22.7
|
||||
REVISION = 0
|
||||
V = 2.24.0
|
||||
DISTNAME = webkitgtk-${V}
|
||||
PKGNAME = webkitgtk4-${V}
|
||||
EXTRACT_SUFX = .tar.xz
|
||||
@ -21,8 +20,8 @@ API = 4.0
|
||||
SUBST_VARS = API
|
||||
DPB_PROPERTIES = parallel
|
||||
|
||||
SHARED_LIBS += javascriptcoregtk-${API} 2.5 # 18.6
|
||||
SHARED_LIBS += webkit2gtk-${API} 2.5 # 37.24
|
||||
SHARED_LIBS += javascriptcoregtk-${API} 3.0 # 18.13.3
|
||||
SHARED_LIBS += webkit2gtk-${API} 3.0 # 37.37.2
|
||||
|
||||
CATEGORIES = www
|
||||
|
||||
@ -40,8 +39,8 @@ WANTLIB += gmodule-2.0 gobject-2.0 gstapp-1.0 gstaudio-1.0 gstbase-1.0
|
||||
WANTLIB += gstfft-1.0 gstgl-1.0 gstpbutils-1.0 gstreamer-1.0 gsttag-1.0
|
||||
WANTLIB += gstvideo-1.0 gtk-3 harfbuzz harfbuzz-icu hyphen icudata
|
||||
WANTLIB += icui18n icuuc intl jpeg m notify pango-1.0 pangocairo-1.0
|
||||
WANTLIB += png16 secret-1 soup-2.4 sqlite3 tasn1 webp webpdemux
|
||||
WANTLIB += woff2dec xml2 xslt z
|
||||
WANTLIB += openjp2 png16 secret-1 soup-2.4 sqlite3 tasn1 webp
|
||||
WANTLIB += webpdemux woff2dec xml2 xslt z
|
||||
|
||||
MASTER_SITES = https://webkitgtk.org/releases/
|
||||
|
||||
@ -75,6 +74,7 @@ LIB_DEPENDS = archivers/woff2 \
|
||||
devel/libnotify \
|
||||
devel/libsoup \
|
||||
graphics/libwebp \
|
||||
graphics/openjp2 \
|
||||
multimedia/gstreamer1/plugins-base \
|
||||
textproc/enchant2 \
|
||||
textproc/hyphen \
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
SHA256 (webkitgtk-2.22.7.tar.xz) = S+b31gXNCmkP0m6KqDsImjOtnUGRSOr8+2BYDdKvMP8=
|
||||
SIZE (webkitgtk-2.22.7.tar.xz) = 16777676
|
||||
SHA256 (webkitgtk-2.24.0.tar.xz) = LkrRUD/kgs61qDz3CsnNQvN+txhVWk1oRP5MWakhRAc=
|
||||
SIZE (webkitgtk-2.24.0.tar.xz) = 17894000
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
$OpenBSD: patch-CMakeLists_txt,v 1.14 2018/09/04 07:12:47 ajacoutot Exp $
|
||||
$OpenBSD: patch-CMakeLists_txt,v 1.15 2019/03/14 09:48:28 ajacoutot Exp $
|
||||
|
||||
Index: CMakeLists.txt
|
||||
--- CMakeLists.txt.orig
|
||||
+++ CMakeLists.txt
|
||||
@@ -95,12 +95,14 @@ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(x64
|
||||
@@ -96,12 +96,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)
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
$OpenBSD: patch-Source_JavaScriptCore_assembler_ARM64Assembler_h,v 1.3 2018/09/04 07:12:47 ajacoutot Exp $
|
||||
$OpenBSD: patch-Source_JavaScriptCore_assembler_ARM64Assembler_h,v 1.4 2019/03/14 09:48:28 ajacoutot Exp $
|
||||
|
||||
Index: Source/JavaScriptCore/assembler/ARM64Assembler.h
|
||||
--- Source/JavaScriptCore/assembler/ARM64Assembler.h.orig
|
||||
+++ Source/JavaScriptCore/assembler/ARM64Assembler.h
|
||||
@@ -2863,6 +2863,8 @@ class ARM64Assembler { (public)
|
||||
@@ -2874,6 +2874,8 @@ class ARM64Assembler { (public)
|
||||
{
|
||||
#if OS(IOS)
|
||||
#if OS(IOS_FAMILY)
|
||||
sys_cache_control(kCacheFunctionPrepareForExecution, code, size);
|
||||
+#elif OS(FREEBSD) || OS(NETBSD) || OS(OPENBSD)
|
||||
+ __clear_cache(code, reinterpret_cast<char*>(code) + size);
|
||||
|
||||
@ -1,14 +0,0 @@
|
||||
$OpenBSD: patch-Source_JavaScriptCore_assembler_ARMAssembler_h,v 1.5 2019/02/07 08:03:56 ajacoutot Exp $
|
||||
|
||||
Index: Source/JavaScriptCore/assembler/ARMAssembler.h
|
||||
--- Source/JavaScriptCore/assembler/ARMAssembler.h.orig
|
||||
+++ Source/JavaScriptCore/assembler/ARMAssembler.h
|
||||
@@ -1201,6 +1201,8 @@ namespace JSC {
|
||||
linuxPageFlush(current, current + page);
|
||||
|
||||
linuxPageFlush(current, end);
|
||||
+#elif CPU(ARM_TRADITIONAL) && (OS(FREEBSD) || OS(OPENBSD)) && COMPILER(CLANG)
|
||||
+ __clear_cache(code, reinterpret_cast<char*>(code) + size);
|
||||
#else
|
||||
#error "The cacheFlush support is missing on this platform."
|
||||
#endif
|
||||
@ -0,0 +1,14 @@
|
||||
$OpenBSD: patch-Source_JavaScriptCore_assembler_ARMv7Assembler_h,v 1.1 2019/03/14 09:48:28 ajacoutot Exp $
|
||||
|
||||
Index: Source/JavaScriptCore/assembler/ARMv7Assembler.h
|
||||
--- Source/JavaScriptCore/assembler/ARMv7Assembler.h.orig
|
||||
+++ Source/JavaScriptCore/assembler/ARMv7Assembler.h
|
||||
@@ -2488,6 +2488,8 @@ class ARMv7Assembler { (public)
|
||||
linuxPageFlush(current, current + page);
|
||||
|
||||
linuxPageFlush(current, end);
|
||||
+#elif CPU(ARM_TRADITIONAL) && (OS(FREEBSD) || OS(OPENBSD)) && COMPILER(CLANG)
|
||||
+ __clear_cache(code, reinterpret_cast<char*>(code) + size);
|
||||
#else
|
||||
#error "The cacheFlush support is missing on this platform."
|
||||
#endif
|
||||
@ -1,4 +1,4 @@
|
||||
$OpenBSD: patch-Source_JavaScriptCore_jit_ExecutableAllocator_cpp,v 1.2 2018/09/04 07:12:47 ajacoutot Exp $
|
||||
$OpenBSD: patch-Source_JavaScriptCore_jit_ExecutableAllocator_cpp,v 1.3 2019/03/14 09:48:28 ajacoutot Exp $
|
||||
|
||||
Index: Source/JavaScriptCore/jit/ExecutableAllocator.cpp
|
||||
--- Source/JavaScriptCore/jit/ExecutableAllocator.cpp.orig
|
||||
@ -6,7 +6,7 @@ Index: Source/JavaScriptCore/jit/ExecutableAllocator.cpp
|
||||
@@ -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;
|
||||
static const size_t fixedExecutableMemoryPoolSize = 128 * 1024 * 1024;
|
||||
-#elif CPU(X86_64)
|
||||
+// We don't want an initial allocation of 1GB, it's above the default ulimit
|
||||
+#elif CPU(X86_64) && !defined(__OpenBSD__)
|
||||
|
||||
@ -1,14 +1,14 @@
|
||||
$OpenBSD: patch-Source_JavaScriptCore_offlineasm_arm64_rb,v 1.2 2018/09/04 07:12:47 ajacoutot Exp $
|
||||
$OpenBSD: patch-Source_JavaScriptCore_offlineasm_arm64_rb,v 1.3 2019/03/14 09:48:28 ajacoutot Exp $
|
||||
|
||||
Index: Source/JavaScriptCore/offlineasm/arm64.rb
|
||||
--- Source/JavaScriptCore/offlineasm/arm64.rb.orig
|
||||
+++ 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]"
|
||||
@@ -1034,7 +1034,7 @@ class Instruction
|
||||
$asm.puts "ldr #{operands[1].arm64Operand(:quad)}, [#{operands[1].arm64Operand(:quad)}, #{operands[0].asmLabel}@GOTPAGEOFF]"
|
||||
|
||||
# On Linux, use ELF GOT relocation specifiers.
|
||||
- $asm.putStr("#elif OS(LINUX)")
|
||||
+ $asm.putStr("#elif OS(LINUX) || OS(OPENBSD)")
|
||||
$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}]"
|
||||
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
$OpenBSD: patch-Source_WTF_wtf_InlineASM_h,v 1.2 2018/03/19 08:13:15 ajacoutot Exp $
|
||||
$OpenBSD: patch-Source_WTF_wtf_InlineASM_h,v 1.3 2019/03/14 09:48:28 ajacoutot Exp $
|
||||
|
||||
Index: Source/WTF/wtf/InlineASM.h
|
||||
--- Source/WTF/wtf/InlineASM.h.orig
|
||||
+++ Source/WTF/wtf/InlineASM.h
|
||||
@@ -42,7 +42,7 @@
|
||||
@@ -43,7 +43,7 @@
|
||||
#define THUMB_FUNC_PARAM(name)
|
||||
#endif
|
||||
|
||||
|
||||
@ -1,22 +0,0 @@
|
||||
$OpenBSD: patch-Source_WTF_wtf_Optional_h,v 1.1 2019/02/07 08:03:56 ajacoutot Exp $
|
||||
|
||||
Fix build with newer libc++
|
||||
|
||||
Index: Source/WTF/wtf/Optional.h
|
||||
--- Source/WTF/wtf/Optional.h.orig
|
||||
+++ Source/WTF/wtf/Optional.h
|
||||
@@ -277,12 +277,14 @@ struct nullopt_t
|
||||
constexpr nullopt_t nullopt{nullopt_t::init()};
|
||||
|
||||
|
||||
+# if !defined(_LIBCPP_VERSION) || _LIBCPP_VERSION < 7000
|
||||
// 20.5.8, class bad_optional_access
|
||||
class bad_optional_access : public std::logic_error {
|
||||
public:
|
||||
explicit bad_optional_access(const std::string& what_arg) : std::logic_error{what_arg} {}
|
||||
explicit bad_optional_access(const char* what_arg) : std::logic_error{what_arg} {}
|
||||
};
|
||||
+# endif // _LIBCPP_VERSION < 7000
|
||||
|
||||
|
||||
template <class T>
|
||||
@ -1,11 +1,11 @@
|
||||
$OpenBSD: patch-Source_WTF_wtf_Platform_h,v 1.14 2019/03/05 16:17:59 jca Exp $
|
||||
$OpenBSD: patch-Source_WTF_wtf_Platform_h,v 1.15 2019/03/14 09:48:28 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
|
||||
@@ -115,6 +115,13 @@
|
||||
@@ -114,6 +114,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) \
|
||||
@@ -323,7 +330,7 @@
|
||||
@@ -322,7 +329,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
|
||||
|
||||
@@ -697,7 +704,7 @@
|
||||
#define HAVE_CFNETWORK_STORAGE_PARTITIONING 1
|
||||
#endif
|
||||
@@ -710,7 +717,7 @@
|
||||
|
||||
#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(DARWIN) || OS(FUCHSIA) || ((OS(FREEBSD) || OS(OPENBSD) || defined(__GLIBC__) || defined(__BIONIC__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS)))
|
||||
#define HAVE_MACHINE_CONTEXT 1
|
||||
#endif
|
||||
|
||||
@@ -786,7 +793,7 @@
|
||||
@@ -818,7 +825,7 @@
|
||||
|
||||
#if !defined(ENABLE_DFG_JIT) && ENABLE(JIT)
|
||||
/* Enable the DFG JIT on X86 and X86_64. */
|
||||
|
||||
@ -1,26 +1,24 @@
|
||||
$OpenBSD: patch-Source_WTF_wtf_RAMSize_cpp,v 1.3 2019/03/05 16:20:30 jca Exp $
|
||||
$OpenBSD: patch-Source_WTF_wtf_RAMSize_cpp,v 1.4 2019/03/14 09:48:28 ajacoutot Exp $
|
||||
|
||||
Index: Source/WTF/wtf/RAMSize.cpp
|
||||
--- Source/WTF/wtf/RAMSize.cpp.orig
|
||||
+++ Source/WTF/wtf/RAMSize.cpp
|
||||
@@ -32,8 +32,10 @@
|
||||
@@ -32,7 +32,9 @@
|
||||
#if OS(WINDOWS)
|
||||
#include <windows.h>
|
||||
#elif defined(USE_SYSTEM_MALLOC) && USE_SYSTEM_MALLOC
|
||||
-#if OS(UNIX)
|
||||
-#include <sys/sysinfo.h>
|
||||
-#if OS(LINUX)
|
||||
+#if OS(OPENBSD)
|
||||
+#include <sys/sysctl.h>
|
||||
+#elif OS(UNIX)
|
||||
+#include <sysinfo.h>
|
||||
#endif // OS(UNIX)
|
||||
+#elif OS(LINUX)
|
||||
#include <sys/sysinfo.h>
|
||||
#endif // OS(LINUX)
|
||||
#else
|
||||
#include <bmalloc/bmalloc.h>
|
||||
@@ -55,7 +57,14 @@ static size_t computeRAMSize()
|
||||
return ramSizeGuess;
|
||||
return status.ullTotalPhys;
|
||||
#elif defined(USE_SYSTEM_MALLOC) && USE_SYSTEM_MALLOC
|
||||
-#if OS(UNIX)
|
||||
-#if OS(LINUX)
|
||||
+#if OS(OPENBSD)
|
||||
+ int mib[] = { CTL_HW, HW_USERMEM64 };
|
||||
+ int64_t mem;
|
||||
@ -28,7 +26,7 @@ Index: Source/WTF/wtf/RAMSize.cpp
|
||||
+ if (sysctl(mib, 2, &mem, &len, NULL, 0) == -1)
|
||||
+ return 512 * MB; // guess
|
||||
+ return mem;
|
||||
+#elif OS(UNIX)
|
||||
+#elif OS(LINUX)
|
||||
struct sysinfo si;
|
||||
sysinfo(&si);
|
||||
return si.totalram * si.mem_unit;
|
||||
|
||||
@ -1,14 +1,14 @@
|
||||
$OpenBSD: patch-Source_WTF_wtf_dtoa_utils_h,v 1.4 2018/03/19 08:13:15 ajacoutot Exp $
|
||||
$OpenBSD: patch-Source_WTF_wtf_dtoa_utils_h,v 1.5 2019/03/14 09:48:28 ajacoutot Exp $
|
||||
|
||||
Index: Source/WTF/wtf/dtoa/utils.h
|
||||
--- Source/WTF/wtf/dtoa/utils.h.orig
|
||||
+++ Source/WTF/wtf/dtoa/utils.h
|
||||
@@ -49,7 +49,7 @@
|
||||
defined(__ARMEL__) || \
|
||||
defined(_MIPS_ARCH_MIPS32R2)
|
||||
#define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
|
||||
-#elif CPU(MIPS) || CPU(MIPS64) || CPU(PPC) || CPU(PPC64) || CPU(PPC64LE) || CPU(ARM64)
|
||||
+#elif CPU(MIPS) || CPU(MIPS64) || CPU(PPC) || CPU(PPC64) || CPU(PPC64LE) || CPU(ARM64) || CPU(SPARC64)
|
||||
#define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
|
||||
#elif defined(_M_IX86) || defined(__i386__)
|
||||
#if defined(_WIN32)
|
||||
@@ -86,7 +86,7 @@ int main(int argc, char** argv) {
|
||||
defined(__powerpc__) || defined(__ppc__) || defined(__ppc64__) || \
|
||||
defined(_POWER) || defined(_ARCH_PPC) || defined(_ARCH_PPC64) || \
|
||||
defined(__sparc__) || defined(__sparc) || defined(__s390__) || \
|
||||
- defined(__SH4__) || defined(__alpha__) || \
|
||||
+ defined(__SH4__) || defined(__alpha__) || defined(__sparc64__) || \
|
||||
defined(_MIPS_ARCH_MIPS32R2) || \
|
||||
defined(__AARCH64EL__) || defined(__aarch64__) || defined(__AARCH64EB__) || \
|
||||
defined(__riscv) || \
|
||||
|
||||
@ -1,19 +1,20 @@
|
||||
$OpenBSD: patch-Source_WebCore_PAL_pal_PlatformGTK_cmake,v 1.1 2019/02/07 08:03:56 ajacoutot Exp $
|
||||
$OpenBSD: patch-Source_WebCore_PAL_pal_PlatformGTK_cmake,v 1.2 2019/03/14 09:48:28 ajacoutot Exp $
|
||||
|
||||
Index: Source/WebCore/PAL/pal/PlatformGTK.cmake
|
||||
--- Source/WebCore/PAL/pal/PlatformGTK.cmake.orig
|
||||
+++ Source/WebCore/PAL/pal/PlatformGTK.cmake
|
||||
@@ -20,6 +20,13 @@ list(APPEND PAL_SOURCES
|
||||
@@ -20,6 +20,14 @@ list(APPEND PAL_SOURCES
|
||||
unix/LoggingUnix.cpp
|
||||
)
|
||||
|
||||
+list(APPEND PAL_INCLUDE_DIRECTORIES
|
||||
+ ${LIBGCRYPT_INCLUDE_DIRS}
|
||||
+)
|
||||
+
|
||||
+list(APPEND PAL_LIBRARIES
|
||||
+ ${LIBGCRYPT_LIBRARIES}
|
||||
+)
|
||||
+
|
||||
if (ENABLE_SUBTLE_CRYPTO)
|
||||
if (ENABLE_WEB_CRYPTO)
|
||||
list(APPEND PAL_PUBLIC_HEADERS
|
||||
crypto/tasn1/Utilities.h
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
$OpenBSD: patch-Source_WebKit_gtk_webkit2gtk-web-extension_pc_in,v 1.2 2018/03/19 08:13:15 ajacoutot Exp $
|
||||
$OpenBSD: patch-Source_WebKit_gtk_webkit2gtk-web-extension_pc_in,v 1.3 2019/03/14 09:48:28 ajacoutot Exp $
|
||||
|
||||
Index: Source/WebKit/gtk/webkit2gtk-web-extension.pc.in
|
||||
--- Source/WebKit/gtk/webkit2gtk-web-extension.pc.in.orig
|
||||
+++ Source/WebKit/gtk/webkit2gtk-web-extension.pc.in
|
||||
@@ -8,5 +8,5 @@ Description: Web content engine for GTK+ - Web process
|
||||
@@ -8,5 +8,5 @@ Description: Web content engine for GTK - web process
|
||||
URL: https://webkitgtk.org
|
||||
Version: @PROJECT_VERSION@
|
||||
Requires: glib-2.0 gtk+-3.0 libsoup-2.4 javascriptcoregtk-@WEBKITGTK_API_VERSION@
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
$OpenBSD: patch-Source_WebKit_gtk_webkit2gtk_pc_in,v 1.2 2018/03/19 08:13:15 ajacoutot Exp $
|
||||
$OpenBSD: patch-Source_WebKit_gtk_webkit2gtk_pc_in,v 1.3 2019/03/14 09:48:28 ajacoutot Exp $
|
||||
|
||||
Index: Source/WebKit/gtk/webkit2gtk.pc.in
|
||||
--- Source/WebKit/gtk/webkit2gtk.pc.in.orig
|
||||
+++ Source/WebKit/gtk/webkit2gtk.pc.in
|
||||
@@ -8,5 +8,5 @@ Description: Web content engine for GTK+
|
||||
@@ -8,5 +8,5 @@ Description: Web content engine for GTK
|
||||
URL: https://webkitgtk.org
|
||||
Version: @PROJECT_VERSION@
|
||||
Requires: glib-2.0 gtk+-3.0 libsoup-2.4 javascriptcoregtk-@WEBKITGTK_API_VERSION@
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
$OpenBSD: patch-Source_cmake_WebKitCommon_cmake,v 1.4 2018/03/19 08:13:15 ajacoutot Exp $
|
||||
$OpenBSD: patch-Source_cmake_WebKitCommon_cmake,v 1.5 2019/03/14 09:48:28 ajacoutot Exp $
|
||||
|
||||
Index: Source/cmake/WebKitCommon.cmake
|
||||
--- Source/cmake/WebKitCommon.cmake.orig
|
||||
+++ Source/cmake/WebKitCommon.cmake
|
||||
@@ -28,9 +28,9 @@ if (NOT HAS_RUN_WEBKIT_COMMON)
|
||||
@@ -23,9 +23,9 @@ if (NOT HAS_RUN_WEBKIT_COMMON)
|
||||
# We cannot check for RUBY_FOUND because it is set only when the full package is installed and
|
||||
# the only thing we need is the interpreter. Unlike Python, cmake does not provide a macro
|
||||
# for finding only the Ruby interpreter.
|
||||
@ -16,7 +16,7 @@ Index: Source/cmake/WebKitCommon.cmake
|
||||
endif ()
|
||||
|
||||
# -----------------------------------------------------------------------------
|
||||
@@ -42,7 +42,7 @@ if (NOT HAS_RUN_WEBKIT_COMMON)
|
||||
@@ -37,7 +37,7 @@ if (NOT HAS_RUN_WEBKIT_COMMON)
|
||||
include(CheckCXXCompilerFlag)
|
||||
include(CheckCXXSourceCompiles)
|
||||
include(CheckFunctionExists)
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
$OpenBSD: patch-Source_cmake_WebKitCompilerFlags_cmake,v 1.3 2018/09/04 07:12:47 ajacoutot Exp $
|
||||
$OpenBSD: patch-Source_cmake_WebKitCompilerFlags_cmake,v 1.4 2019/03/14 09:48:28 ajacoutot Exp $
|
||||
|
||||
Index: Source/cmake/WebKitCompilerFlags.cmake
|
||||
--- Source/cmake/WebKitCompilerFlags.cmake.orig
|
||||
+++ Source/cmake/WebKitCompilerFlags.cmake
|
||||
@@ -182,9 +182,9 @@ if (NOT MSVC)
|
||||
@@ -187,9 +187,9 @@ if (NOT MSVC)
|
||||
string(REGEX MATCHALL "-fsanitize=[^ ]*" ENABLED_COMPILER_SANITIZERS ${CMAKE_CXX_FLAGS})
|
||||
endif ()
|
||||
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
$OpenBSD: patch-Source_cmake_WebKitFeatures_cmake,v 1.2 2018/12/14 12:33:51 ajacoutot Exp $
|
||||
$OpenBSD: patch-Source_cmake_WebKitFeatures_cmake,v 1.3 2019/03/14 09:48:28 ajacoutot Exp $
|
||||
|
||||
Index: Source/cmake/WebKitFeatures.cmake
|
||||
--- Source/cmake/WebKitFeatures.cmake.orig
|
||||
+++ Source/cmake/WebKitFeatures.cmake
|
||||
@@ -362,7 +362,7 @@ macro(SET_CONFIGURATION_FOR_UNIFIED_SOURCE_LISTS)
|
||||
@@ -396,7 +396,7 @@ macro(SET_CONFIGURATION_FOR_UNIFIED_SOURCE_LISTS)
|
||||
endmacro()
|
||||
|
||||
macro(WEBKIT_CHECK_HAVE_INCLUDE _variable _header)
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
@comment $OpenBSD: PLIST,v 1.13 2018/09/04 07:12:47 ajacoutot Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.14 2019/03/14 09:48:29 ajacoutot Exp $
|
||||
@bin bin/WebKitWebDriver
|
||||
include/webkitgtk-${API}/
|
||||
include/webkitgtk-${API}/JavaScriptCore/
|
||||
@ -16,6 +16,7 @@ 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/JSCOptions.h
|
||||
include/webkitgtk-${API}/jsc/JSCValue.h
|
||||
include/webkitgtk-${API}/jsc/JSCVersion.h
|
||||
include/webkitgtk-${API}/jsc/JSCVirtualMachine.h
|
||||
@ -36,6 +37,7 @@ include/webkitgtk-${API}/webkit2/WebKitContextMenuItem.h
|
||||
include/webkitgtk-${API}/webkit2/WebKitCookieManager.h
|
||||
include/webkitgtk-${API}/webkit2/WebKitCredential.h
|
||||
include/webkitgtk-${API}/webkit2/WebKitDefines.h
|
||||
include/webkitgtk-${API}/webkit2/WebKitDeviceInfoPermissionRequest.h
|
||||
include/webkitgtk-${API}/webkit2/WebKitDownload.h
|
||||
include/webkitgtk-${API}/webkit2/WebKitEditingCommands.h
|
||||
include/webkitgtk-${API}/webkit2/WebKitEditorState.h
|
||||
@ -73,7 +75,9 @@ include/webkitgtk-${API}/webkit2/WebKitSettings.h
|
||||
include/webkitgtk-${API}/webkit2/WebKitURIRequest.h
|
||||
include/webkitgtk-${API}/webkit2/WebKitURIResponse.h
|
||||
include/webkitgtk-${API}/webkit2/WebKitURISchemeRequest.h
|
||||
include/webkitgtk-${API}/webkit2/WebKitURIUtilities.h
|
||||
include/webkitgtk-${API}/webkit2/WebKitUserContent.h
|
||||
include/webkitgtk-${API}/webkit2/WebKitUserContentFilterStore.h
|
||||
include/webkitgtk-${API}/webkit2/WebKitUserContentManager.h
|
||||
include/webkitgtk-${API}/webkit2/WebKitUserMediaPermissionRequest.h
|
||||
include/webkitgtk-${API}/webkit2/WebKitVersion.h
|
||||
@ -222,7 +226,6 @@ lib/webkit2gtk-${API}/injected-bundle/libwebkit2gtkinjectedbundle.so
|
||||
libexec/webkit2gtk-${API}/
|
||||
@bin libexec/webkit2gtk-${API}/WebKitNetworkProcess
|
||||
@bin libexec/webkit2gtk-${API}/WebKitPluginProcess
|
||||
@bin libexec/webkit2gtk-${API}/WebKitStorageProcess
|
||||
@bin libexec/webkit2gtk-${API}/WebKitWebProcess
|
||||
@bin libexec/webkit2gtk-${API}/jsc
|
||||
share/gir-1.0/JavaScriptCore-${API}.gir
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user