Update to webkitgtk4-2.26.0.
This commit is contained in:
ajacoutot
parent
0bc2454a59
commit
885d6e08d5
@ -1,4 +1,7 @@
|
||||
# $OpenBSD: Makefile,v 1.108 2019/08/30 13:02:19 cwen Exp $
|
||||
# $OpenBSD: Makefile,v 1.109 2019/09/24 06:56:43 ajacoutot Exp $
|
||||
|
||||
# XXX does *NOT* build if a previous version is installed (e.g 2.24 vs 2.26)
|
||||
# -L/usr/local/lib is put first and we end up with undefined symbols
|
||||
|
||||
# patches/patch-Source_JavaScriptCore_javascriptcoregtk_pc_in
|
||||
# patches/patch-Source_WebKit_gtk_webkit2gtk-web-extension_pc_in
|
||||
@ -12,8 +15,7 @@ PORTROACH = limitw:1,even
|
||||
|
||||
COMMENT = GTK+ port of the WebKit rendering engine
|
||||
|
||||
V = 2.24.4
|
||||
REVISION = 0
|
||||
V = 2.26.0
|
||||
DISTNAME = webkitgtk-${V}
|
||||
PKGNAME = webkitgtk4-${V}
|
||||
EXTRACT_SUFX = .tar.xz
|
||||
@ -21,8 +23,8 @@ API = 4.0
|
||||
SUBST_VARS = API
|
||||
DPB_PROPERTIES = parallel
|
||||
|
||||
SHARED_LIBS += javascriptcoregtk-${API} 3.0 # 18.13.3
|
||||
SHARED_LIBS += webkit2gtk-${API} 3.0 # 37.37.2
|
||||
SHARED_LIBS += javascriptcoregtk-${API} 3.1 # 18.13.3
|
||||
SHARED_LIBS += webkit2gtk-${API} 3.1 # 37.37.2
|
||||
|
||||
CATEGORIES = www
|
||||
|
||||
@ -99,6 +101,9 @@ CONFIGURE_ARGS += -DENABLE_JIT=OFF
|
||||
CONFIGURE_ARGS += -DENABLE_LLINT_C_LOOP=ON
|
||||
.endif
|
||||
|
||||
# XXX fatal error: 'X11/Xlib.h' file not found
|
||||
CXXFLAGS += -I${X11BASE}/include
|
||||
|
||||
.include <bsd.port.arch.mk>
|
||||
|
||||
# ld.lld does not have this option
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
SHA256 (webkitgtk-2.24.4.tar.xz) = hmixKcAmYk7CJqTMz0mV+dJvPoj8KKt1sOll88Mrfdg=
|
||||
SIZE (webkitgtk-2.24.4.tar.xz) = 17575784
|
||||
SHA256 (webkitgtk-2.26.0.tar.xz) = 0hDA7NGomiLJ+PH0UDNPNInFxQFZs6XhTdk9XzSdzO0=
|
||||
SIZE (webkitgtk-2.26.0.tar.xz) = 19321552
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
$OpenBSD: patch-CMakeLists_txt,v 1.15 2019/03/14 09:48:28 ajacoutot Exp $
|
||||
$OpenBSD: patch-CMakeLists_txt,v 1.16 2019/09/24 06:56:43 ajacoutot Exp $
|
||||
|
||||
Index: CMakeLists.txt
|
||||
--- CMakeLists.txt.orig
|
||||
+++ CMakeLists.txt
|
||||
@@ -96,12 +96,14 @@ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(x64
|
||||
set(WTF_CPU_X86_64 1)
|
||||
@@ -105,12 +105,14 @@ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(x64
|
||||
endif ()
|
||||
elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(i[3-6]86|x86)")
|
||||
set(WTF_CPU_X86 1)
|
||||
-elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "ppc")
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
$OpenBSD: patch-Source_JavaScriptCore_assembler_ARM64Assembler_h,v 1.4 2019/03/14 09:48:28 ajacoutot Exp $
|
||||
$OpenBSD: patch-Source_JavaScriptCore_assembler_ARM64Assembler_h,v 1.5 2019/09/24 06:56:43 ajacoutot Exp $
|
||||
|
||||
Index: Source/JavaScriptCore/assembler/ARM64Assembler.h
|
||||
--- Source/JavaScriptCore/assembler/ARM64Assembler.h.orig
|
||||
+++ Source/JavaScriptCore/assembler/ARM64Assembler.h
|
||||
@@ -2874,6 +2874,8 @@ class ARM64Assembler { (public)
|
||||
@@ -2806,6 +2806,8 @@ class ARM64Assembler { (public)
|
||||
{
|
||||
#if OS(IOS_FAMILY)
|
||||
sys_cache_control(kCacheFunctionPrepareForExecution, code, size);
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
$OpenBSD: patch-Source_JavaScriptCore_assembler_ARMv7Assembler_h,v 1.1 2019/03/14 09:48:28 ajacoutot Exp $
|
||||
$OpenBSD: patch-Source_JavaScriptCore_assembler_ARMv7Assembler_h,v 1.2 2019/09/24 06:56:43 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)
|
||||
@@ -2394,6 +2394,8 @@ class ARMv7Assembler { (public)
|
||||
linuxPageFlush(current, current + page);
|
||||
|
||||
linuxPageFlush(current, end);
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
$OpenBSD: patch-Source_JavaScriptCore_jit_ExecutableAllocator_cpp,v 1.3 2019/03/14 09:48:28 ajacoutot Exp $
|
||||
$OpenBSD: patch-Source_JavaScriptCore_jit_ExecutableAllocator_cpp,v 1.4 2019/09/24 06:56:43 ajacoutot Exp $
|
||||
|
||||
Index: Source/JavaScriptCore/jit/ExecutableAllocator.cpp
|
||||
--- Source/JavaScriptCore/jit/ExecutableAllocator.cpp.orig
|
||||
+++ Source/JavaScriptCore/jit/ExecutableAllocator.cpp
|
||||
@@ -92,7 +92,8 @@ static const size_t fixedExecutableMemoryPoolSize = FI
|
||||
@@ -97,7 +97,8 @@ static const size_t fixedExecutableMemoryPoolSize = FI
|
||||
static const size_t fixedExecutableMemoryPoolSize = 16 * 1024 * 1024;
|
||||
#elif CPU(ARM64)
|
||||
static const size_t fixedExecutableMemoryPoolSize = 128 * 1024 * 1024;
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
$OpenBSD: patch-Source_JavaScriptCore_offlineasm_arm64_rb,v 1.3 2019/03/14 09:48:28 ajacoutot Exp $
|
||||
$OpenBSD: patch-Source_JavaScriptCore_offlineasm_arm64_rb,v 1.4 2019/09/24 06:56:43 ajacoutot Exp $
|
||||
|
||||
Index: Source/JavaScriptCore/offlineasm/arm64.rb
|
||||
--- Source/JavaScriptCore/offlineasm/arm64.rb.orig
|
||||
+++ Source/JavaScriptCore/offlineasm/arm64.rb
|
||||
@@ -1034,7 +1034,7 @@ class Instruction
|
||||
@@ -1041,7 +1041,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.
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
$OpenBSD: patch-Source_WTF_wtf_PlatformRegisters_h,v 1.1 2017/09/15 07:43:42 ajacoutot Exp $
|
||||
$OpenBSD: patch-Source_WTF_wtf_PlatformRegisters_h,v 1.2 2019/09/24 06:56:43 ajacoutot Exp $
|
||||
|
||||
XXX no mcontext_t on OpenBSD
|
||||
|
||||
Index: Source/WTF/wtf/PlatformRegisters.h
|
||||
--- Source/WTF/wtf/PlatformRegisters.h.orig
|
||||
+++ Source/WTF/wtf/PlatformRegisters.h
|
||||
@@ -33,6 +33,8 @@
|
||||
@@ -34,6 +34,8 @@
|
||||
#include <signal.h>
|
||||
#elif OS(WINDOWS)
|
||||
#include <windows.h>
|
||||
@ -14,7 +14,7 @@ Index: Source/WTF/wtf/PlatformRegisters.h
|
||||
#else
|
||||
#include <ucontext.h>
|
||||
#endif
|
||||
@@ -74,7 +76,9 @@ struct PlatformRegisters {
|
||||
@@ -75,7 +77,9 @@ struct PlatformRegisters {
|
||||
|
||||
inline PlatformRegisters& registersFromUContext(ucontext_t* ucontext)
|
||||
{
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
$OpenBSD: patch-Source_WTF_wtf_Platform_h,v 1.15 2019/03/14 09:48:28 ajacoutot Exp $
|
||||
$OpenBSD: patch-Source_WTF_wtf_Platform_h,v 1.16 2019/09/24 06:56:43 ajacoutot Exp $
|
||||
|
||||
https://bugs.webkit.org/show_bug.cgi?id=129963
|
||||
|
||||
@ -28,7 +28,7 @@ Index: Source/WTF/wtf/Platform.h
|
||||
#define WTF_CPU_NEEDS_ALIGNED_ACCESS 1
|
||||
#endif
|
||||
|
||||
@@ -710,7 +717,7 @@
|
||||
@@ -707,7 +714,7 @@
|
||||
|
||||
#endif /* OS(DARWIN) */
|
||||
|
||||
@ -37,7 +37,7 @@ Index: Source/WTF/wtf/Platform.h
|
||||
#define HAVE_MACHINE_CONTEXT 1
|
||||
#endif
|
||||
|
||||
@@ -818,7 +825,7 @@
|
||||
@@ -823,7 +830,7 @@
|
||||
|
||||
#if !defined(ENABLE_DFG_JIT) && ENABLE(JIT)
|
||||
/* Enable the DFG JIT on X86 and X86_64. */
|
||||
|
||||
@ -1,22 +0,0 @@
|
||||
$OpenBSD: patch-Source_WebCore_Modules_indexeddb_server_SQLiteIDBBackingStore_cpp,v 1.1 2019/08/30 13:02:19 cwen Exp $
|
||||
|
||||
ports-clang: fix undefined reference to `JSC::JSObject::didBecomePrototype()'
|
||||
from:
|
||||
https://trac.webkit.org/changeset/246922/webkit
|
||||
|
||||
Index: Source/WebCore/Modules/indexeddb/server/SQLiteIDBBackingStore.cpp
|
||||
--- Source/WebCore/Modules/indexeddb/server/SQLiteIDBBackingStore.cpp.orig
|
||||
+++ Source/WebCore/Modules/indexeddb/server/SQLiteIDBBackingStore.cpp
|
||||
@@ -48,11 +48,8 @@
|
||||
#include "SQLiteTransaction.h"
|
||||
#include "ThreadSafeDataBuffer.h"
|
||||
#include <JavaScriptCore/AuxiliaryBarrierInlines.h>
|
||||
-#include <JavaScriptCore/HeapInlines.h>
|
||||
-#include <JavaScriptCore/JSCJSValueInlines.h>
|
||||
-#include <JavaScriptCore/JSGlobalObject.h>
|
||||
+#include <JavaScriptCore/JSCInlines.h>
|
||||
#include <JavaScriptCore/StrongInlines.h>
|
||||
-#include <JavaScriptCore/StructureInlines.h>
|
||||
#include <wtf/FileSystem.h>
|
||||
#include <wtf/NeverDestroyed.h>
|
||||
#include <wtf/text/StringConcatenateNumbers.h>
|
||||
@ -1,17 +0,0 @@
|
||||
$OpenBSD: patch-Source_WebCore_contentextensions_DFACombiner_cpp,v 1.1 2019/03/25 14:03:49 cwen Exp $
|
||||
|
||||
unbreak the build where char is unsigned by default (arm, ppc)
|
||||
|
||||
Index: Source/WebCore/contentextensions/DFACombiner.cpp
|
||||
--- Source/WebCore/contentextensions/DFACombiner.cpp.orig
|
||||
+++ Source/WebCore/contentextensions/DFACombiner.cpp
|
||||
@@ -37,7 +37,8 @@ namespace WebCore {
|
||||
namespace ContentExtensions {
|
||||
|
||||
class DFAMerger {
|
||||
- typedef MutableRangeList<char, uint64_t, 128> CombinedTransitionsMutableRangeList;
|
||||
+ // error: non-constant-expression cannot be narrowed from type 'char' to 'signed char'
|
||||
+ typedef MutableRangeList<signed char, uint64_t, 128> CombinedTransitionsMutableRangeList;
|
||||
|
||||
enum class WhichDFA {
|
||||
A,
|
||||
@ -1,22 +0,0 @@
|
||||
$OpenBSD: patch-Source_WebCore_contentextensions_NFAToDFA_cpp,v 1.1 2019/03/25 14:03:49 cwen Exp $
|
||||
|
||||
unbreak the build where char is unsigned by default (arm, ppc)
|
||||
|
||||
Index: Source/WebCore/contentextensions/NFAToDFA.cpp
|
||||
--- Source/WebCore/contentextensions/NFAToDFA.cpp.orig
|
||||
+++ Source/WebCore/contentextensions/NFAToDFA.cpp
|
||||
@@ -40,10 +40,10 @@
|
||||
namespace WebCore {
|
||||
|
||||
namespace ContentExtensions {
|
||||
-
|
||||
-typedef MutableRange<char, NFANodeIndexSet> NFANodeRange;
|
||||
-typedef MutableRangeList<char, NFANodeIndexSet> NFANodeRangeList;
|
||||
-typedef MutableRangeList<char, NFANodeIndexSet, 128> PreallocatedNFANodeRangeList;
|
||||
+//error: non-constant-expression cannot be narrowed from type 'char' to 'signed char'
|
||||
+typedef MutableRange<signed char, NFANodeIndexSet> NFANodeRange;
|
||||
+typedef MutableRangeList<signed char, NFANodeIndexSet> NFANodeRangeList;
|
||||
+typedef MutableRangeList<signed char, NFANodeIndexSet, 128> PreallocatedNFANodeRangeList;
|
||||
typedef Vector<uint32_t, 0, ContentExtensionsOverflowHandler> UniqueNodeList;
|
||||
typedef Vector<UniqueNodeList, 0, ContentExtensionsOverflowHandler> NFANodeClosures;
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
$OpenBSD: patch-Source_WebKit_Shared_Plugins_unix_PluginSearchPath_cpp,v 1.3 2018/09/04 07:12:47 ajacoutot Exp $
|
||||
$OpenBSD: patch-Source_WebKit_Shared_Plugins_unix_PluginSearchPath_cpp,v 1.4 2019/09/24 06:56:43 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
|
||||
@@ -49,7 +49,7 @@ Vector<String> pluginsDirectories()
|
||||
@@ -48,7 +48,7 @@ Vector<String> pluginsDirectories()
|
||||
result.append(FileSystem::homeDirectoryPath() + "/.mozilla/plugins");
|
||||
result.append(FileSystem::homeDirectoryPath() + "/.netscape/plugins");
|
||||
result.append("/usr/lib/browser/plugins");
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
$OpenBSD: patch-Source_cmake_OptionsCommon_cmake,v 1.14 2019/05/30 12:43:30 jca Exp $
|
||||
$OpenBSD: patch-Source_cmake_OptionsCommon_cmake,v 1.15 2019/09/24 06:56:43 ajacoutot Exp $
|
||||
|
||||
Our ar(1) is too old and have not support for `T'.
|
||||
|
||||
Index: Source/cmake/OptionsCommon.cmake
|
||||
--- Source/cmake/OptionsCommon.cmake.orig
|
||||
+++ Source/cmake/OptionsCommon.cmake
|
||||
@@ -5,10 +5,10 @@ option(USE_THIN_ARCHIVES "Produce all static libraries
|
||||
@@ -9,10 +9,10 @@ option(USE_THIN_ARCHIVES "Produce all static libraries
|
||||
if (USE_THIN_ARCHIVES)
|
||||
execute_process(COMMAND ${CMAKE_AR} -V OUTPUT_VARIABLE AR_VERSION)
|
||||
if ("${AR_VERSION}" MATCHES "^GNU ar")
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
$OpenBSD: patch-Source_cmake_WebKitCompilerFlags_cmake,v 1.5 2019/05/17 16:56:20 ajacoutot Exp $
|
||||
$OpenBSD: patch-Source_cmake_WebKitCompilerFlags_cmake,v 1.6 2019/09/24 06:56:43 ajacoutot Exp $
|
||||
|
||||
Index: Source/cmake/WebKitCompilerFlags.cmake
|
||||
--- Source/cmake/WebKitCompilerFlags.cmake.orig
|
||||
+++ Source/cmake/WebKitCompilerFlags.cmake
|
||||
@@ -196,9 +196,9 @@ if (NOT MSVC)
|
||||
@@ -231,9 +231,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.4 2019/05/17 16:56:20 ajacoutot Exp $
|
||||
$OpenBSD: patch-Source_cmake_WebKitFeatures_cmake,v 1.5 2019/09/24 06:56:43 ajacoutot Exp $
|
||||
|
||||
Index: Source/cmake/WebKitFeatures.cmake
|
||||
--- Source/cmake/WebKitFeatures.cmake.orig
|
||||
+++ Source/cmake/WebKitFeatures.cmake
|
||||
@@ -395,7 +395,7 @@ macro(SET_CONFIGURATION_FOR_UNIFIED_SOURCE_LISTS)
|
||||
@@ -399,7 +399,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.15 2019/05/17 16:56:21 ajacoutot Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.16 2019/09/24 06:56:44 ajacoutot Exp $
|
||||
@bin bin/WebKitWebDriver
|
||||
include/webkitgtk-${API}/
|
||||
include/webkitgtk-${API}/JavaScriptCore/
|
||||
@ -49,6 +49,7 @@ include/webkitgtk-${API}/webkit2/WebKitFindController.h
|
||||
include/webkitgtk-${API}/webkit2/WebKitFormSubmissionRequest.h
|
||||
include/webkitgtk-${API}/webkit2/WebKitForwardDeclarations.h
|
||||
include/webkitgtk-${API}/webkit2/WebKitFrame.h
|
||||
include/webkitgtk-${API}/webkit2/WebKitGeolocationManager.h
|
||||
include/webkitgtk-${API}/webkit2/WebKitGeolocationPermissionRequest.h
|
||||
include/webkitgtk-${API}/webkit2/WebKitHitTestResult.h
|
||||
include/webkitgtk-${API}/webkit2/WebKitInstallMissingMediaPluginsPermissionRequest.h
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user