diff options
| -rwxr-xr-x | extra/webkit2gtk/build | 5 | ||||
| -rw-r--r-- | extra/webkit2gtk/checksums | 3 | ||||
| -rw-r--r-- | extra/webkit2gtk/patches/fix-sourcebrush.patch | 18 | ||||
| -rw-r--r-- | extra/webkit2gtk/sources | 3 | ||||
| -rw-r--r-- | extra/webkit2gtk/version | 2 |
5 files changed, 4 insertions, 27 deletions
diff --git a/extra/webkit2gtk/build b/extra/webkit2gtk/build index 5a890fda..c9612ab4 100755 --- a/extra/webkit2gtk/build +++ b/extra/webkit2gtk/build @@ -1,8 +1,5 @@ #!/bin/sh -e -# Fix build of SourceBrush.cpp -patch -p1 < fix-sourcebrush.patch - make -C unifdef # Remove gettext requirement. @@ -53,5 +50,5 @@ cmake -B build \ -DUSE_WPE_RENDERER=OFF \ -Wno-dev -SAMUFLAGS='-j4' cmake --build build +cmake --build build cmake --install build diff --git a/extra/webkit2gtk/checksums b/extra/webkit2gtk/checksums index 89314f68..6fe3be2e 100644 --- a/extra/webkit2gtk/checksums +++ b/extra/webkit2gtk/checksums @@ -1,4 +1,3 @@ %BLAKE3 -f215eed5d3b8602c0c5ba99ba1fa7a8b3728c4d6f29a01289622f7c7a7fdc7d1 webkitgtk-2.40.1.tar.xz +16fee70c59383ad8838a8626b89444b03d38e8e936c092b690095a55d4cee8fb webkitgtk-2.40.3.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 deleted file mode 100644 index c553d66e..00000000 --- a/extra/webkit2gtk/patches/fix-sourcebrush.patch +++ /dev/null @@ -1,18 +0,0 @@ -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 09868ce3..73831376 100644 --- a/extra/webkit2gtk/sources +++ b/extra/webkit2gtk/sources @@ -1,3 +1,2 @@ -https://webkitgtk.org/releases/webkitgtk-2.40.1.tar.xz +https://webkitgtk.org/releases/webkitgtk-2.40.3.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 3fb476cf..fa7f38a4 100644 --- a/extra/webkit2gtk/version +++ b/extra/webkit2gtk/version @@ -1 +1 @@ -2.40.1 1 +2.40.3 1 |