summaryrefslogtreecommitdiffstats
path: root/libraries/qt5/qt5.SlackBuild
diff options
context:
space:
mode:
Diffstat (limited to 'libraries/qt5/qt5.SlackBuild')
-rw-r--r--libraries/qt5/qt5.SlackBuild18
1 files changed, 14 insertions, 4 deletions
diff --git a/libraries/qt5/qt5.SlackBuild b/libraries/qt5/qt5.SlackBuild
index 18ed17ca7e..9b936d1e0a 100644
--- a/libraries/qt5/qt5.SlackBuild
+++ b/libraries/qt5/qt5.SlackBuild
@@ -50,7 +50,7 @@
# Adapted for Qt 5.9.6 by David Woodfall
PRGNAM=qt5
-VERSION=${VERSION:-5.9.7}
+VERSION=${VERSION:-5.9.6}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -156,6 +156,16 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
+# Support for openssl-1.1.x
+( cd qtbase
+ patch -p1 < $CWD/patches/0001-QSslSocket-OpenSSL-1.1-backend.patch )
+
+# Fix for gcc-8.x
+if [ "$WEBENGINE" == "yes" ]; then
+ ( cd qtwebengine
+ patch -p1 < $CWD/patches/qtwebengine-5.9.6-gcc8.patch )
+fi
+
# Limit -reduce-relocations to ix86 and x86_64.
# https://bugreports.qt-project.org/browse/QTBUG-36129
if echo $ARCH | grep -q '\(i.86\|x86_64\)' 2>/dev/null; then
@@ -167,7 +177,7 @@ fi
sed -i "s|-O2|$SLKCFLAGS|" qtbase/mkspecs/common/gcc-base.conf
export CFLAGS="$SLKCFLAGS"
-export CXXFLAGS="$SLKCFLAGS -std=c++11"
+export CXXFLAGS="$SLKCFLAGS"
./configure -v \
-confirm-license \
-opensource \
@@ -182,8 +192,9 @@ export CXXFLAGS="$SLKCFLAGS -std=c++11"
-system-sqlite \
-plugin-sql-sqlite \
-icu \
- -openssl-linked \
+ -openssl \
-verbose \
+ -optimized-qmake \
-dbus-linked \
-qpa xcb \
-xcb \
@@ -195,7 +206,6 @@ export CXXFLAGS="$SLKCFLAGS -std=c++11"
-no-strip \
-release \
-no-use-gold-linker \
- -c++std c++11 \
$CCACHE \
$CODECS \
$PULSE \