Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #17587 from Rmys/master

Browse Source 
webkit2gtk ver. bump
This commit is contained in:
Rmys
2025-10-23 18:34:29 +03:00
committed by GitHub
parent 1ad1abe674 c2e64eba43
commit 7abb7095f1
20 changed files with 71 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
network/misc/webkit2gtk-4.1/actions.py
Regular → Executable
+2
View File
@@ -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 \
network/misc/webkit2gtk-4.1/files/GTK-Disable-DMABuf-renderer-for-NVIDIA-proprietary-drivers.patch
Regular → Executable
View File
network/misc/webkit2gtk-4.1/files/GTK-MiniBrowser-should-hide-the-toolbar-when-using-full-screen.patch
Regular → Executable
View File
network/misc/webkit2gtk-4.1/files/install-minibrowser.patch
Regular → Executable
View File
network/misc/webkit2gtk-4.1/pspec.xml
Regular → Executable
+14 -10
View File
@@ -19,23 +19,25 @@
<Dependency>cmake</Dependency>
<Dependency>which</Dependency>
<Dependency>gperf</Dependency>
<Dependency>gtk-doc</Dependency>
<Dependency>ninja</Dependency>
<Dependency>unifdef</Dependency>
<Dependency>gi-docgen</Dependency>
<Dependency>gtk-doc</Dependency>
<Dependency>lld-devel</Dependency>
<Dependency>bubblewrap</Dependency>
<Dependency>ruby-devel</Dependency>
<Dependency>mesa-devel</Dependency>
<Dependency>gtk3-devel</Dependency>
<Dependency>gtk2-devel</Dependency>
<Dependency>libavif-devel</Dependency>
<Dependency>libjxl-devel</Dependency>
<Dependency>webp-devel</Dependency>
<Dependency>libwpe-devel</Dependency>
<Dependency>cairo-devel</Dependency>
<Dependency>icu4c-devel</Dependency>
<Dependency>libXt-devel</Dependency>
<Dependency>lcms2-devel</Dependency>
<Dependency>glib2-devel</Dependency>
<Dependency>sqlite-devel</Dependency>
<Dependency>libjxl-devel</Dependency>
<Dependency>libavif-devel</Dependency>
<Dependency>python3-devel</Dependency>
<Dependency>libsoup3-devel</Dependency>
<Dependency>wayland-devel</Dependency>
@@ -52,6 +54,7 @@
<Dependency>openjpeg2-devel</Dependency>
<Dependency>libsecret-devel</Dependency>
<Dependency>libgcrypt-devel</Dependency>
<Dependency>gstreamer-devel</Dependency>
<Dependency>libseccomp-devel</Dependency>
<Dependency>libmanette-devel</Dependency>
<Dependency>icon-theme-hicolor</Dependency>
@@ -59,6 +62,7 @@
<Dependency>wpebackend-fdo-devel</Dependency>
<Dependency>gst-plugins-bad-devel</Dependency>
<Dependency>gst-plugins-base-devel</Dependency>
<Dependency>wayland-protocols-devel</Dependency>
<Dependency>gobject-introspection-devel</Dependency>
</BuildDependencies>
<Patches>
@@ -71,10 +75,8 @@
<Name>webkit2gtk-4.1</Name>
<RuntimeDependencies>
<Dependency>atk</Dependency>
<Dependency>bubblewrap</Dependency>
<Dependency>zlib</Dependency>
<Dependency>gtk3</Dependency>
<!-- <Dependency>gtk4</Dependency> -->
<Dependency>mesa</Dependency>
<Dependency>webp</Dependency>
<Dependency>lcms2</Dependency>
@@ -83,15 +85,15 @@
<Dependency>libXt</Dependency>
<Dependency>glib2</Dependency>
<Dependency>pango</Dependency>
<Dependency>libjxl</Dependency>
<Dependency>libdrm</Dependency>
<Dependency>libavif</Dependency>
<Dependency>libepoxy</Dependency>
<Dependency>expat</Dependency>
<Dependency>libwpe</Dependency>
<Dependency>libX11</Dependency>
<Dependency>libgcc</Dependency>
<Dependency>libpng</Dependency>
<Dependency>sqlite</Dependency>
<Dependency>libjxl</Dependency>
<Dependency>libdrm</Dependency>
<Dependency>libavif</Dependency>
<Dependency>libxml2</Dependency>
<Dependency>wayland</Dependency>
<Dependency>enchant</Dependency>
@@ -104,6 +106,7 @@
<Dependency>harfbuzz</Dependency>
<Dependency>freetype</Dependency>
<Dependency>libglvnd</Dependency>
<Dependency>libepoxy</Dependency>
<Dependency>libsecret</Dependency>
<Dependency>openjpeg2</Dependency>
<Dependency>libnotify</Dependency>
@@ -116,6 +119,7 @@
<Dependency>libXrender</Dependency>
<Dependency>libseccomp</Dependency>
<Dependency>libmanette</Dependency>
<Dependency>bubblewrap</Dependency>
<Dependency>libXcomposite</Dependency>
<Dependency>libjpeg-turbo</Dependency>
<Dependency>wpebackend-fdo</Dependency>
network/misc/webkit2gtk-6.0/actions.py
Regular → Executable
+2
View File
@@ -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 \
network/misc/webkit2gtk-6.0/files/install-minibrowser.patch
Regular → Executable
View File
network/misc/webkit2gtk-6.0/pspec.xml
Regular → Executable
+1
View File
@@ -82,6 +82,7 @@
<Dependency>icu4c</Dependency>
<Dependency>libXt</Dependency>
<Dependency>glib2</Dependency>
<Dependency>expat</Dependency>
<Dependency>libjxl</Dependency>
<Dependency>pango</Dependency>
<Dependency>libdrm</Dependency>
network/misc/webkit2gtk/actions.py
Regular → Executable
+2 -8
View File
@@ -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")
network/misc/webkit2gtk/files/GTK-Disable-DMABuf-renderer-for-NVIDIA-proprietary-drivers.patch
Regular → Executable
View File
network/misc/webkit2gtk/files/GTK-MiniBrowser-should-hide-the-toolbar-when-using-full-screen.patch
Regular → Executable
View File
network/misc/webkit2gtk/files/fix-build.patch
Regular → Executable
View File
network/misc/webkit2gtk/files/fix-ftbfs-riscv64.patch
+40
View File
@@ -0,0 +1,40 @@
From: Alberto Garcia <berto@igalia.com>
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 ()
network/misc/webkit2gtk/files/gentoo/2.28.2-non-jumbo-fix.patch
Regular → Executable
View File
network/misc/webkit2gtk/files/gentoo/2.28.2-opengl-without-X-fixes.patch
Regular → Executable
View File
network/misc/webkit2gtk/files/gentoo/2.28.4-non-jumbo-fix2.patch
Regular → Executable
View File
network/misc/webkit2gtk/files/gentoo/2.30.3-fix-noGL-build.patch
Regular → Executable
View File
network/misc/webkit2gtk/files/gentoo/webkit-gtk-2.24.4-eglmesaext-include.patch
Regular → Executable
View File
network/misc/webkit2gtk/files/install-minibrowser.patch
Regular → Executable
View File
network/misc/webkit2gtk/pspec.xml
Regular → Executable
+10 -2
View File
@@ -19,8 +19,10 @@
<Dependency>cmake</Dependency>
<Dependency>which</Dependency>
<Dependency>gperf</Dependency>
<Dependency>ninja</Dependency>
<Dependency>unifdef</Dependency>
<Dependency>gtk-doc</Dependency>
<Dependency>lld-devel</Dependency>
<Dependency>bubblewrap</Dependency>
<Dependency>ruby-devel</Dependency>
<Dependency>mesa-devel</Dependency>
@@ -32,6 +34,7 @@
<Dependency>icu4c-devel</Dependency>
<Dependency>libXt-devel</Dependency>
<Dependency>lcms2-devel</Dependency>
<Dependency>glib2-devel</Dependency>
<Dependency>sqlite-devel</Dependency>
<Dependency>libjxl-devel</Dependency>
<Dependency>libavif-devel</Dependency>
@@ -51,6 +54,7 @@
<Dependency>openjpeg2-devel</Dependency>
<Dependency>libsecret-devel</Dependency>
<Dependency>libgcrypt-devel</Dependency>
<Dependency>gstreamer-devel</Dependency>
<Dependency>libseccomp-devel</Dependency>
<Dependency>libmanette-devel</Dependency>
<Dependency>icon-theme-hicolor</Dependency>
@@ -58,10 +62,11 @@
<Dependency>wpebackend-fdo-devel</Dependency>
<Dependency>gst-plugins-bad-devel</Dependency>
<Dependency>gst-plugins-base-devel</Dependency>
<Dependency>wayland-protocols-devel</Dependency>
<Dependency>gobject-introspection-devel</Dependency>
</BuildDependencies>
<Patches>
<!-- <Patch level="1">GTK-MiniBrowser-should-hide-the-toolbar-when-using-full-screen.patch</Patch> -->
<!-- <Patch level="1">fix-ftbfs-riscv64.patch</Patch> -->
<!-- <Patch level="1">GTK-Disable-DMABuf-renderer-for-NVIDIA-proprietary-drivers.patch</Patch> -->
</Patches>
</Source>
@@ -70,7 +75,6 @@
<Name>webkit2gtk</Name>
<RuntimeDependencies>
<Dependency>atk</Dependency>
<Dependency>bubblewrap</Dependency>
<Dependency>zlib</Dependency>
<Dependency>gtk3</Dependency>
<Dependency>mesa</Dependency>
@@ -81,12 +85,14 @@
<Dependency>libXt</Dependency>
<Dependency>glib2</Dependency>
<Dependency>pango</Dependency>
<Dependency>expat</Dependency>
<Dependency>libwpe</Dependency>
<Dependency>libX11</Dependency>
<Dependency>libgcc</Dependency>
<Dependency>libpng</Dependency>
<Dependency>sqlite</Dependency>
<Dependency>libjxl</Dependency>
<Dependency>libdrm</Dependency>
<Dependency>libavif</Dependency>
<Dependency>libxml2</Dependency>
<Dependency>wayland</Dependency>
@@ -100,6 +106,7 @@
<Dependency>harfbuzz</Dependency>
<Dependency>freetype</Dependency>
<Dependency>libglvnd</Dependency>
<Dependency>libepoxy</Dependency>
<Dependency>libsecret</Dependency>
<Dependency>openjpeg2</Dependency>
<Dependency>libnotify</Dependency>
@@ -112,6 +119,7 @@
<Dependency>libXrender</Dependency>
<Dependency>libseccomp</Dependency>
<Dependency>libmanette</Dependency>
<Dependency>bubblewrap</Dependency>
<Dependency>libXcomposite</Dependency>
<Dependency>libjpeg-turbo</Dependency>
<Dependency>wpebackend-fdo</Dependency>