PoetryInCode/void-packages
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

webkit2gtk: update to 2.40.0.

Browse Source 
libwebkit2gtk50 -> libwebkitgtk60
This commit is contained in:
oreo639 2023-01-17 00:26:08 -08:00 committed by Michal Vasilek
parent 73066fd10f
commit 9ce27b1e40
9 changed files with 62 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
common/shlibs
View File

@ -548,8 +548,8 @@ libwebkit2gtk-4.0.so.37 webkit2gtk-2.6.2_1
libjavascriptcoregtk-4.0.so.18 webkit2gtk-2.6.2_1
libwebkit2gtk-4.1.so.0 libwebkit2gtk41-2.38.0_1
libjavascriptcoregtk-4.1.so.0 libwebkit2gtk41-2.38.0_1
libwebkit2gtk-5.0.so.0 libwebkit2gtk50-2.38.0_1
libjavascriptcoregtk-5.0.so.0 libwebkit2gtk50-2.38.0_1
libwebkitgtk-6.0.so.4 libwebkitgtk60-2.40.0_1
libjavascriptcoregtk-6.0.so.1 libwebkitgtk60-2.40.0_1
libgimp-2.0.so.0 libgimp-2.10.0_1
libgimpwidgets-2.0.so.0 libgimp-2.10.0_1
libgimpui-2.0.so.0 libgimp-2.10.0_1
@ -1143,6 +1143,7 @@ libgstbasecamerabinsrc-1.0.so.0 gst-plugins-bad1-1.18.3_2
libgstcodecparsers-1.0.so.0 gst-plugins-bad1-1.18.3_2
libgstplayer-1.0.so.0 gst-plugins-bad1-1.18.3_2
libgstwebrtc-1.0.so.0 gst-plugins-bad1-1.18.4_2
libgsttranscoder-1.0.so.0 gst-plugins-bad1-1.18.4_2
libgstgl-1.0.so.0 gst-plugins-base1-1.14.0_1
libgnome-desktop-3.so.20 gnome-desktop-43.0_1
libgnome-desktop-4.so.2 gnome-desktop-43.0_1

0
srcpkgs/libwebkit2gtk50 → srcpkgs/libwebkitgtk60
View File

0
srcpkgs/libwebkit2gtk50-devel → srcpkgs/libwebkitgtk60-devel
View File

2
srcpkgs/removed-packages/template
View File

@ -303,6 +303,8 @@ replaces="
libunique1-devel<=1.1.6_12
libunique1<=1.1.6_12
libunique<=3.0.2_11
libwebkit2gtk50-devel<=2.38.1_2
libwebkit2gtk50<=2.38.1_2
libwnck2-devel<=2.30.7_8
libwnck2<=2.30.7_8
libxml2-python<=2.9.10_4

8
srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch
View File

@ -225,14 +225,6 @@ index 9acf304d..618b7b26 100644
sourceRows += source.bytesPerRow;
destinationRows += destination.bytesPerRow;
}
@@ -237,6 +373,7 @@ static void convertImagePixelsUnaccelerated(const ConstPixelBufferConversionView
void convertImagePixels(const ConstPixelBufferConversionView& source, const PixelBufferConversionView& destination, const IntSize& destinationSize)
{
// We don't currently support converting pixel data with non-8-bit buffers.
+ // BGRA8 is actually ARGB8 on BIG_ENDIAN.
ASSERT(source.format.pixelFormat == PixelFormat::RGBA8 || source.format.pixelFormat == PixelFormat::BGRA8);
ASSERT(destination.format.pixelFormat == PixelFormat::RGBA8 || destination.format.pixelFormat == PixelFormat::BGRA8);
diff --git a/Source/WebCore/platform/graphics/PixelFormat.h b/Source/WebCore/platform/graphics/PixelFormat.h
index 1ca711b8..4a7168f8 100644
--- a/Source/WebCore/platform/graphics/PixelFormat.h

6
srcpkgs/webkit2gtk/patches/be-typedarray.patch
View File

@ -165,9 +165,9 @@ diff --git a/Source/JavaScriptCore/runtime/JSGenericTypedArrayViewPrototypeFunct
index df0435f6..3017563c 100644
--- a/Source/JavaScriptCore/runtime/JSGenericTypedArrayViewPrototypeFunctions.h
+++ b/Source/JavaScriptCore/runtime/JSGenericTypedArrayViewPrototypeFunctions.h
@@ -351,9 +351,36 @@ ALWAYS_INLINE EncodedJSValue genericType
RELEASE_ASSERT(!thisObject->isDetached());
@@ -385,9 +385,36 @@ ALWAYS_INLINE EncodedJSValue genericType
size_t searchLength = std::min<size_t>(length, updatedLength);
if constexpr (ViewClass::Adaptor::isFloat) {
- if (std::isnan(static_cast<double>(*targetOption))) {
+ double targetOptionLittleEndianAsDouble;
@ -185,7 +185,7 @@ index df0435f6..3017563c 100644
+#endif
+
+ if (std::isnan(targetOptionLittleEndianAsDouble)) {
for (; index < length; ++index) {
for (; index < searchLength; ++index) {
- if (std::isnan(static_cast<double>(array[index])))
+ double arrayElementLittleEndianAsDouble;
+#if CPU(BIG_ENDIAN)

27
srcpkgs/webkit2gtk/patches/fix-cross-gir.patch
View File

@ -1,27 +0,0 @@
--- a/Source/cmake/FindGI.cmake
+++ b/Source/cmake/FindGI.cmake
@@ -262,6 +262,7 @@ function(GI_INTROSPECT namespace nsversi
foreach (dep IN LISTS opt_DEPENDENCIES)
if (TARGET "gir-${dep}")
get_property(dep_gir_path TARGET "gir-${dep}" PROPERTY GI_GIR_PATH)
+ get_property(dep_gir_lib TARGET "gir-${dep}" PROPERTY GI_GIR_LIBRARY)
if (dep_gir_path)
list(APPEND scanner_flags "--include-uninstalled=${dep_gir_path}")
list(APPEND gir_deps "${dep_gir_path}")
@@ -271,6 +272,9 @@ function(GI_INTROSPECT namespace nsversi
"been previously configured with GI_INTROSPECT()"
)
endif ()
+ if (dep_gir_lib)
+ list(APPEND scanner_flags "--library=${dep_gir_lib}")
+ endif ()
elseif (dep MATCHES "^([a-zA-Z0-9._-]+):([a-z0-9._\\+-]+)$")
list(APPEND scanner_flags
"--include=${CMAKE_MATCH_1}"
@@ -395,5 +399,6 @@ function(GI_INTROSPECT namespace nsversi
# Record in targets to use later on e.g. with gi-docgen.
set_property(TARGET "gir-${namespace}" PROPERTY GI_GIR_PATH "${gir_path}")
+ set_property(TARGET "gir-${namespace}" PROPERTY GI_GIR_LIBRARY "$<TARGET_FILE_BASE_NAME:${opt_TARGET}>")
set_property(TARGET "gir-${namespace}" PROPERTY GI_PACKAGE "${opt_PACKAGE}-${nsversion}")
endfunction()

23
srcpkgs/webkit2gtk/patches/initial-exec.patch Normal file
View File

@ -0,0 +1,23 @@
Source: https://bugs.webkit.org/show_bug.cgi?id=254286
Usage initial-exec TLS is incompatible with dlopen() on musl.
See also: https://gitlab.freedesktop.org/mesa/mesa/-/commit/8570a2a280587a1e43ac11ad46ad62dfdd6c7b39
.../platform/graphics/gbm/GraphicsContextGLANGLELinux.cpp | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
--- a/Source/WebCore/platform/graphics/gbm/GraphicsContextGLANGLELinux.cpp
+++ a/Source/WebCore/platform/graphics/gbm/GraphicsContextGLANGLELinux.cpp
@@ -108,7 +108,11 @@ RefPtr<PixelBuffer> GraphicsContextGLANGLE::readCompositedResults()
bool GraphicsContextGLANGLE::makeContextCurrent()
{
- static thread_local TLS_MODEL_INITIAL_EXEC GraphicsContextGLANGLE* s_currentContext { nullptr };
+ #ifdef __GLIBC__
+ static thread_local TLS_MODEL_INITIAL_EXEC GraphicsContextGLANGLE* s_currentContext { nullptr };
+ #else
+ static thread_local GraphicsContextGLANGLE* s_currentContext { nullptr };
+ #endif
if (s_currentContext == this)
return true;
--

54
srcpkgs/webkit2gtk/template
View File

@ -1,6 +1,6 @@
# Template file for 'webkit2gtk'
pkgname=webkit2gtk
version=2.38.3
version=2.40.0
revision=1
build_style=cmake
build_helper="gir"
@ -19,25 +19,25 @@ configure_args="-DPORT=GTK -DUSE_LD_GOLD=OFF
# Don't remove which from hostmakedepends
# Otherwise, they invoke /usr/bin/ccache /usr/lib/ccache/bin/$CC
hostmakedepends="perl python3 pkg-config gperf flex ruby gettext glib-devel
geoclue2 libharfbuzz which libpsl $(vopt_if gtk_doc 'gi-docgen')
geoclue2 libharfbuzz which libpsl unifdef $(vopt_if gtk_doc 'gi-docgen')
$(vopt_if wayland 'wayland-devel libxml2-devel')"
makedepends="at-spi2-core-devel libjpeg-turbo-devel libpng-devel
harfbuzz-devel gst-plugins-base1-devel gst-plugins-bad1-devel sqlite-devel
libsoup-devel libsoup3-devel libxslt-devel gnutls-devel icu-devel enchant2-devel
dbus-glib-devel libwebp-devel gtk+3-devel gtk4-devel libgudev-devel
libsecret-devel ruby-devel geoclue2-devel libnotify-devel hyphen-devel
woff2-devel freetype-devel libopenjpeg2-devel libatomic-devel
woff2-devel freetype-devel libopenjpeg2-devel libatomic-devel libavif-devel
qt5-devel libmanette-devel libwpe-devel wpebackend-fdo-devel
libgcrypt-devel libnuspell-devel libpsl-devel $(vopt_if x11 libXt-devel)
$(vopt_if wayland 'MesaLib-devel libxkbcommon-devel wayland-devel wayland-protocols')"
depends="gst-plugins-good1"
short_desc="GTK+3 port of the WebKit2 browser engine"
short_desc="GTK+3 port of the WebKit browser engine"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later, BSD-2-Clause"
homepage="https://webkitgtk.org/"
distfiles="https://webkitgtk.org/releases/webkitgtk-${version}.tar.xz"
checksum=41f001d1ed448c6936b394a9f20e4640eebf83a7f08262df28504f7410604a5a
make_check=no
checksum=a4607ea1bf89669e89b1cb2c63faaec513f93de09b6ae60cc71d6a8aab7ab393
make_check=no # TODO
replaces="webkit2gtk-common>0"
@ -109,6 +109,14 @@ case "$XBPS_TARGET_MACHINE" in
;;
esac
case "$XBPS_TARGET_MACHINE" in
armv6*)
# Disable ANGLE on armv6 for now.
# Requires support for lock-free atomics (armv6k+).
configure_args+=" -DENABLE_WEBGL=OFF"
;;
esac
# extra validation
if [ "$build_option_sampling_profiler" -a -z "$build_option_jit" ]; then
broken="sampling_profiler requires JIT"
@ -185,7 +193,7 @@ webkit2gtk-devel_package() {
libwebkit2gtk41_package() {
depends="${depends}"
short_desc="GTK+3 port of the WebKit2 browser engine (soup3)"
short_desc="GTK+3 port of the WebKit browser engine (soup3)"
pkg_install() {
vmove usr/bin/WebKitWebDriver
vmove usr/libexec/webkit2gtk-4.1
@ -205,7 +213,7 @@ libwebkit2gtk41_package() {
libwebkit2gtk41-devel_package() {
depends="gtk+3-devel libsoup3-devel libwebkit2gtk41>=${version}_${revision}"
short_desc="GTK+3 port of the WebKit2 browser engine (soup3) - development files"
short_desc="GTK+3 port of the WebKit browser engine (soup3) - development files"
pkg_install() {
vmove usr/include/webkitgtk-4.1
vmove "usr/lib/pkgconfig/*-4.1.pc"
@ -219,17 +227,17 @@ libwebkit2gtk41-devel_package() {
}
}
libwebkit2gtk50_package() {
libwebkitgtk60_package() {
depends="${depends}"
short_desc="GTK4 port of the WebKit2 browser engine"
short_desc="GTK4 port of the WebKit browser engine"
pkg_install() {
vmove usr/libexec/webkit2gtk-5.0
vmove usr/lib/webkit2gtk-5.0
vmove usr/libexec/webkitgtk-6.0
vmove usr/lib/webkitgtk-6.0
if [ "$build_option_gir" ]; then
vmove "usr/lib/girepository-1.0/*-5.0.typelib"
vmove "usr/lib/girepository-1.0/*-6.0.typelib"
fi
vmove "usr/lib/*-5.0.so.*"
for file in $(find ${DESTDIR}/usr/share/locale -name "*-5.0.mo"); do
vmove "usr/lib/*-6.0.so.*"
for file in $(find ${DESTDIR}/usr/share/locale -name "*-6.0.mo"); do
vmove ${file/$DESTDIR/}
done
vlicense Source/WebCore/LICENSE-APPLE
@ -238,18 +246,18 @@ libwebkit2gtk50_package() {
}
}
libwebkit2gtk50-devel_package() {
depends="gtk4-devel libsoup3-devel libwebkit2gtk50>=${version}_${revision}"
short_desc="GTK4 port of the WebKit2 browser engine - development files"
libwebkitgtk60-devel_package() {
depends="gtk4-devel libsoup3-devel libwebkitgtk60>=${version}_${revision}"
short_desc="GTK4 port of the WebKit browser engine - development files"
pkg_install() {
vmove usr/include/webkitgtk-5.0
vmove "usr/lib/pkgconfig/*-5.0.pc"
vmove usr/include/webkitgtk-6.0
vmove "usr/lib/pkgconfig/*-6.0.pc"
if [ "$build_option_gir" ]; then
vmove "usr/share/gir-1.0/*-5.0.gir"
vmove "usr/share/gir-1.0/*-6.0.gir"
fi
if [ "$build_option_gtk_doc" ]; then
vmove "usr/share/gtk-doc/html/*-5.0"
vmove "usr/share/gtk-doc/html/*-6.0"
fi
vmove "usr/lib/*-5.0.so"
vmove "usr/lib/*-6.0.so"
}
}