qt5: updated to 5.5.0

1 files changed, 24 insertions, 9 deletions

diff --git a/qt5/build/qt5.SlackBuild b/qt5/build/qt5.SlackBuild
index 893d82c4..c723a9fe 100755
--- a/qt5/build/qt5.SlackBuild
+++ b/qt5/build/qt5.SlackBuild
@@ -46,17 +46,17 @@
 # Modifications for qt 5.4.1 2015 by Eric  Hameleers, Eindhoven, NL
 
 PKGNAM=qt5
-VERSION=${VERSION:-5.4.1}
-BUILD=${BUILD:-2}
-
+VERSION=${VERSION:-5.5.0}
+BUILD=${BUILD:-1}
 TAG=${TAG:-alien}
+
 NUMJOBS=${NUMJOBS:--j7}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$(uname -m)" in
     i?86) ARCH=i486 ;;
-    arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7lh ;;
+    arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;;
     # Unless $ARCH is already set, use uname -m for all other archs:
     *) ARCH=$(uname -m) ;;
   esac
@@ -119,6 +119,14 @@ rm -f qtwebengine/src/3rdparty/chromium/third_party/webrtc/tools/e2e_quality/aud
 ln -s ../../../../../tools/perf \
   qtwebengine/src/3rdparty/chromium/third_party/webrtc/tools/e2e_quality/audio/
 
+# 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
+  RELOCATIONS="-reduce-relocations"
+else
+  RELOCATIONS=""
+fi
+
 # Fix path to mysql header:
 cat $CWD/patches/qt5.mysql.h.diff | patch -p1 --verbose || exit 1
 
@@ -129,10 +137,6 @@ cat $CWD/patches/qt5.pulseaudio.diff | patch -p1 --verbose || exit 1
 # See https://bugs.webkit.org/show_bug.cgi?id=117077
 cat $CWD/patches/platformplugin-install-path-fix.patch | patch -p1 --verbose || exit 1
 
-# QLockFile: fix deadlock when the lock file is corrupted.
-# See https://bugreports.qt.io/browse/QTBUG-44771
-cat $CWD/patches/qt5.qlockfile-deadlock.patch | patch -p1 --verbose || exit 1
-
 sed -i -e "s/-O2/$SLKCFLAGS/" qtbase/mkspecs/common/g++-base.conf || exit 1
 sed -i -e "s/-O2/$SLKCFLAGS/" qtbase/mkspecs/common/gcc-base.conf || exit 1
 sed -i -e "/^QMAKE_LFLAGS\s/s,+=,+= $SLKLDFLAGS,g" qtbase/mkspecs/common/gcc-base.conf || exit 1
@@ -171,7 +175,6 @@ export QT_PLUGIN_PATH="${QTDIR}/qtbase/plugins"
   -optimized-qmake \
   -qpa xcb \
   -qt-harfbuzz \
-  -reduce-relocations \
   -verbose \
   -xcb \
   -nomake examples \
@@ -180,6 +183,7 @@ export QT_PLUGIN_PATH="${QTDIR}/qtbase/plugins"
   -no-separate-debug-info \
   -no-strip \
   -no-use-gold-linker \
+  ${RELOCATIONS} \
   -no-pch \
   # No-precompiled-headers is ccache-friendly.
   
@@ -192,6 +196,17 @@ make install INSTALL_ROOT=$PKG || exit 1
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
 
+# Fix internal linking for Qt5WebKit.pc , thanks to Larry Hajali's SBo script:
+sed -i \
+  -e "s|-Wl,-whole-archive -lWebKit1 -Wl,-no-whole-archive -L${PWD}/qtwebkit/Source/WebKit[^ ]* ||" \
+  -e "s|-Wl,-whole-archive -lWebKit2 -Wl,-no-whole-archive -L${PWD}/qtwebkit/Source/WebKit2[^ ]* ||" \
+  -e "s|-Wl,-whole-archive -lWebCore -Wl,-no-whole-archive -L${PWD}/qtwebkit/Source/WebCore[^ ]* ||" \
+  -e "s|-Wl,-whole-archive -lANGLE -Wl,-no-whole-archive -L${PWD}/qtwebkit/Source/ThirdParty/ANGLE[^ ]* ||" \
+  -e "s|-Wl,-whole-archive -lJavaScriptCore -Wl,-no-whole-archive -L${PWD}/qtwebkit/Source/JavaScriptCore[^ ]* ||" \
+  -e "s|-Wl,-whole-archive -lWTF -Wl,-no-whole-archive -L${PWD}/qtwebkit/Source/WTF[^ ]* ||" \
+  -e "s|-Wl,-whole-archive -lleveldb -Wl,-no-whole-archive -L${PWD}/qtwebkit/Source/ThirdParty/leveldb[^ ]* ||" \
+  $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig/Qt5WebKit.pc
+
 # Fix the path in prl files:
 find "$PKG/usr/lib${LIBDIRSUFFIX}" -type f -name '*.prl' \
   -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \;