diff options
| author |   Patrick J Volkerding <volkerdi@slackware.com> | 2020-03-16 21:20:17 +0000 |
|---|---|---|
| committer |   Eric Hameleers <alien@slackware.com> | 2020-03-17 08:59:49 +0100 |
| commit | 25ffb4a7fabc3abd1b884fe0201185705f24ef5b (patch) | |
| tree | 5cd58f7aa38a3aff19afe5aaba5e93d94d05d235 /source/l | |
| parent | 3b63d76134a464753266183e4f968c8b66f04fee (diff) | |
| download | current-25ffb4a7fabc3abd1b884fe0201185705f24ef5b.tar.gz current-25ffb4a7fabc3abd1b884fe0201185705f24ef5b.tar.xz | |
Mon Mar 16 21:20:17 UTC 202020200316212017
a/kernel-firmware-20200316_8eb0b28-noarch-1.txz: Upgraded.
l/imagemagick-7.0.10_1-x86_64-1.txz: Upgraded.
l/qt5-webkit-5.212.0_alpha4-x86_64-1.txz: Upgraded.
n/libqmi-1.24.8-x86_64-1.txz: Upgraded.
n/postfix-3.5.0-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/l')
| -rw-r--r-- | source/l/qt5-webkit/patches/qt5-webkit.icu65.patch | 47 | ||||
| -rwxr-xr-x | source/l/qt5-webkit/qt5-webkit.SlackBuild | 5 |
2 files changed, 1 insertions, 51 deletions
diff --git a/source/l/qt5-webkit/patches/qt5-webkit.icu65.patch b/source/l/qt5-webkit/patches/qt5-webkit.icu65.patch deleted file mode 100644 index fe27d249b..000000000 --- a/source/l/qt5-webkit/patches/qt5-webkit.icu65.patch +++ /dev/null @@ -1,47 +0,0 @@ -# ----------------------------------------------------------------------------- -# Patch obtained from FreeBSD: -# https://svnweb.freebsd.org/ports/head/www/qt5-webkit/files/patch-Source_WebCore_dom_Document.cpp?view=co -# ----------------------------------------------------------------------------- -Regressed by https://github.com/unicode-org/icu/commit/480bec3ea652 - -In file included from Source/WebCore/dom/DOMAllInOne.cpp:67: -Source/WebCore/dom/Document.cpp:4410:39: error: expected ';' after do/while statement - U16_NEXT(characters, i, length, c) - ^ - ; -Source/WebCore/dom/Document.cpp:4415:43: error: expected ';' after do/while statement - U16_NEXT(characters, i, length, c) - ^ - ; -Source/WebCore/dom/Document.cpp:4477:46: error: expected ';' after do/while statement - U16_NEXT(qualifiedName, i, length, c) - ^ - ; - ---- Source/WebCore/dom/Document.cpp.orig 2019-06-26 16:25:02 UTC -+++ Source/WebCore/dom/Document.cpp -@@ -4407,12 +4407,12 @@ static bool isValidNameNonASCII(const UChar* character - 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; - } -@@ -4474,7 +4474,7 @@ bool Document::parseQualifiedName(const String& qualif - - for (unsigned i = 0; i < length;) { - UChar32 c; -- U16_NEXT(qualifiedName, i, length, c) -+ U16_NEXT(qualifiedName, i, length, c); - if (c == ':') { - if (sawColon) { - ec = NAMESPACE_ERR; - diff --git a/source/l/qt5-webkit/qt5-webkit.SlackBuild b/source/l/qt5-webkit/qt5-webkit.SlackBuild index e1d8b85de..c54430e77 100755 --- a/source/l/qt5-webkit/qt5-webkit.SlackBuild +++ b/source/l/qt5-webkit/qt5-webkit.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=qt5-webkit SRCNAM=qtwebkit -SRCVER=${SRCVER:-5.212.0-alpha3} +SRCVER=${SRCVER:-5.212.0-alpha4} VERSION=$(echo $SRCVER | tr - _) BUILD=${BUILD:-1} @@ -89,9 +89,6 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ -# Fix compilation against icu4c 65.1: -zcat $CWD/patches/qt5-webkit.icu65.patch.gz | patch -p0 --verbose || exit 1 - # Use -reduce-relocations only on i?86 and x86_64 architextures. # https://bugreports.qt-project.org/browse/QTBUG-36129 if echo $ARCH | grep -q '\(i.86\|x86_64\)' 2>/dev/null; then |