webkit2gtk: bump to 2.40.1

5 files changed, 32 insertions, 7 deletions

diff --git a/extra/webkit2gtk/build b/extra/webkit2gtk/build
index 17aa7455..5a890fda 100755
--- a/extra/webkit2gtk/build
+++ b/extra/webkit2gtk/build
@@ -1,11 +1,16 @@
 #!/bin/sh -e
 
+# Fix build of SourceBrush.cpp
+patch -p1 < fix-sourcebrush.patch
+
 make -C unifdef
 
 # Remove gettext requirement.
-clsed 's/ngettext/printf/g' Tools/MiniBrowser/gtk/BrowserDownloadsBar.c
-clsed '/po_files \*\.po/d'  Source/WebCore/platform/gtk/po/CMakeLists.txt
-clsed '/^GETTEXT_C/d'       Source/WebCore/platform/gtk/po/CMakeLists.txt
+clsed 's/ngettext/printf/g'           Tools/MiniBrowser/gtk/BrowserDownloadsBar.c
+clsed '/po_files \*\.po/d'            Source/WebCore/platform/gtk/po/CMakeLists.txt
+clsed '/if.*GETTEXT_FOUND/,/^endif/d' Source/WebCore/platform/gtk/po/CMakeLists.txt
+clsed '/^GETTEXT_C/d'                 Source/WebCore/platform/gtk/po/CMakeLists.txt
+                            
 
 # Fix clang build.
 clsed '/LC_ALL/d'       Source/JavaScriptCore/jsc.cpp
@@ -48,5 +53,5 @@ cmake -B build \
     -DUSE_WPE_RENDERER=OFF \
     -Wno-dev
 
-cmake --build   build
+SAMUFLAGS='-j4' cmake --build   build
 cmake --install build
diff --git a/extra/webkit2gtk/checksums b/extra/webkit2gtk/checksums
index a5ee9c30..89314f68 100644
--- a/extra/webkit2gtk/checksums
+++ b/extra/webkit2gtk/checksums
@@ -1,3 +1,4 @@
 %BLAKE3
-d674c527125ed44b6c6ddad54578468cbe7a6d4c0524af2a4ba264c08747824c  webkitgtk-2.40.0.tar.xz
+f215eed5d3b8602c0c5ba99ba1fa7a8b3728c4d6f29a01289622f7c7a7fdc7d1  webkitgtk-2.40.1.tar.xz
 c55349ab244ae3705c566107426f61d9b7ffdbb9fd99261986f8d54867628bcc  unifdef-2.12.tar.xz
+12ba5568faa965129017c036882e70f05e47eda17a13c6d832dddd13cee1a340  fix-sourcebrush.patch
diff --git a/extra/webkit2gtk/patches/fix-sourcebrush.patch b/extra/webkit2gtk/patches/fix-sourcebrush.patch
new file mode 100644
index 00000000..c553d66e
--- /dev/null
+++ b/extra/webkit2gtk/patches/fix-sourcebrush.patch
@@ -0,0 +1,18 @@
+diff -ur a/Source/WebCore/platform/graphics/SourceBrush.cpp b/Source/WebCore/platform/graphics/SourceBrush.cpp
+--- a/Source/WebCore/platform/graphics/SourceBrush.cpp	Wed May 24 13:31:50 2023
++++ b/Source/WebCore/platform/graphics/SourceBrush.cpp	Wed May 24 13:31:24 2023
+@@ -65,12 +65,12 @@
+ 
+ void SourceBrush::setGradient(Ref<Gradient>&& gradient, const AffineTransform& spaceTransform)
+ {
+-    m_brush = { Brush::LogicalGradient { WTFMove(gradient), spaceTransform } };
++    m_brush = Brush { Brush::LogicalGradient { WTFMove(gradient), spaceTransform } };
+ }
+ 
+ void SourceBrush::setPattern(Ref<Pattern>&& pattern)
+ {
+-    m_brush = { Brush::Variant { std::in_place_type<Ref<Pattern>>, WTFMove(pattern) } };
++    m_brush = Brush { Brush::Variant { std::in_place_type<Ref<Pattern>>, WTFMove(pattern) } };
+ }
+ 
+ WTF::TextStream& operator<<(TextStream& ts, const SourceBrush& brush)
diff --git a/extra/webkit2gtk/sources b/extra/webkit2gtk/sources
index 754b395e..09868ce3 100644
--- a/extra/webkit2gtk/sources
+++ b/extra/webkit2gtk/sources
@@ -1,2 +1,3 @@
-https://webkitgtk.org/releases/webkitgtk-2.40.0.tar.xz
+https://webkitgtk.org/releases/webkitgtk-2.40.1.tar.xz
 https://dotat.at/prog/unifdef/unifdef-2.12.tar.xz unifdef
+patches/fix-sourcebrush.patch
diff --git a/extra/webkit2gtk/version b/extra/webkit2gtk/version
index 4ce29de9..3fb476cf 100644
--- a/extra/webkit2gtk/version
+++ b/extra/webkit2gtk/version
@@ -1 +1 @@
-2.40.0 1
+2.40.1 1