commit 13a9d4c

webkit2gtk: bump to 2.44.1

sorted cmake flags.
even with web_crypto disabled, cmake kept erroring out on missing libtasn libraries, so libtasn1 is now a dependency I guess?

 1@@ -1,9 +1,12 @@
 2 #!/bin/sh -e
 3 
 4 export DESTDIR="$1"
 5+
 6 export CCACHE_SLOPPINESS=time_macros,include_file_mtime
 7 
 8-patch -p1 < 0001-fix-dlopen-of-libwebkit.patch
 9+# Silence loud warnings. Source: Chimera linux
10+export CFLAGS="$CFLAGS -DNDEBUG"
11+export CXXFLAGS="$CXXFLAGS -DNDEBUG -Wno-deprecated-declarations -Wno-deprecated-copy"
12 
13 # Enable streaming related options if gstreamer is installed.
14 pkg-config --exists gstreamer-video-1.0 && video=ON
15@@ -12,9 +15,6 @@ pkg-config --exists gstreamer-audio-1.0 && audio=ON
16 # Enable the use of openjpeg if the package is installed.
17 pkg-config --exists openjpeg2 && jpeg=ON
18 
19-# Enable WEB_CRYPTO if libtasn1 is installed.
20-pkg-config --exists libtasn1 && tasn=ON
21-
22 # Use clang if installed, decreases compilation time by 25%.
23 if command -v clang; then
24 	export CC=clang 
25@@ -38,7 +38,6 @@ mv -f _ Source/WebKit/PlatformWPEDeprecated.cmake
26 sed 's/ln -n -s -f/ln -sf/g' Source/WebKit/PlatformGTKDeprecated.cmake  > _
27 mv -f _ Source/WebKit/PlatformGTKDeprecated.cmake
28  
29-
30 # Remove gettext requirement.
31 sed 's/ngettext/printf/g' Tools/MiniBrowser/gtk/BrowserDownloadsBar.c > _
32 mv -f _ Tools/MiniBrowser/gtk/BrowserDownloadsBar.c
33@@ -70,34 +69,38 @@ cmake -G Ninja -B build \
34     -DLIB_INSTALL_DIR=/usr/lib \
35     -DPORT=GTK \
36     -DCMAKE_SKIP_RPATH=ON \
37-    -DENABLE_BUBBLEWRAP_SANDBOX=OFF \
38-    -DENABLE_SAMPLING_PROFILER=OFF \
39-    -DENABLE_GEOLOCATION=OFF \
40     -DENABLE_API_TESTS=OFF \
41-    -DENABLE_PDFJS=OFF \
42+    -DENABLE_BUBBLEWRAP_SANDBOX=OFF \
43+    -DENABLE_C_LOOP=OFF \
44     -DENABLE_DOCUMENTATION=OFF \
45+    -DENABLE_GAMEPAD=OFF \
46+    -DENABLE_GEOLOCATION=OFF \
47     -DENABLE_GLES2=ON \
48     -DENABLE_INTROSPECTION=OFF \
49+    -DENABLE_JIT=OFF \
50+    -DENABLE_JOURNALD_LOG=OFF \
51     -DENABLE_MINIBROWSER=OFF \
52+    -DENABLE_PDFJS=OFF \
53+    -DENABLE_SAMPLING_PROFILER=OFF \
54     -DENABLE_SPELLCHECK=OFF \
55+    -DENABLE_VIDEO="${video:-OFF}" \
56+    -DENABLE_WAYLAND_TARGET=OFF \
57+    -DENABLE_WEB_AUDIO="${audio:-OFF}" \
58+    -DUSE_AVIF=OFF \
59     -DUSE_GSTREAMER_GL=OFF \
60+    -DUSE_GSTREAMER_TRANSCODER=OFF \
61+    -DUSE_GTK4=OFF \
62+    -DUSE_JPEGXL=OFF \
63+    -DUSE_LCMS=OFF \
64+    -DUSE_LIBBACKTRACE=OFF \
65     -DUSE_LIBHYPHEN=OFF \
66     -DUSE_LIBNOTIFY=OFF \
67     -DUSE_LIBSECRET=OFF \
68     -DUSE_OPENJPEG="${jpeg:-OFF}" \
69+    -DUSE_SOUP2=OFF \
70     -DUSE_SYSTEMD=OFF \
71     -DUSE_WOFF2=OFF \
72-    -DUSE_JPEGXL=OFF \
73     -DUSE_WPE_RENDERER=OFF \
74-    -DENABLE_WEB_CRYPTO="${tasn:-OFF}" \
75-    -DENABLE_VIDEO="${video:-OFF}" \
76-    -DENABLE_WEB_AUDIO="${audio:-OFF}" \
77-    -DENABLE_GAMEPAD=OFF \
78-    -DUSE_SOUP2=OFF \
79-    -DENABLE_JOURNALD_LOG=OFF \
80-    -DUSE_LCMS=OFF \
81-    -DENABLE_WAYLAND_TARGET=OFF \
82-    -DUSE_AVIF=OFF \
83     -Wno-dev
84 
85 samu -C build

