3 files changed, 33 insertions, 21 deletions
diff --git a/libraries/qt5/README b/libraries/qt5/README
index 41dd21c566..19cfb9945f 100644
--- a/libraries/qt5/README
+++ b/libraries/qt5/README
@@ -20,3 +20,9 @@ will produce a non-redistributable package in some countries) pass
 PROPRIETARY_CODECS=yes to the slackbuild
 
   PROPRIETARY_CODECS=yes ./qt5.SlackBuild
+
+Note4: To disable support for pulseaudio pass PULSEAUDIO=no to the slackbuild
+
+  PULSEAUDIO=no ./qt5.SlackBuild
+
+(Qt will be automatically detect and disable pulseaudio if not installed.)
diff --git a/libraries/qt5/qt5.SlackBuild b/libraries/qt5/qt5.SlackBuild
index 7b829ff5f3..512eb6ae69 100644
--- a/libraries/qt5/qt5.SlackBuild
+++ b/libraries/qt5/qt5.SlackBuild
@@ -2,6 +2,8 @@
 
 # Slackware build script for qt5
 
+# Update for 5.9.6 by David Woodfall <dave@dawoodfall.net>
+#
 # Copyright 2013-2017 Larry Hajali <larryhaja[at]gmail[dot]com>
 # Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
@@ -45,8 +47,10 @@
 # This is the highly modified version qt.SlackBuild found in Slackware
 # tailored to Qt 5. Modified by Larry Hajali.
 
+# Adapted for Qt 5.9.6 by David Woodfall
+
 PRGNAM=qt5
-VERSION=${VERSION:-5.7.1}
+VERSION=${VERSION:-5.9.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -83,15 +87,12 @@ else
   LIBDIRSUFFIX=""
 fi
 
-# http://doc.qt.io/qt-5/qtwebengine-platform-notes.html#audio-and-video-codec-support
-PRCOD=""
-[ "$PROPRIETARY_CODECS" = "yes" ] && PRCOD="WEBENGINE_CONFIG += use_proprietary_codecs"
-
 set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
+echo "Removing any existing source directory. Please wait..."
 rm -rf ${PRGNAM/5/}-everywhere-opensource-src-$VERSION
 tar xvf $CWD/${PRGNAM/5/}-everywhere-opensource-src-$VERSION.tar.xz
 cd ${PRGNAM/5/}-everywhere-opensource-src-$VERSION
@@ -102,12 +103,6 @@ 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 {} \;
 
-# Slackware patch to build against MySQL/MariaDB.
-patch -p1 < $CWD/patches/qt5.mysql.h.diff
-
-# Patch for the newer mozilla-nss
-patch -p1 < $CWD/patches/nss-update-sslv3-nonce.patch
-
 # 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
@@ -125,10 +120,18 @@ else
   BUILD_EXAMPLES="-nomake examples"
 fi
 
-echo "$PRCOD" >> qtwebengine/.qmake.conf
+if [ "${PULSEAUDIO:-yes}" = "no" ]; then
+  PULSE="-no-pulseaudio"
+fi
+
+# New codec option.
+# Note that this changes to -webengine-proprietary-codecs in later versions
+if [ "${PROPRIETARY_CODECS:-no}" = "yes" ]; then
+  CODECS="-proprietary-codecs"
+fi
 
 export CFLAGS="$SLKCFLAGS"
-export CXXFLAGS="$SLKCFLAGS"
+export CXXFLAGS="$SLKCFLAGS -std=c++11"
 ./configure -v \
   -confirm-license \
   -opensource \
@@ -141,10 +144,9 @@ export CXXFLAGS="$SLKCFLAGS"
   -system-libjpeg \
   -system-zlib \
   -system-sqlite \
-  -system-pcre \
   -plugin-sql-sqlite \
   -icu \
-  -openssl \
+  -openssl-linked \
   -verbose \
   -optimized-qmake \
   -dbus-linked \
@@ -158,7 +160,9 @@ export CXXFLAGS="$SLKCFLAGS"
   -no-strip \
   -release \
   -no-use-gold-linker \
-  -pulseaudio \
+  -c++std c++11 \
+  $CODECS \
+  $PULSE \
   $RELOCATIONS \
   $BUILD_EXAMPLES
 
@@ -290,3 +294,5 @@ cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+
+# vim: expandtab
diff --git a/libraries/qt5/qt5.info b/libraries/qt5/qt5.info
index a3eb34356e..cedc8b43f6 100644
--- a/libraries/qt5/qt5.info
+++ b/libraries/qt5/qt5.info
@@ -1,10 +1,10 @@
 PRGNAM="qt5"
-VERSION="5.7.1"
+VERSION="5.9.6"
 HOMEPAGE="http://qt-project.org/"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/qt-everywhere-opensource-src-5.7.1.tar.xz"
-MD5SUM="7524ffba8411119d867f673155ec91bc"
+DOWNLOAD="http://download.qt.io/official_releases/qt/5.9/5.9.6/single/qt-everywhere-opensource-src-5.9.6.tar.xz"
+MD5SUM="a427428c65f35909ef6ae865b8ee0da6"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="libxkbcommon libinput"
-MAINTAINER="Larry Hajali"
-EMAIL="larryhaja[at]gmail[dot]com"
+MAINTAINER="David Woodfall"
+EMAIL="dave@dawoodfall.net"