diff --git a/srcpkgs/libwebkit2gtk41/patches/prefer-pthread.patch b/srcpkgs/libwebkit2gtk41/patches/prefer-pthread.patch deleted file mode 100644 index cb144f6dbb57f5..00000000000000 --- a/srcpkgs/libwebkit2gtk41/patches/prefer-pthread.patch +++ /dev/null @@ -1,28 +0,0 @@ -From: Alberto Garcia -Description: Enable THREADS_PREFER_PTHREAD_FLAG - This fixes a FTBFS in riscv64 -Bug: https://bugs.webkit.org/show_bug.cgi?id=182622 -Bug-Debian: https://bugs.debian.org/895969 -Origin: https://trac.webkit.org/changeset/231843 -Index: webkitgtk/Source/cmake/OptionsGTK.cmake -=================================================================== ---- webkitgtk.orig/Source/cmake/OptionsGTK.cmake -+++ webkitgtk/Source/cmake/OptionsGTK.cmake -@@ -13,6 +13,8 @@ endif () - - set(USER_AGENT_BRANDING "" CACHE STRING "Branding to add to user agent string") - -+set(THREADS_PREFER_PTHREAD_FLAG ON) -+ - find_package(Cairo 1.16.0 REQUIRED) - find_package(Fontconfig 2.13.0 REQUIRED) - find_package(Freetype 2.9.0 REQUIRED) -Index: webkitgtk/Source/cmake/OptionsJSCOnly.cmake -=================================================================== ---- webkitgtk.orig/Source/cmake/OptionsJSCOnly.cmake -+++ webkitgtk/Source/cmake/OptionsJSCOnly.cmake -@@ -1,3 +1,4 @@ -+set(THREADS_PREFER_PTHREAD_FLAG ON) - find_package(Threads REQUIRED) - - if (MSVC) diff --git a/srcpkgs/libwebkit2gtk41/patches/reproducible.patch b/srcpkgs/libwebkit2gtk41/patches/reproducible.patch index 442b7d2a6aef47..5725c800fd81b8 100644 --- a/srcpkgs/libwebkit2gtk41/patches/reproducible.patch +++ b/srcpkgs/libwebkit2gtk41/patches/reproducible.patch @@ -5,23 +5,23 @@ Date: Wed Jan 5 17:50:07 2022 +0100 reproducible build diff --git a/Source/WebCore/bindings/scripts/CodeGenerator.pm b/Source/WebCore/bindings/scripts/CodeGenerator.pm -index 1e95784b..eb642a52 100644 +index 7efc84a8..962261fa 100644 --- a/Source/WebCore/bindings/scripts/CodeGenerator.pm +++ b/Source/WebCore/bindings/scripts/CodeGenerator.pm -@@ -324,7 +324,7 @@ sub MergeExtendedAttributesFromSupplemental +@@ -325,7 +325,7 @@ sub MergeExtendedAttributesFromSupplemental { my ($object, $supplementalExtendedAttributes, $property, $context) = @_; - + - foreach my $extendedAttributeName (keys %{$supplementalExtendedAttributes}) { + foreach my $extendedAttributeName (sort keys %{$supplementalExtendedAttributes}) { my $isAllowed = 0; for my $contextAllowed (@{$idlAttributes->{$extendedAttributeName}->{"contextsAllowed"}}) { if ($contextAllowed eq $context) { diff --git a/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm b/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm -index 275fce91..8c1534be 100644 +index 520eeef6..fcc0b6ee 100644 --- a/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm +++ b/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm -@@ -3217,7 +3217,7 @@ sub GenerateHeader +@@ -3431,7 +3431,7 @@ sub GenerateHeader } else { push(@headerContent, " static constexpr unsigned StructureFlags = Base::StructureFlags"); } @@ -30,34 +30,34 @@ index 275fce91..8c1534be 100644 push(@headerContent, " | " . $structureFlag); } push(@headerContent, ";\n"); -@@ -7515,7 +7515,7 @@ sub WriteData - +@@ -8041,7 +8041,7 @@ sub WriteData + my @includes = (); my %implIncludeConditions = (); - foreach my $include (keys %implIncludes) { + foreach my $include (sort keys %implIncludes) { next if $headerIncludes{$include}; next if $headerTrailingIncludes{$include}; - -@@ -7555,7 +7555,7 @@ sub WriteData + +@@ -8084,7 +8084,7 @@ sub WriteData $contents = join "", @headerContentHeader; - + @includes = (); - foreach my $include (keys %headerIncludes) { + foreach my $include (sort keys %headerIncludes) { $include = "\"$include\"" unless $include =~ /^["<]/; # " $include = SubstituteHeader($include); push @includes, $include; -@@ -7569,7 +7569,7 @@ sub WriteData +@@ -8098,7 +8098,7 @@ sub WriteData $contents .= join "", @headerContent; - + @includes = (); - foreach my $include (keys %headerTrailingIncludes) { + foreach my $include (sort keys %headerTrailingIncludes) { $include = "\"$include\"" unless $include =~ /^["<]/; # " push @includes, $include; } -@@ -7642,7 +7642,7 @@ sub GeneratePrototypeDeclaration +@@ -8171,7 +8171,7 @@ sub GeneratePrototypeDeclaration if (%structureFlags) { push(@$outputArray, "public:\n"); push(@$outputArray, " static constexpr unsigned StructureFlags = Base::StructureFlags"); diff --git a/srcpkgs/libwebkit2gtk41/template b/srcpkgs/libwebkit2gtk41/template index c6762f8089f4c4..cd6eed6bc3f1ee 100644 --- a/srcpkgs/libwebkit2gtk41/template +++ b/srcpkgs/libwebkit2gtk41/template @@ -1,6 +1,6 @@ # Template file for 'libwebkit2gtk41' pkgname=libwebkit2gtk41 -version=2.46.6 +version=2.50.4 revision=1 build_style=cmake build_helper="gir" @@ -16,7 +16,8 @@ configure_args="-DPORT=GTK -DENABLE_X11_TARGET=$(vopt_if x11 ON OFF) -DENABLE_SAMPLING_PROFILER=$(vopt_if sampling_profiler ON OFF) -DENABLE_BUBBLEWRAP_SANDBOX=$(vopt_if bubblewrap ON OFF) - -DUSE_JPEGXL=OFF -DUSE_LIBBACKTRACE=OFF -DUSE_GTK4=OFF" + -DUSE_JPEGXL=OFF -DUSE_LIBBACKTRACE=OFF -DUSE_GTK4=OFF + -DENABLE_WEBASSEMBLY=OFF -DENABLE_FTL_JIT=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 @@ -28,7 +29,7 @@ makedepends="at-spi2-core-devel libjpeg-turbo-devel libpng-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 libavif-devel qt5-devel libmanette-devel sysprof-devel - libgcrypt-devel libnuspell-devel libpsl-devel $(vopt_if x11 libXt-devel) + libgcrypt-devel libnuspell-devel libpsl-devel flite-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 WebKit browser engine (soup3)" @@ -36,7 +37,7 @@ maintainer="Orphaned " license="LGPL-2.1-or-later, BSD-2-Clause" homepage="https://webkitgtk.org/" distfiles="https://webkitgtk.org/releases/webkitgtk-${version}.tar.xz" -checksum=f2b31de693220ba9bab76ce6ddfe5b0bfab2515cb2b0a70f3c54d4050766c32b +checksum=d3bfa473845acfab72635bada5e0d134fda6792c5b95c5c5cd141b46125bd8e4 make_check=no # TODO build_options="gir wayland x11 bubblewrap jit sampling_profiler minibrowser