From b01ad35c28ad635ba8709781510427006e9dcc6c Mon Sep 17 00:00:00 2001
From: Eric Hameleers <alien@slackware.com>
Date: Wed, 2 Sep 2015 09:41:04 +0200
Subject: Updated deps for KDE-5_15.09

Added:
  ConsoleKit2
  LoginKit
  lmdb
Removed (use the Slackware version):
  PyQt
  libepoxy
  sip
Removed (no longer used);
  akonadi-qt5
  grantlee-qt5
---
 deps/qt5/qt5.SlackBuild | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

(limited to 'deps/qt5/qt5.SlackBuild')

diff --git a/deps/qt5/qt5.SlackBuild b/deps/qt5/qt5.SlackBuild
index e4f9371..786b59e 100755
--- a/deps/qt5/qt5.SlackBuild
+++ b/deps/qt5/qt5.SlackBuild
@@ -118,6 +118,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
 
@@ -166,7 +174,6 @@ export QT_PLUGIN_PATH="${QTDIR}/qtbase/plugins"
   -optimized-qmake \
   -qpa xcb \
   -qt-harfbuzz \
-  -reduce-relocations \
   -verbose \
   -xcb \
   -nomake examples \
@@ -175,6 +182,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.
   
@@ -187,6 +195,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/' {} \;
-- 
cgit v1.2.3