From 4fa63ebd172b1dbf542ce3e364b4241368a9cf3f Mon Sep 17 00:00:00 2001
From: Eric Hameleers <alien@slackware.com>
Date: Sat, 19 Oct 2019 12:37:55 +0200
Subject: Deps: rebuilt qt5, qt5-webkit and upgraded sip

The qt5 and qt5-webkit packages needed to be rebuilt against the new icu4c.
The sip package was upgraded to the version which is also used in Slackware.
---
 deps/qt5-webkit/patches/qt5-webkit.icu65.patch | 47 ++++++++++++++++++++++++++
 deps/qt5-webkit/qt5-webkit.SlackBuild          |  9 +++--
 2 files changed, 53 insertions(+), 3 deletions(-)
 create mode 100644 deps/qt5-webkit/patches/qt5-webkit.icu65.patch

(limited to 'deps/qt5-webkit')

diff --git a/deps/qt5-webkit/patches/qt5-webkit.icu65.patch b/deps/qt5-webkit/patches/qt5-webkit.icu65.patch
new file mode 100644
index 0000000..fe27d24
--- /dev/null
+++ b/deps/qt5-webkit/patches/qt5-webkit.icu65.patch
@@ -0,0 +1,47 @@
+# -----------------------------------------------------------------------------
+# 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/deps/qt5-webkit/qt5-webkit.SlackBuild b/deps/qt5-webkit/qt5-webkit.SlackBuild
index d343a87..5bad338 100755
--- a/deps/qt5-webkit/qt5-webkit.SlackBuild
+++ b/deps/qt5-webkit/qt5-webkit.SlackBuild
@@ -27,7 +27,7 @@
 PKGNAM=qt5-webkit
 SRCVER=${SRCVER:-"5.212.0-alpha3"}
 VERSION=$(echo $SRCVER | tr - _)
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 NUMJOBS=${NUMJOBS:-"-j$(nproc)"}
 
@@ -82,6 +82,9 @@ echo "Extracting qtwebkit-$SRCVER.tar.xz"
 tar xf $CWD/qtwebkit-$SRCVER.tar.xz || exit 1
 cd qtwebkit-$SRCVER || exit 1
 
+# Fix compilation against icu4c 65.1:
+cat $CWD/patches/qt5-webkit.icu65.patch | patch -p0 --verbose || exit 1
+
 chown -R root:root .
 find . \
  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -98,8 +101,8 @@ else
 fi
 
 export CFLAGS="$SLKCFLAGS"
-export CXXFLAGS="$SLKCFLAGS -fpermissive"
-export OPENSOURCE_CXXFLAGS="$SLKCFLAGS -fpermissive"
+export CXXFLAGS="$SLKCFLAGS -fpermissive -fno-strict-aliasing"
+export OPENSOURCE_CXXFLAGS="$SLKCFLAGS -fpermissive -fno-strict-aliasing"
 export QTDIR="/usr/lib$LIBDIRSUFFIX/qt5"
 export LD_LIBRARY_PATH="${QTDIR}/qtbase/lib:${QTDIR}/qttools/lib:${LD_LIBRARY_PATH}"
   
-- 
cgit v1.2.3