diff --git a/package/wpewebkit/0001-Revert-Merge-r295034-WebKitTestRunner-shouldn-t-link.patch b/package/wpewebkit/0001-Revert-Merge-r295034-WebKitTestRunner-shouldn-t-link.patch deleted file mode 100644 index d1edd36660..0000000000 --- a/package/wpewebkit/0001-Revert-Merge-r295034-WebKitTestRunner-shouldn-t-link.patch +++ /dev/null @@ -1,58 +0,0 @@ -From a780527a1b79538f1e1f5144e9b522d0927a2312 Mon Sep 17 00:00:00 2001 -From: Adrian Perez de Castro -Date: Wed, 13 Jul 2022 00:53:48 +0300 -Subject: [PATCH] Revert "Merge r295034 - WebKitTestRunner shouldn't link - object files of JavaScriptCore and WebCore" - -This reverts commit 7916fda00b347ff263fbfe72c065032d1d9b523c. - -Signed-off-by: Adrian Perez de Castro -[Upstream status: https://bugs.webkit.org/show_bug.cgi?id=241002] - ---- - Source/JavaScriptCore/CMakeLists.txt | 12 +++++++++--- - Tools/WebKitTestRunner/CMakeLists.txt | 1 - - Tools/WebKitTestRunner/PlatformGTK.cmake | 4 ++++ - Tools/WebKitTestRunner/PlatformWin.cmake | 4 ++++ - 4 files changed, 17 insertions(+), 4 deletions(-) - -diff --git a/Source/JavaScriptCore/CMakeLists.txt b/Source/JavaScriptCore/CMakeLists.txt -index 95a1300ce1b3..238208eb1137 100644 ---- a/Source/JavaScriptCore/CMakeLists.txt -+++ b/Source/JavaScriptCore/CMakeLists.txt -@@ -456,7 +456,7 @@ if (MSVC AND NOT ENABLE_C_LOOP) - COMMAND ${MASM_EXECUTABLE} ${LLINT_MASM_FLAGS} ${JavaScriptCore_DERIVED_SOURCES_DIR}/LowLevelInterpreterWin.obj ${JavaScriptCore_DERIVED_SOURCES_DIR}/LowLevelInterpreterWin.asm - VERBATIM) - list(APPEND JavaScriptCore_SOURCES ${JavaScriptCore_DERIVED_SOURCES_DIR}/LowLevelInterpreterWin.obj) -- add_library(LowLevelInterpreterLib STATIC llint/LowLevelInterpreter.cpp) -+ add_library(LowLevelInterpreterLib OBJECT llint/LowLevelInterpreter.cpp) - else () - # As there's poor toolchain support for using `.file` directives in - # inline asm (i.e. there's no way to avoid clashes with the `.file` -@@ -465,7 +465,7 @@ else () - # an object file. We only need to do this for LowLevelInterpreter.cpp - # and cmake doesn't allow us to introduce a compiler wrapper for a - # single source file, so we need to create a separate target for it. -- add_library(LowLevelInterpreterLib STATIC llint/LowLevelInterpreter.cpp -+ add_library(LowLevelInterpreterLib OBJECT llint/LowLevelInterpreter.cpp - ${JavaScriptCore_DERIVED_SOURCES_DIR}/${LLIntOutput}) - endif () - -@@ -1496,7 +1496,13 @@ if (CMAKE_COMPILER_IS_GNUCXX AND GCC_OFFLINEASM_SOURCE_MAP) - COMPILE_OPTIONS "-fno-lto") - endif () - --list(APPEND JavaScriptCore_PRIVATE_LIBRARIES LowLevelInterpreterLib) -+# When building JavaScriptCore as an object library, we need to make sure the -+# lowlevelinterpreter lib objects get propogated. -+if (${JavaScriptCore_LIBRARY_TYPE} STREQUAL "OBJECT") -+ list(APPEND JavaScriptCore_PRIVATE_LIBRARIES $) -+else () -+ list(APPEND JavaScriptCore_SOURCES $) -+endif () - - WEBKIT_COMPUTE_SOURCES(JavaScriptCore) - list(APPEND JavaScriptCore_SOURCES --- -2.37.1 - diff --git a/package/wpewebkit/wpewebkit.hash b/package/wpewebkit/wpewebkit.hash index 2a8205d40c..827df1e89a 100644 --- a/package/wpewebkit/wpewebkit.hash +++ b/package/wpewebkit/wpewebkit.hash @@ -1,7 +1,8 @@ -# From https://wpewebkit.org/releases/wpewebkit-2.36.4.tar.xz.sums -md5 ba8e5f5444fd50f53906a7376b25bb26 wpewebkit-2.36.4.tar.xz -sha1 91259642da6fe55446c3352eeeafdaa188fc14bd wpewebkit-2.36.4.tar.xz -sha256 307a3bedf5d4299a861f773f631c39a44c3e6276c3af37f7cbefaed2c8d7c021 wpewebkit-2.36.4.tar.xz + +# From https://wpewebkit.org/releases/wpewebkit-2.36.5.tar.xz.sums +md5 99b9b0c3c8757edf03ddf550bea448e2 wpewebkit-2.36.5.tar.xz +sha1 d7deb766d1ff48b7f9d685fcd67ccc23e2962288 wpewebkit-2.36.5.tar.xz +sha256 f2461d533cd3820ea1855e2c8b0b0624b39add1389dc3ac09c2f27891a7a8caa wpewebkit-2.36.5.tar.xz # Hashes for license files: sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE diff --git a/package/wpewebkit/wpewebkit.mk b/package/wpewebkit/wpewebkit.mk index cf58a4c14d..0deb36f28f 100644 --- a/package/wpewebkit/wpewebkit.mk +++ b/package/wpewebkit/wpewebkit.mk @@ -4,7 +4,7 @@ # ################################################################################ -WPEWEBKIT_VERSION = 2.36.4 +WPEWEBKIT_VERSION = 2.36.5 WPEWEBKIT_SITE = http://www.wpewebkit.org/releases WPEWEBKIT_SOURCE = wpewebkit-$(WPEWEBKIT_VERSION).tar.xz WPEWEBKIT_INSTALL_STAGING = YES