From 95e176f842a89b38fd00fb23642cd0362b5316e6 Mon Sep 17 00:00:00 2001 From: Cem Keylan Date: Wed, 12 May 2021 19:49:52 +0300 Subject: webkit2gtk: bump to 2.32.1 --- extra/webkit2gtk/build | 3 -- extra/webkit2gtk/checksums | 4 +- extra/webkit2gtk/patches/fix-musl.patch | 85 --------------------------------- extra/webkit2gtk/patches/icu-69.patch | 24 ---------- extra/webkit2gtk/sources | 4 +- extra/webkit2gtk/version | 2 +- 6 files changed, 3 insertions(+), 119 deletions(-) delete mode 100644 extra/webkit2gtk/patches/fix-musl.patch delete mode 100644 extra/webkit2gtk/patches/icu-69.patch (limited to 'extra') diff --git a/extra/webkit2gtk/build b/extra/webkit2gtk/build index df726ff0..ffbbe15f 100755 --- a/extra/webkit2gtk/build +++ b/extra/webkit2gtk/build @@ -12,9 +12,6 @@ cpt-list openjpeg2 >/dev/null 2>&1 && jpeg=ON # Enable webcrypto if libtasn1 is installed. cpt-list libtasn1 >/dev/null 2>&1 && libtasn=ON -patch -p1 < fix-musl.patch -patch -p1 < icu-69.patch - # Remove gettext requirement. sed_i 's/ngettext/printf/g' Tools/MiniBrowser/gtk/BrowserDownloadsBar.c sed_i '/po_files \*\.po/d' Source/WebCore/platform/gtk/po/CMakeLists.txt diff --git a/extra/webkit2gtk/checksums b/extra/webkit2gtk/checksums index 55c7498e..d5400acd 100644 --- a/extra/webkit2gtk/checksums +++ b/extra/webkit2gtk/checksums @@ -1,3 +1 @@ -9d7df4dae9ada2394257565acc2a68ace9308c4c61c3fcc00111dc1f11076bf0 webkitgtk-2.32.0.tar.xz -bca30f52651c0a890a7aa928d8524bfd22fab293761d022815f2226a13626ad1 fix-musl.patch -29366d63cee12838239c86ab6e20f0dfe4807e59b074cbf08fc87919636c00c9 icu-69.patch +136117317f70f66486f71b8edf5e46f8776403c5d8a296e914b11a36ef836917 webkitgtk-2.32.1.tar.xz diff --git a/extra/webkit2gtk/patches/fix-musl.patch b/extra/webkit2gtk/patches/fix-musl.patch deleted file mode 100644 index c58e6269..00000000 --- a/extra/webkit2gtk/patches/fix-musl.patch +++ /dev/null @@ -1,85 +0,0 @@ -diff -u -r a/Source/JavaScriptCore/runtime/MachineContext.h b/Source/JavaScriptCore/runtime/MachineContext.h ---- a/Source/JavaScriptCore/runtime/MachineContext.h 2020-08-12 12:17:53.000000000 +0300 -+++ b/Source/JavaScriptCore/runtime/MachineContext.h 2020-09-11 14:22:18.584077655 +0300 -@@ -196,7 +196,7 @@ - #error Unknown Architecture - #endif - --#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__) -+#elif OS(FUCHSIA) || defined(__linux__) - - #if CPU(X86) - return reinterpret_cast((uintptr_t&) machineContext.gregs[REG_ESP]); -@@ -347,7 +347,7 @@ - #error Unknown Architecture - #endif - --#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__) -+#elif OS(FUCHSIA) || defined(__linux__) - - // The following sequence depends on glibc's sys/ucontext.h. - #if CPU(X86) -@@ -498,7 +498,7 @@ - #error Unknown Architecture - #endif - --#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__) -+#elif OS(FUCHSIA) || defined(__linux__) - - // The following sequence depends on glibc's sys/ucontext.h. - #if CPU(X86) -@@ -656,7 +656,7 @@ - #error Unknown Architecture - #endif - --#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__) -+#elif OS(FUCHSIA) || defined(__linux__) - - // The following sequence depends on glibc's sys/ucontext.h. - #if CPU(X86) -@@ -773,7 +773,7 @@ - #error Unknown Architecture - #endif - --#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__) -+#elif OS(FUCHSIA) || defined(__linux__) - - // The following sequence depends on glibc's sys/ucontext.h. - #if CPU(X86) -diff -u -r a/Source/JavaScriptCore/runtime/OptionsList.h b/Source/JavaScriptCore/runtime/OptionsList.h ---- a/Source/JavaScriptCore/runtime/OptionsList.h 2020-08-12 12:17:53.000000000 +0300 -+++ b/Source/JavaScriptCore/runtime/OptionsList.h 2020-09-11 14:22:18.586077732 +0300 -@@ -90,9 +90,9 @@ - \ - v(Bool, reportMustSucceedExecutableAllocations, false, Normal, nullptr) \ - \ -- v(Unsigned, maxPerThreadStackUsage, 5 * MB, Normal, "Max allowed stack usage by the VM") \ -- v(Unsigned, softReservedZoneSize, 128 * KB, Normal, "A buffer greater than reservedZoneSize that reserves space for stringifying exceptions.") \ -- v(Unsigned, reservedZoneSize, 64 * KB, Normal, "The amount of stack space we guarantee to our clients (and to interal VM code that does not call out to clients).") \ -+ v(Unsigned, maxPerThreadStackUsage, 80 * KB , Normal, "Max allowed stack usage by the VM") \ -+ v(Unsigned, softReservedZoneSize, 32 * KB, Normal, "A buffer greater than reservedZoneSize that reserves space for stringifying exceptions.") \ -+ v(Unsigned, reservedZoneSize, 16 * KB, Normal, "The amount of stack space we guarantee to our clients (and to interal VM code that does not call out to clients).") \ - \ - v(Bool, crashOnDisallowedVMEntry, ASSERT_ENABLED, Normal, "Forces a crash if we attempt to enter the VM when disallowed") \ - v(Bool, crashIfCantAllocateJITMemory, false, Normal, nullptr) \ -diff -u -r a/Source/WebCore/xml/XPathGrammar.cpp b/Source/WebCore/xml/XPathGrammar.cpp ---- a/Source/WebCore/xml/XPathGrammar.cpp 2020-08-12 12:17:56.000000000 +0300 -+++ b/Source/WebCore/xml/XPathGrammar.cpp 2020-09-11 14:22:18.585077693 +0300 -@@ -966,7 +966,7 @@ - #if YYERROR_VERBOSE - - # ifndef yystrlen --# if defined __GLIBC__ && defined _STRING_H -+# if defined __linux__ && defined _STRING_H - # define yystrlen strlen - # else - /* Return the length of YYSTR. */ -@@ -989,7 +989,7 @@ - # endif - - # ifndef yystpcpy --# if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE -+# if defined __linux__ && defined _STRING_H && defined _GNU_SOURCE - # define yystpcpy stpcpy - # else - /* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in diff --git a/extra/webkit2gtk/patches/icu-69.patch b/extra/webkit2gtk/patches/icu-69.patch deleted file mode 100644 index b7950710..00000000 --- a/extra/webkit2gtk/patches/icu-69.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -r -u webkit2gtk-orig/Source/JavaScriptCore/runtime/IntlSegmenter.cpp webkit2gtk/Source/JavaScriptCore/runtime/IntlSegmenter.cpp ---- webkit2gtk-orig/Source/JavaScriptCore/runtime/IntlSegmenter.cpp 2021-04-10 10:50:56.502202802 +0300 -+++ webkit2gtk/Source/JavaScriptCore/runtime/IntlSegmenter.cpp 2021-04-10 10:51:31.100166211 +0300 -@@ -125,7 +125,7 @@ - auto upconvertedCharacters = Box>::create(string.charactersWithoutNullTermination()); - - UErrorCode status = U_ZERO_ERROR; -- auto segmenter = std::unique_ptr(ubrk_safeClone(m_segmenter.get(), nullptr, nullptr, &status)); -+ auto segmenter = std::unique_ptr(ubrk_clone(m_segmenter.get(), &status)); - if (U_FAILURE(status)) { - throwTypeError(globalObject, scope, "failed to initialize Segments"_s); - return { }; -diff -r -u webkit2gtk-orig/Source/JavaScriptCore/runtime/IntlSegments.cpp webkit2gtk/Source/JavaScriptCore/runtime/IntlSegments.cpp ---- webkit2gtk-orig/Source/JavaScriptCore/runtime/IntlSegments.cpp 2021-04-10 10:50:56.499202805 +0300 -+++ webkit2gtk/Source/JavaScriptCore/runtime/IntlSegments.cpp 2021-04-10 10:51:55.974141629 +0300 -@@ -100,7 +100,7 @@ - auto scope = DECLARE_THROW_SCOPE(vm); - - UErrorCode status = U_ZERO_ERROR; -- auto segmenter = std::unique_ptr(ubrk_safeClone(m_segmenter.get(), nullptr, nullptr, &status)); -+ auto segmenter = std::unique_ptr(ubrk_clone(m_segmenter.get(), &status)); - if (U_FAILURE(status)) { - throwTypeError(globalObject, scope, "failed to initialize SegmentIterator"_s); - return nullptr; diff --git a/extra/webkit2gtk/sources b/extra/webkit2gtk/sources index 621d3fe4..44800c4a 100644 --- a/extra/webkit2gtk/sources +++ b/extra/webkit2gtk/sources @@ -1,3 +1 @@ -https://webkitgtk.org/releases/webkitgtk-2.32.0.tar.xz -patches/fix-musl.patch -patches/icu-69.patch +https://webkitgtk.org/releases/webkitgtk-2.32.1.tar.xz diff --git a/extra/webkit2gtk/version b/extra/webkit2gtk/version index e10fdcb0..0bada59d 100644 --- a/extra/webkit2gtk/version +++ b/extra/webkit2gtk/version @@ -1 +1 @@ -2.32.0 1 +2.32.1 1 -- cgit v1.2.3