diff --git a/network/misc/webkit2gtk-4.1/actions.py b/network/misc/webkit2gtk-4.1/actions.py
old mode 100644
new mode 100755
index a1f69be9ed..31efbe7102
--- a/network/misc/webkit2gtk-4.1/actions.py
+++ b/network/misc/webkit2gtk-4.1/actions.py
@@ -19,6 +19,8 @@ def setup():
shelltools.system("mkdir build")
shelltools.cd("build")
cmaketools.configure("-DPORT=GTK \
+ -DCMAKE_C_FLAGS='-g1' \
+ -DCMAKE_CXX_FLAGS='-g1' \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_SKIP_RPATH=ON \
-DCMAKE_INSTALL_PREFIX=/usr \
diff --git a/network/misc/webkit2gtk-4.1/files/GTK-Disable-DMABuf-renderer-for-NVIDIA-proprietary-drivers.patch b/network/misc/webkit2gtk-4.1/files/GTK-Disable-DMABuf-renderer-for-NVIDIA-proprietary-drivers.patch
old mode 100644
new mode 100755
diff --git a/network/misc/webkit2gtk-4.1/files/GTK-MiniBrowser-should-hide-the-toolbar-when-using-full-screen.patch b/network/misc/webkit2gtk-4.1/files/GTK-MiniBrowser-should-hide-the-toolbar-when-using-full-screen.patch
old mode 100644
new mode 100755
diff --git a/network/misc/webkit2gtk-4.1/files/install-minibrowser.patch b/network/misc/webkit2gtk-4.1/files/install-minibrowser.patch
old mode 100644
new mode 100755
diff --git a/network/misc/webkit2gtk-4.1/pspec.xml b/network/misc/webkit2gtk-4.1/pspec.xml
old mode 100644
new mode 100755
index 1d43d2a457..f804d1edc6
--- a/network/misc/webkit2gtk-4.1/pspec.xml
+++ b/network/misc/webkit2gtk-4.1/pspec.xml
@@ -19,23 +19,25 @@
cmake
which
gperf
- gtk-doc
+ ninja
unifdef
- gi-docgen
+ gtk-doc
+ lld-devel
bubblewrap
ruby-devel
mesa-devel
gtk3-devel
gtk2-devel
- libavif-devel
- libjxl-devel
webp-devel
libwpe-devel
cairo-devel
icu4c-devel
libXt-devel
lcms2-devel
+ glib2-devel
sqlite-devel
+ libjxl-devel
+ libavif-devel
python3-devel
libsoup3-devel
wayland-devel
@@ -52,6 +54,7 @@
openjpeg2-devel
libsecret-devel
libgcrypt-devel
+ gstreamer-devel
libseccomp-devel
libmanette-devel
icon-theme-hicolor
@@ -59,6 +62,7 @@
wpebackend-fdo-devel
gst-plugins-bad-devel
gst-plugins-base-devel
+ wayland-protocols-devel
gobject-introspection-devel
@@ -71,10 +75,8 @@
webkit2gtk-4.1
atk
- bubblewrap
zlib
gtk3
-
mesa
webp
lcms2
@@ -83,15 +85,15 @@
libXt
glib2
pango
- libjxl
- libdrm
- libavif
- libepoxy
+ expat
libwpe
libX11
libgcc
libpng
sqlite
+ libjxl
+ libdrm
+ libavif
libxml2
wayland
enchant
@@ -104,6 +106,7 @@
harfbuzz
freetype
libglvnd
+ libepoxy
libsecret
openjpeg2
libnotify
@@ -116,6 +119,7 @@
libXrender
libseccomp
libmanette
+ bubblewrap
libXcomposite
libjpeg-turbo
wpebackend-fdo
diff --git a/network/misc/webkit2gtk-6.0/actions.py b/network/misc/webkit2gtk-6.0/actions.py
old mode 100644
new mode 100755
index c67d188cbb..246074d881
--- a/network/misc/webkit2gtk-6.0/actions.py
+++ b/network/misc/webkit2gtk-6.0/actions.py
@@ -17,6 +17,8 @@ def setup():
shelltools.system("mkdir build")
shelltools.cd("build")
cmaketools.configure("-DPORT=GTK \
+ -DCMAKE_C_FLAGS='-g1' \
+ -DCMAKE_CXX_FLAGS='-g1' \
-DUSE_GTK4=ON \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_SKIP_RPATH=ON \
diff --git a/network/misc/webkit2gtk-6.0/files/install-minibrowser.patch b/network/misc/webkit2gtk-6.0/files/install-minibrowser.patch
old mode 100644
new mode 100755
diff --git a/network/misc/webkit2gtk-6.0/pspec.xml b/network/misc/webkit2gtk-6.0/pspec.xml
old mode 100644
new mode 100755
index 4b13162ff0..394eb57572
--- a/network/misc/webkit2gtk-6.0/pspec.xml
+++ b/network/misc/webkit2gtk-6.0/pspec.xml
@@ -82,6 +82,7 @@
icu4c
libXt
glib2
+ expat
libjxl
pango
libdrm
diff --git a/network/misc/webkit2gtk/actions.py b/network/misc/webkit2gtk/actions.py
old mode 100644
new mode 100755
index 3fc4b6ffb7..a6c1f8b1e9
--- a/network/misc/webkit2gtk/actions.py
+++ b/network/misc/webkit2gtk/actions.py
@@ -17,16 +17,12 @@ def setup():
#shelltools.system("rm -r Source/ThirdParty/gtest/")
#pisitools.dosed("Source/cmake/OptionsGTK.cmake", "2.99.5", "2.72.0")
cmaketools.configure("-DPORT=GTK \
+ -DCMAKE_C_FLAGS='-g1' \
+ -DCMAKE_CXX_FLAGS='-g1' \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_SKIP_RPATH=ON \
-DCMAKE_INSTALL_PREFIX=/usr \
-DLIB_INSTALL_DIR=/usr/lib \
- -DLIBEXEC_INSTALL_DIR=/usr/lib/webkit2gtk-4.0 \
- -DENABLE_CREDENTIAL_STORAGE=ON \
- -DENABLE_GEOLOCATION=ON \
- -DENABLE_VIDEO=ON \
- -DENABLE_WEB_AUDIO=ON \
- -DENABLE_WEBGL=ON \
-DUSE_LIBHYPHEN=OFF \
-DUSE_SOUP2=ON \
-DUSE_WOFF2=OFF \
@@ -35,8 +31,6 @@ def setup():
-DUSE_LIBBACKTRACE=OFF \
-DPYTHON_EXECUTABLE=/usr/bin/python3 \
-DJPEG_INCLUDE_DIR=/usr/include/openjpeg-2.5 \
- -DSHOULD_INSTALL_JS_SHELL=ON \
- -DUSE_WPE_RENDERER=OFF \
-DENABLE_SPEECH_SYNTHESIS=OFF \
-DUSE_FLITE=OFF \
-DENABLE_MINIBROWSER=ON")
diff --git a/network/misc/webkit2gtk/files/GTK-Disable-DMABuf-renderer-for-NVIDIA-proprietary-drivers.patch b/network/misc/webkit2gtk/files/GTK-Disable-DMABuf-renderer-for-NVIDIA-proprietary-drivers.patch
old mode 100644
new mode 100755
diff --git a/network/misc/webkit2gtk/files/GTK-MiniBrowser-should-hide-the-toolbar-when-using-full-screen.patch b/network/misc/webkit2gtk/files/GTK-MiniBrowser-should-hide-the-toolbar-when-using-full-screen.patch
old mode 100644
new mode 100755
diff --git a/network/misc/webkit2gtk/files/fix-build.patch b/network/misc/webkit2gtk/files/fix-build.patch
old mode 100644
new mode 100755
diff --git a/network/misc/webkit2gtk/files/fix-ftbfs-riscv64.patch b/network/misc/webkit2gtk/files/fix-ftbfs-riscv64.patch
new file mode 100644
index 0000000000..712db01952
--- /dev/null
+++ b/network/misc/webkit2gtk/files/fix-ftbfs-riscv64.patch
@@ -0,0 +1,40 @@
+From: Alberto Garcia
+Description: Use WTF_CPU_UNKNOWN when building for riscv64
+ WebKitGTK doesn't build on riscv64 even with the JIT disabled.
+ Treating the CPU as unknown is perhaps a bit severe, but it allows us
+ to get the build done until someone steps up to maintain this
+ properly.
+Bug: https://bugs.webkit.org/show_bug.cgi?id=271371
+Forwarded: no
+Index: webkitgtk/Source/WTF/wtf/PlatformCPU.h
+===================================================================
+--- webkitgtk.orig/Source/WTF/wtf/PlatformCPU.h
++++ webkitgtk/Source/WTF/wtf/PlatformCPU.h
+@@ -285,14 +285,6 @@
+
+ #endif /* ARM */
+
+-/* CPU(RISCV64) - RISC-V 64-bit */
+-#if defined(__riscv) \
+- && defined(__riscv_xlen) \
+- && (__riscv_xlen == 64)
+-#define WTF_CPU_RISCV64 1
+-#define WTF_CPU_KNOWN 1
+-#endif
+-
+ #if !CPU(KNOWN)
+ #define WTF_CPU_UNKNOWN 1
+ #endif
+Index: webkitgtk/Source/cmake/WebKitCommon.cmake
+===================================================================
+--- webkitgtk.orig/Source/cmake/WebKitCommon.cmake
++++ webkitgtk/Source/cmake/WebKitCommon.cmake
+@@ -125,8 +125,6 @@ if (NOT HAS_RUN_WEBKIT_COMMON)
+ set(WTF_CPU_PPC64 1)
+ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64le")
+ set(WTF_CPU_PPC64LE 1)
+- elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^riscv64")
+- set(WTF_CPU_RISCV64 1)
+ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^loongarch64")
+ set(WTF_CPU_LOONGARCH64 1)
+ else ()
\ No newline at end of file
diff --git a/network/misc/webkit2gtk/files/gentoo/2.28.2-non-jumbo-fix.patch b/network/misc/webkit2gtk/files/gentoo/2.28.2-non-jumbo-fix.patch
old mode 100644
new mode 100755
diff --git a/network/misc/webkit2gtk/files/gentoo/2.28.2-opengl-without-X-fixes.patch b/network/misc/webkit2gtk/files/gentoo/2.28.2-opengl-without-X-fixes.patch
old mode 100644
new mode 100755
diff --git a/network/misc/webkit2gtk/files/gentoo/2.28.4-non-jumbo-fix2.patch b/network/misc/webkit2gtk/files/gentoo/2.28.4-non-jumbo-fix2.patch
old mode 100644
new mode 100755
diff --git a/network/misc/webkit2gtk/files/gentoo/2.30.3-fix-noGL-build.patch b/network/misc/webkit2gtk/files/gentoo/2.30.3-fix-noGL-build.patch
old mode 100644
new mode 100755
diff --git a/network/misc/webkit2gtk/files/gentoo/webkit-gtk-2.24.4-eglmesaext-include.patch b/network/misc/webkit2gtk/files/gentoo/webkit-gtk-2.24.4-eglmesaext-include.patch
old mode 100644
new mode 100755
diff --git a/network/misc/webkit2gtk/files/install-minibrowser.patch b/network/misc/webkit2gtk/files/install-minibrowser.patch
old mode 100644
new mode 100755
diff --git a/network/misc/webkit2gtk/pspec.xml b/network/misc/webkit2gtk/pspec.xml
old mode 100644
new mode 100755
index b0935f8a0e..d4216e9265
--- a/network/misc/webkit2gtk/pspec.xml
+++ b/network/misc/webkit2gtk/pspec.xml
@@ -19,8 +19,10 @@
cmake
which
gperf
+ ninja
unifdef
gtk-doc
+ lld-devel
bubblewrap
ruby-devel
mesa-devel
@@ -32,6 +34,7 @@
icu4c-devel
libXt-devel
lcms2-devel
+ glib2-devel
sqlite-devel
libjxl-devel
libavif-devel
@@ -51,6 +54,7 @@
openjpeg2-devel
libsecret-devel
libgcrypt-devel
+ gstreamer-devel
libseccomp-devel
libmanette-devel
icon-theme-hicolor
@@ -58,10 +62,11 @@
wpebackend-fdo-devel
gst-plugins-bad-devel
gst-plugins-base-devel
+ wayland-protocols-devel
gobject-introspection-devel
-
+
@@ -70,7 +75,6 @@
webkit2gtk
atk
- bubblewrap
zlib
gtk3
mesa
@@ -81,12 +85,14 @@
libXt
glib2
pango
+ expat
libwpe
libX11
libgcc
libpng
sqlite
libjxl
+ libdrm
libavif
libxml2
wayland
@@ -100,6 +106,7 @@
harfbuzz
freetype
libglvnd
+ libepoxy
libsecret
openjpeg2
libnotify
@@ -112,6 +119,7 @@
libXrender
libseccomp
libmanette
+ bubblewrap
libXcomposite
libjpeg-turbo
wpebackend-fdo