From 25ffb4a7fabc3abd1b884fe0201185705f24ef5b Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Mon, 16 Mar 2020 21:20:17 +0000 Subject: Mon Mar 16 21:20:17 UTC 2020 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. --- source/l/qt5-webkit/patches/qt5-webkit.icu65.patch | 47 ---------------------- source/l/qt5-webkit/qt5-webkit.SlackBuild | 5 +-- source/n/postfix/postfix.SlackBuild | 5 +-- source/n/postfix/postfix.res-macros-fix.patch | 21 ---------- 4 files changed, 2 insertions(+), 76 deletions(-) delete mode 100644 source/l/qt5-webkit/patches/qt5-webkit.icu65.patch delete mode 100644 source/n/postfix/postfix.res-macros-fix.patch (limited to 'source') 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 diff --git a/source/n/postfix/postfix.SlackBuild b/source/n/postfix/postfix.SlackBuild index 3b0f72a9b..d56ec188a 100755 --- a/source/n/postfix/postfix.SlackBuild +++ b/source/n/postfix/postfix.SlackBuild @@ -2,7 +2,7 @@ # # Copyright 2006, 2011 Alan Hicks, Lizella, GA # Copyright 2010, 2011, 2013, 2014, 2015, 2016, 2017 Mario Preksavec, Zagreb, Croatia -# Copyright 2017, 2018 Patrick J. Volkerding, Sebeka, MN USA +# Copyright 2017, 2018, 2020 Patrick J. Volkerding, Sebeka, MN USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -102,9 +102,6 @@ zcat $CWD/postfix.only.warn.regular.files.diff.gz | patch -p1 --verbose || exit # Make the postfix startup message look more like the other boot notices: zcat $CWD/postfix.script.starting.message.diff.gz | patch -p1 --verbose || exit 1 -# Fix dropped RES macros with glibc-2.30: -zcat $CWD/postfix.res-macros-fix.patch.gz | patch -p1 --verbose || exit 1 - # Postfix does not use a ./configure script (no GNU autoconf) # # The AUXLIBS variable is for dynamic library linking, which as of this diff --git a/source/n/postfix/postfix.res-macros-fix.patch b/source/n/postfix/postfix.res-macros-fix.patch deleted file mode 100644 index 1034c85f7..000000000 --- a/source/n/postfix/postfix.res-macros-fix.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/src/dns/dns_str_resflags.c b/src/dns/dns_str_resflags.c -index 5f2cce5..df32345 100644 ---- a/src/dns/dns_str_resflags.c -+++ b/src/dns/dns_str_resflags.c -@@ -60,10 +60,16 @@ static const LONG_NAME_MASK resflag_table[] = { - "RES_DEFNAMES", RES_DEFNAMES, - "RES_STAYOPEN", RES_STAYOPEN, - "RES_DNSRCH", RES_DNSRCH, -+#ifdef RES_INSECURE1 - "RES_INSECURE1", RES_INSECURE1, -+#endif -+#ifdef RES_INSECURE2 - "RES_INSECURE2", RES_INSECURE2, -+#endif - "RES_NOALIASES", RES_NOALIASES, -+#ifdef RES_USE_INET6 - "RES_USE_INET6", RES_USE_INET6, -+#endif - #ifdef RES_ROTATE - "RES_ROTATE", RES_ROTATE, - #endif -- cgit v1.2.3