diff --git a/network/misc/webkit2gtk/actions.py b/network/misc/webkit2gtk/actions.py index 4d7c084c40..3ebc69b515 100644 --- a/network/misc/webkit2gtk/actions.py +++ b/network/misc/webkit2gtk/actions.py @@ -21,7 +21,7 @@ def setup(): -DCMAKE_SKIP_RPATH=ON \ -DCMAKE_INSTALL_PREFIX=/usr \ -DLIB_INSTALL_DIR=/usr/lib \ - -DLIBEXEC_INSTALL_DIR=/usr/lib/webkit2gtk-4.1 \ + -DLIBEXEC_INSTALL_DIR=/usr/lib/webkit2gtk-4.0 \ -DENABLE_CREDENTIAL_STORAGE=ON \ -DENABLE_GEOLOCATION=ON \ -DENABLE_VIDEO=ON \ @@ -32,7 +32,7 @@ def setup(): -DUSE_WOFF2=OFF \ -DUSE_SYSTEMD=OFF \ -DPYTHON_EXECUTABLE=/usr/bin/python3 \ - -DJPEG_INCLUDE_DIR=/usr/include/openjpeg-2.4 \ + -DJPEG_INCLUDE_DIR=/usr/include/openjpeg-2.5 \ -DSHOULD_INSTALL_JS_SHELL=ON \ -DUSE_WPE_RENDERER=OFF \ -DENABLE_MINIBROWSER=ON") diff --git a/network/misc/webkit2gtk/files/fix-build.patch b/network/misc/webkit2gtk/files/fix-build.patch index 90da751187..d95e1c86bc 100644 --- a/network/misc/webkit2gtk/files/fix-build.patch +++ b/network/misc/webkit2gtk/files/fix-build.patch @@ -1,12 +1,54 @@ ---- a/Source/WebCore/platform/graphics/opengl/ExtensionsGLOpenGLES.h -+++ a/Source/WebCore/platform/graphics/opengl/ExtensionsGLOpenGLES.h -@@ -33,6 +33,9 @@ - #if USE(LIBEPOXY) - #include - #else -+#if HAVE(OPENGL_ES_3) -+#include -+#endif // HAVE(OPENGL_ES_3) - #include - #include - #endif +From f20bac21ea37991c1a1110e78846897a406932f0 Mon Sep 17 00:00:00 2001 +From: Michael Catanzaro +Date: Tue, 5 Jul 2022 08:23:12 -0500 +Subject: [PATCH] Revert "Merge r295034 - WebKitTestRunner shouldn't link + object files of JavaScriptCore and WebCore" + +This reverts commit 7916fda00b347ff263fbfe72c065032d1d9b523c. +--- + 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.36.1 + diff --git a/network/misc/webkit2gtk/pspec.xml b/network/misc/webkit2gtk/pspec.xml index 9bf12dbed4..230b1fb3e3 100644 --- a/network/misc/webkit2gtk/pspec.xml +++ b/network/misc/webkit2gtk/pspec.xml @@ -14,7 +14,7 @@ library An opensource web browser engine for GTK+ applications The GTK+ port of WebKit is intended to provide a browser component primarily for users of the portable GTK+ UI toolkit on platforms like Linux. - https://www.webkitgtk.org/releases/webkitgtk-2.36.3.tar.xz + https://www.webkitgtk.org/releases/webkitgtk-2.36.4.tar.xz cmake which @@ -58,7 +58,7 @@ gobject-introspection-devel - + fix-build.patch @@ -144,6 +144,13 @@ + + 2022-07-11 + 2.36.4 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2022-06-22 2.36.3