diff options
Diffstat (limited to 'extra')
| -rwxr-xr-x | extra/webkit2gtk/build | 21 | ||||
| -rw-r--r-- | extra/webkit2gtk/checksums | 3 | ||||
| -rw-r--r-- | extra/webkit2gtk/depends | 1 | ||||
| -rw-r--r-- | extra/webkit2gtk/patches/icu-69.patch | 24 | ||||
| -rw-r--r-- | extra/webkit2gtk/sources | 3 | ||||
| -rw-r--r-- | extra/webkit2gtk/version | 2 |
6 files changed, 37 insertions, 17 deletions
diff --git a/extra/webkit2gtk/build b/extra/webkit2gtk/build index b8342697..86523692 100755 --- a/extra/webkit2gtk/build +++ b/extra/webkit2gtk/build @@ -6,9 +6,6 @@ sed_i() { cat _ > "$file"; rm -f _ } -# Enable streaming related options if gstreamer is installed. -cpt-list gst-plugins-base >/dev/null 2>&1 && streaming=ON - # Enable the use of openjpeg if the package is installed. cpt-list openjpeg2 >/dev/null 2>&1 && jpeg=ON @@ -16,6 +13,7 @@ cpt-list openjpeg2 >/dev/null 2>&1 && jpeg=ON 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 @@ -26,14 +24,14 @@ sed_i '/^GETTEXT_C/d' Source/WebCore/platform/gtk/po/CMakeLists.txt sed -i '/LC_ALL/d' Source/JavaScriptCore/jsc.cpp sed -i '/WTFLogAlways/d' Source/JavaScriptCore/jsc.cpp -# Fix the latest icu build. -printf 'add_compile_definitions("U_DEFINE_FALSE_AND_TRUE=1")\n' \ - >> Source/WTF/wtf/CMakeLists.txt - export DESTDIR="$1" +# Webkit's CMake configuration forces color output using clang-specific flags +# when using Ninja as the CMAKE_GENERATOR. We should disable them. +sed_i s,-fcolor-diagnostics,, Source/cmake/WebKitCompilerFlags.cmake + cmake -B build \ - -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_BUILD_TYPE=MinSizeRel \ -DCMAKE_INSTALL_PREFIX=/usr \ -DLIB_INSTALL_DIR=/usr/lib \ -DPORT=GTK \ @@ -42,14 +40,9 @@ cmake -B build \ -DENABLE_SAMPLING_PROFILER=OFF \ -DENABLE_GEOLOCATION=OFF \ -DENABLE_GLES2=ON \ - -DENABLE_INTL=OFF \ -DENABLE_INTROSPECTION=OFF \ -DENABLE_MINIBROWSER=OFF \ - -DENABLE_OPENGL=OFF \ -DENABLE_SPELLCHECK=OFF \ - -DENABLE_VIDEO=${streaming:-OFF} \ - -DENABLE_WEBGL=OFF \ - -DENABLE_WEB_AUDIO=${streaming:-OFF} \ -DUSE_LIBHYPHEN=OFF \ -DUSE_LIBNOTIFY=OFF \ -DUSE_LIBSECRET=OFF \ @@ -58,8 +51,8 @@ cmake -B build \ -DUSE_WOFF2=OFF \ -DUSE_WPE_RENDERER=OFF \ -DENABLE_WEB_CRYPTO=${libtasn:-OFF} \ - -DENABLE_MEDIASOURCE=${streaming:-OFF} \ -DENABLE_WAYLAND_TARGET=OFF \ + -DENABLE_GAMEPAD=OFF \ -Wno-dev cmake --build build diff --git a/extra/webkit2gtk/checksums b/extra/webkit2gtk/checksums index 6f63c260..55c7498e 100644 --- a/extra/webkit2gtk/checksums +++ b/extra/webkit2gtk/checksums @@ -1,2 +1,3 @@ -50736ec7a91770b5939d715196e5fe7209b93efcdeef425b24dc51fb8e9d7c1e webkitgtk-2.30.6.tar.xz +9d7df4dae9ada2394257565acc2a68ace9308c4c61c3fcc00111dc1f11076bf0 webkitgtk-2.32.0.tar.xz bca30f52651c0a890a7aa928d8524bfd22fab293761d022815f2226a13626ad1 fix-musl.patch +29366d63cee12838239c86ab6e20f0dfe4807e59b074cbf08fc87919636c00c9 icu-69.patch diff --git a/extra/webkit2gtk/depends b/extra/webkit2gtk/depends index 6bbf47ec..256bdcdb 100644 --- a/extra/webkit2gtk/depends +++ b/extra/webkit2gtk/depends @@ -2,6 +2,7 @@ cairo cmake make glib-networking gperf make +gst-plugins-base gtk+3 harfbuzz-icu libXslt diff --git a/extra/webkit2gtk/patches/icu-69.patch b/extra/webkit2gtk/patches/icu-69.patch new file mode 100644 index 00000000..b7950710 --- /dev/null +++ b/extra/webkit2gtk/patches/icu-69.patch @@ -0,0 +1,24 @@ +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<Vector<UChar>>::create(string.charactersWithoutNullTermination()); + + UErrorCode status = U_ZERO_ERROR; +- auto segmenter = std::unique_ptr<UBreakIterator, UBreakIteratorDeleter>(ubrk_safeClone(m_segmenter.get(), nullptr, nullptr, &status)); ++ auto segmenter = std::unique_ptr<UBreakIterator, UBreakIteratorDeleter>(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<UBreakIterator, UBreakIteratorDeleter>(ubrk_safeClone(m_segmenter.get(), nullptr, nullptr, &status)); ++ auto segmenter = std::unique_ptr<UBreakIterator, UBreakIteratorDeleter>(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 87dd46d4..621d3fe4 100644 --- a/extra/webkit2gtk/sources +++ b/extra/webkit2gtk/sources @@ -1,2 +1,3 @@ -https://webkitgtk.org/releases/webkitgtk-2.30.6.tar.xz +https://webkitgtk.org/releases/webkitgtk-2.32.0.tar.xz patches/fix-musl.patch +patches/icu-69.patch diff --git a/extra/webkit2gtk/version b/extra/webkit2gtk/version index e016b50b..e10fdcb0 100644 --- a/extra/webkit2gtk/version +++ b/extra/webkit2gtk/version @@ -1 +1 @@ -2.30.6 1 +2.32.0 1 |