webkitgtk-2.36.4

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")

network/misc/webkit2gtk/files/fix-build.patch

@@ -1,12 +1,54 @@
---- a/Source/WebCore/platform/graphics/opengl/ExtensionsGLOpenGLES.h	
+From f20bac21ea37991c1a1110e78846897a406932f0 Mon Sep 17 00:00:00 2001
-+++ a/Source/WebCore/platform/graphics/opengl/ExtensionsGLOpenGLES.h	
+From: Michael Catanzaro <mcatanzaro@redhat.com>
-@@ -33,6 +33,9 @@ 
+Date: Tue, 5 Jul 2022 08:23:12 -0500
- #if USE(LIBEPOXY)
+Subject: [PATCH] Revert "Merge r295034 - WebKitTestRunner shouldn't link
- #include <epoxy/gl.h>
+ object files of JavaScriptCore and WebCore"
- #else
+
-+#if HAVE(OPENGL_ES_3)
+This reverts commit 7916fda00b347ff263fbfe72c065032d1d9b523c.
-+#include <GLES3/gl3.h>
+---
-+#endif // HAVE(OPENGL_ES_3)
+ Source/JavaScriptCore/CMakeLists.txt     | 12 +++++++++---
- #include <GLES2/gl2.h>
+ Tools/WebKitTestRunner/CMakeLists.txt    |  1 -
- #include <GLES2/gl2ext.h>
+ Tools/WebKitTestRunner/PlatformGTK.cmake |  4 ++++
- #endif
+ 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 $<TARGET_OBJECTS:LowLevelInterpreterLib>)
++else ()
++    list(APPEND JavaScriptCore_SOURCES $<TARGET_OBJECTS:LowLevelInterpreterLib>)
++endif ()
+ 
+ WEBKIT_COMPUTE_SOURCES(JavaScriptCore)
+ list(APPEND JavaScriptCore_SOURCES
+-- 
+2.36.1
+

network/misc/webkit2gtk/pspec.xml

@@ -14,7 +14,7 @@
         <IsA>library</IsA>
         <Summary>An opensource web browser engine for GTK+ applications</Summary>
         <Description>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.</Description>
-        <Archive sha1sum="59ee6ee820be360ad57391870fa158064091c525" type="tarxz">https://www.webkitgtk.org/releases/webkitgtk-2.36.3.tar.xz</Archive>
+        <Archive sha1sum="c4f2d3c8581d1abe2a959e99f2846bea5d5ddf3c" type="tarxz">https://www.webkitgtk.org/releases/webkitgtk-2.36.4.tar.xz</Archive>
         <BuildDependencies>
             <Dependency>cmake</Dependency>
             <Dependency>which</Dependency>
@@ -58,7 +58,7 @@
             <Dependency>gobject-introspection-devel</Dependency>
         </BuildDependencies>
         <Patches>
-<!--             <Patch level="1">fix-build.patch</Patch> -->
+            <Patch level="1">fix-build.patch</Patch>
         </Patches>
     </Source>
 
@@ -144,6 +144,13 @@
     </Package>
 
     <History>
+        <Update release="7">
+            <Date>2022-07-11</Date>
+            <Version>2.36.4</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
+        </Update>
         <Update release="6">
             <Date>2022-06-22</Date>
             <Version>2.36.3</Version>