diff options
| author | Freemor <freemor@freemor.ca> | 2019-11-26 09:14:17 -0400 |
|---|---|---|
| committer | Freemor <freemor@freemor.ca> | 2019-11-26 09:14:17 -0400 |
| commit | ae26e87581990abcfaf87a9882bc524581efb009 (patch) | |
| tree | 0e483260588cc24dac0cc25e2bd2db848add3ba8 /nonprism | |
| parent | bc2e4696e88187481e39eff37e61f4542fb7e431 (diff) | |
Rebuild [nonprism/webkit2gtk] against new icu
Diffstat (limited to 'nonprism')
| -rw-r--r-- | nonprism/webkit2gtk/PKGBUILD | 10 | ||||
| -rw-r--r-- | nonprism/webkit2gtk/icu65.patch | 39 |
2 files changed, 44 insertions, 5 deletions
diff --git a/nonprism/webkit2gtk/PKGBUILD b/nonprism/webkit2gtk/PKGBUILD index 0e12bfd67..2e0416d6d 100644 --- a/nonprism/webkit2gtk/PKGBUILD +++ b/nonprism/webkit2gtk/PKGBUILD @@ -28,9 +28,11 @@ optdepends=('gst-plugins-base: free media decoding' 'gst-plugins-good: media decoding' 'gst-plugins-bad: media decoding' 'gst-libav: nonfree media decoding') -source=(https://webkitgtk.org/releases/webkitgtk-${pkgver}.tar.xz{,.asc}) +source=(https://webkitgtk.org/releases/webkitgtk-${pkgver}.tar.xz{,.asc} + icu65.patch) sha256sums=('6b80f0637a80818559ac8fd50db3b394f41cb61904fb9b3ed65fa51635806512' - 'SKIP') + 'SKIP' + '3acd85fecfca223e3fbf834e3be286ea29270689da994a758659abc8ed0a6635') validpgpkeys=('D7FCF61CF9A2DEAB31D81BD3F3D322D0EC4582C3' '5AA3BC334FD7E3369E7C77B291C559DBE4C9123B') @@ -63,9 +65,7 @@ eval "$( prepare() { cd webkitgtk-$pkgver - - - + patch -Np1 -i ../icu65.patch # from PLD Linux } build() { diff --git a/nonprism/webkit2gtk/icu65.patch b/nonprism/webkit2gtk/icu65.patch new file mode 100644 index 000000000..e1d7f8a2d --- /dev/null +++ b/nonprism/webkit2gtk/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) { |