commit b274e48

hovercats  ·  2024-05-04 18:53:59 +0000 UTC
parent 03942fb 
webkit2gtk: make patches more consistent
4 files changed,  +16, -8
M repo/webkit2gtk/build
M repo/webkit2gtk/checksums
R repo/webkit2gtk/patches/0001-fix-dlopen-of-libwebkit.patch
M repo/webkit2gtk/sources
M repo/webkit2gtk/build
+2, -5 
 1@@ -1,13 +1,10 @@
 2 #!/bin/sh -e
 3 
 4 export DESTDIR="$1"
 5-
 6-for p in *.patch; do
 7-	patch -p1 < "$p"
 8-done
 9-
10 export CCACHE_SLOPPINESS=time_macros,include_file_mtime
11 
12+patch -p1 < 0001-fix-dlopen-of-libwebkit.patch
13+
14 # Enable streaming related options if gstreamer is installed.
15 pkg-config --exists gstreamer-video-1.0 && video=ON
16 pkg-config --exists gstreamer-audio-1.0 && audio=ON
M repo/webkit2gtk/checksums
+1, -1 
1@@ -1,2 +1,2 @@
2 db202d3db2b0f3c59ebb262d405373f2120e83d5aa6c5db3a4cbad98ccd7ddca80
3-38325ede040c3e86b0c88e171818636775d72a2e08f182ffcadc703f551e18a14e
4+98db19b9cdc6db7329dc5c4d439b823d628867bc82a1ef72569604f0ff5986d226
R repo/webkit2gtk/patches/initial-exec.patch => repo/webkit2gtk/patches/0001-fix-dlopen-of-libwebkit.patch
+12, -1 
 1@@ -1,3 +1,8 @@
 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@@ -6,7 +11,10 @@ using an initial-exec variables forces the entire libwebkit2gtk.so to gain a TLS
11 program header, which makes it fail to dlopen with musl's loader.
12 
13 see https://gitlab.freedesktop.org/mesa/mesa/-/commit/8570a2a280587a1e43ac11ad46ad62dfdd6c7b39
14---
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@@ -20,3 +28,6 @@ index f8627d2c..6666f6d0 100644
23  
24      if (s_currentContext == this)
25          return true;
26+-- 
27+2.44.0
28+
M repo/webkit2gtk/sources
+1, -1 
1@@ -1,2 +1,2 @@
2 https://webkitgtk.org/releases/webkitgtk-2.40.4.tar.xz
3-patches/initial-exec.patch
4+patches/0001-fix-dlopen-of-libwebkit.patch