1@@ -1,2 +1 @@
2-db202d3db2b0f3c59ebb262d405373f2120e83d5aa6c5db3a4cbad98ccd7ddca80
3-98db19b9cdc6db7329dc5c4d439b823d628867bc82a1ef72569604f0ff5986d226
4+d5d7caffa867aa647732599d8482152090de9e5ce56e9e22dbf2b70139de3e22c5

 1@@ -1,18 +1,20 @@
 2 atk
 3 cairo
 4-cmake        make
 5+cmake            make
 6 freetype-harfbuzz
 7 glib-networking
 8-gperf        make
 9+gperf            make
10 gtk+3
11 libXt
12 libgcrypt
13 libsoup3
14+libtasn1
15 libwebp
16 libxslt
17 mesa
18-perl         make
19-python       make
20-ruby         make
21+perl             make
22+python           make
23+python-packaging make
24+ruby             make
25 sqlite
26-unifdef      make
27+unifdef          make

 1@@ -1,33 +0,0 @@
 2-From 70d06cbcd044bc97001fcdc059faef1fe6349a23 Mon Sep 17 00:00:00 2001
 3-From: hovercats <hovercatswithlasereyes@protonmail.com>
 4-Date: Sat, 4 May 2024 20:52:04 +0200
 5-Subject: [PATCH] fix dlopen of libwebkit
 6-
 7-it is not portable to use initial-exec in shared objects that are meant to be
 8-dlopen'd.
 9-glibc reserves some space to allow this anyway- but other libcs like musl do
10-not.
11-using an initial-exec variables forces the entire libwebkit2gtk.so to gain a TLS
12-program header, which makes it fail to dlopen with musl's loader.
13-
14-see https://gitlab.freedesktop.org/mesa/mesa/-/commit/8570a2a280587a1e43ac11ad46ad62dfdd6c7b39
15----
16- .../platform/graphics/gbm/GraphicsContextGLANGLELinux.cpp       | 2 +-
17- 1 file changed, 1 insertion(+), 1 deletion(-)
18-
19-diff --git a/Source/WebCore/platform/graphics/gbm/GraphicsContextGLANGLELinux.cpp b/Source/WebCore/platform/graphics/gbm/GraphicsContextGLANGLELinux.cpp
20-index f8627d2c..6666f6d0 100644
21---- a/Source/WebCore/platform/graphics/gbm/GraphicsContextGLANGLELinux.cpp
22-+++ b/Source/WebCore/platform/graphics/gbm/GraphicsContextGLANGLELinux.cpp
23-@@ -108,7 +108,7 @@ RefPtr<PixelBuffer> GraphicsContextGLANGLE::readCompositedResults()
24- 
25- bool GraphicsContextGLANGLE::makeContextCurrent()
26- {
27--    static thread_local TLS_MODEL_INITIAL_EXEC GraphicsContextGLANGLE* s_currentContext { nullptr };
28-+    static thread_local GraphicsContextGLANGLE* s_currentContext { nullptr };
29- 
30-     if (s_currentContext == this)
31-         return true;
32--- 
33-2.44.0
34-

1@@ -1,2 +1 @@
2-https://webkitgtk.org/releases/webkitgtk-2.40.4.tar.xz
3-patches/0001-fix-dlopen-of-libwebkit.patch
4+https://webkitgtk.org/releases/webkitgtk-2.44.1.tar.xz

1@@ -1 +1 @@
2-2.40.4 1
3+2.44.1 1