commit bb67b3170e42857b50eeceec2e6e0670ee4d5424 Author: Danny Rawlins <monster.romster@gmail.com> Date: Mon Dec 2 12:50:20 2019 +1100 webkitgtk: 2.26.1 -> 2.26.2 and fix for icu 65.x diff --git a/webkitgtk/.footprint b/webkitgtk/.footprint index 356269010..08f10f5d9 100644 --- a/webkitgtk/.footprint +++ b/webkitgtk/.footprint @@ -221,11 +221,11 @@ drwxr-xr-x root/root usr/lib/girepository-1.0/ -rw-r--r-- root/root usr/lib/girepository-1.0/WebKit2-4.0.typelib -rw-r--r-- root/root usr/lib/girepository-1.0/WebKit2WebExtension-4.0.typelib lrwxrwxrwx root/root usr/lib/libjavascriptcoregtk-4.0.so -> libjavascriptcoregtk-4.0.so.18 -lrwxrwxrwx root/root usr/lib/libjavascriptcoregtk-4.0.so.18 -> libjavascriptcoregtk-4.0.so.18.14.6 --rwxr-xr-x root/root usr/lib/libjavascriptcoregtk-4.0.so.18.14.6 +lrwxrwxrwx root/root usr/lib/libjavascriptcoregtk-4.0.so.18 -> libjavascriptcoregtk-4.0.so.18.14.7 +-rwxr-xr-x root/root usr/lib/libjavascriptcoregtk-4.0.so.18.14.7 lrwxrwxrwx root/root usr/lib/libwebkit2gtk-4.0.so -> libwebkit2gtk-4.0.so.37 -lrwxrwxrwx root/root usr/lib/libwebkit2gtk-4.0.so.37 -> libwebkit2gtk-4.0.so.37.39.2 --rwxr-xr-x root/root usr/lib/libwebkit2gtk-4.0.so.37.39.2 +lrwxrwxrwx root/root usr/lib/libwebkit2gtk-4.0.so.37 -> libwebkit2gtk-4.0.so.37.39.3 +-rwxr-xr-x root/root usr/lib/libwebkit2gtk-4.0.so.37.39.3 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/javascriptcoregtk-4.0.pc -rw-r--r-- root/root usr/lib/pkgconfig/webkit2gtk-4.0.pc diff --git a/webkitgtk/.signature b/webkitgtk/.signature index 3f0e4179d..8cae17c31 100644 --- a/webkitgtk/.signature +++ b/webkitgtk/.signature @@ -1,5 +1,6 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/cPko533w2icoFmeyCG0G9fsVI8tnJnNl7y8+YfnFY4o4AywNrJydQgklm/Aj7Dqu8UBUdFRm02vlM+tR3CrTw4= -SHA256 (Pkgfile) = 16808a103940f14d66656ef9f53bcf6048faefe4f42e573868c9f1a9da012aa3 -SHA256 (.footprint) = 549aa1ab5042353ec3fe5b1cc9e73248024a6f9052adb216e5faa7afd6b58b27 -SHA256 (webkitgtk-2.26.1.tar.xz) = 6b4b21801d2b1008422a1075dbd6fb4ae8b5127503faf657cf9671289d9cd155 +RWSE3ohX2g5d/bwa6YVkRXS5EDXRT7zoMd1UrrwEx5JPOmMoxDVOcehOVpmrybIwZ5xjNqsC8W+kI5Dlspm5DQXvgdI8AADIjwY= +SHA256 (Pkgfile) = 0bcd4d5aed75b4a929ebe7ec3fcbdf91a7fb372a38a9ff1d59cad3f6fbd5dabd +SHA256 (.footprint) = cf28b32af7454dc95724d5f2135014fc6ca76d7967aa1111d8abbbe306d4b72d +SHA256 (webkitgtk-2.26.2.tar.xz) = 6b80f0637a80818559ac8fd50db3b394f41cb61904fb9b3ed65fa51635806512 +SHA256 (icu65.patch) = 3acd85fecfca223e3fbf834e3be286ea29270689da994a758659abc8ed0a6635 diff --git a/webkitgtk/Pkgfile b/webkitgtk/Pkgfile index bb114918d..6d7e4777d 100644 --- a/webkitgtk/Pkgfile +++ b/webkitgtk/Pkgfile @@ -5,14 +5,17 @@ # Optional: enchant libnotify geoclue openjpeg2 name=webkitgtk -version=2.26.1 +version=2.26.2 release=1 -source=(https://webkitgtk.org/releases/$name-$version.tar.xz) +source=(https://webkitgtk.org/releases/$name-$version.tar.xz + icu65.patch) build() { mkdir build cd $name-$version + patch -p1 -i $SRC/icu65.patch + # setting CC and CXX breaks compilation prt-get isinst ccache && PKGMK_WEBKITGTK+=' -DCMAKE_CXX_COMPILER_LAUNCHER=ccache' && \ PATH="$(echo ${PATH} | awk -v RS=: -v ORS=: '/ccache/ {next} {print}' | sed 's/:*$//')" diff --git a/webkitgtk/icu65.patch b/webkitgtk/icu65.patch new file mode 100644 index 000000000..e1d7f8a2d --- /dev/null +++ b/webkitgtk/icu65.patch @@ -0,0 +1,39 @@ +diff -urN webkitgtk-2.26.1.orig/Source/WebCore/dom/Document.cpp webkitgtk-2.26.1/Source/WebCore/dom/Document.cpp +--- webkitgtk-2.26.1.orig/Source/WebCore/dom/Document.cpp 2019-09-02 11:41:47.000000000 +0200 ++++ webkitgtk-2.26.1/Source/WebCore/dom/Document.cpp 2019-10-08 16:24:57.649551493 +0200 +@@ -4944,12 +4944,12 @@ + unsigned i = 0; + + UChar32 c; +- U16_NEXT(characters, i, length, c) ++ U16_NEXT(characters, i, length, c); + if (!isValidNameStart(c)) + return false; + + while (i < length) { +- U16_NEXT(characters, i, length, c) ++ U16_NEXT(characters, i, length, c); + if (!isValidNamePart(c)) + return false; + } +@@ -5009,7 +5009,7 @@ + + for (unsigned i = 0; i < length; ) { + UChar32 c; +- U16_NEXT(qualifiedName, i, length, c) ++ U16_NEXT(qualifiedName, i, length, c); + if (c == ':') { + if (sawColon) + return Exception { InvalidCharacterError }; +diff -urN webkitgtk-2.26.1.orig/Source/WTF/wtf/URLHelpers.cpp webkitgtk-2.26.1/Source/WTF/wtf/URLHelpers.cpp +--- webkitgtk-2.26.1.orig/Source/WTF/wtf/URLHelpers.cpp 2019-08-28 13:46:29.000000000 +0200 ++++ webkitgtk-2.26.1/Source/WTF/wtf/URLHelpers.cpp 2019-10-08 16:24:50.619850993 +0200 +@@ -301,7 +301,7 @@ + Optional<UChar32> previousCodePoint; + while (i < length) { + UChar32 c; +- U16_NEXT(buffer, i, length, c) ++ U16_NEXT(buffer, i, length, c); + UErrorCode error = U_ZERO_ERROR; + UScriptCode script = uscript_getScript(c, &error); + if (error != U_ZERO_ERROR) {