From cc6fd43f9c99c7c96bf6af68c74bca4252d09968 Mon Sep 17 00:00:00 2001
From: David Woodfall <dave@dawoodfall.net>
Date: Wed, 14 Nov 2018 19:58:06 +0000
Subject: [PATCH] libraries/qt5: Update to 5.9.7

---
 libraries/qt5/README         | 75 ++++++++++++++++++++++++++----------
 libraries/qt5/qt5.SlackBuild |  3 +-
 libraries/qt5/qt5.info       |  6 +--
 3 files changed, 59 insertions(+), 25 deletions(-)

diff --git a/libraries/qt5/README b/libraries/qt5/README
index 65166d8725..1aff0e6a62 100644
--- a/libraries/qt5/README
+++ b/libraries/qt5/README
@@ -1,40 +1,75 @@
-Qt is a cross-platform C++ application framework. Qt's primary feature
-is its rich set of widgets that provide standard GUI functionality.
+Qt is a cross-platform C++ application framework.  Qt's
+primary feature is its rich set of widgets that provide
+standard GUI functionality.
 
-Optional dependencies: unixodbc, freetds, OpenAL, libwebp, opus, snappy,
-wayland, and postgresql
+The following are optional dependencies that Qt will link
+against if they are detected at build time:
 
-Optional dependencies: openvg and firebird (not available
-at slackbuilds.org)
+libwebp opus pcre2 snappy
 
-Note1: To build documentation pass DOCS=yes to the slackbuild
+
+============================================================
+
+OPTIONS
+
+To build the documentation pass DOCS=yes to the SlackBuild:
 
   DOCS=yes ./qt5.SlackBuild
 
-Note2: To build examples pass EXAMPLES=yes to the slackbuild
+To build the examples pass EXAMPLES=yes to the SlackBuild:
 
   EXAMPLES=yes ./qt5.SlackBuild
 
-Note3: To build support for proprietary media codecs (note that this
-will produce a non-redistributable package in some countries) pass
-PROPRIETARY_CODECS=yes to the slackbuild
+NOTE
+
+Building the documentation and examples creates a
+significantly larger package.
+
+
+ROUGH SIZE GUIDE
+
+Package size:
+
+  Qt alone:                              102M
+  With documentation:                    339M
+  With examples:                         391M
+  With both documentation and examples:  628M
+
+Minumum working space needed (size of source and package
+directories at end of build):
+
+  Qt alone:                              5018M
+  With documentation:                    6197M
+  With examples:                         6388M
+  With both documentation and examples:  7604M
+
+
+To build support for proprietary media codecs pass
+PROPRIETARY_CODECS=yes to the SlackBuild (this will produce
+a non-redistributable package in some countries):
 
   PROPRIETARY_CODECS=yes ./qt5.SlackBuild
 
-Note4: To disable support for pulseaudio pass PULSEAUDIO=no to the slackbuild
+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.)
-
-Qt will also detect and use pcre2 if it is installed.
+Qt will automatically detect if it is not installed at build
+time and not provide support for it.
 
 
-NOTICE
+============================================================
 
-There is a qt5-legacy SlackBuild available for applications that
-might not run correctly with this version.
+NOTE
 
-Known Applications With Problems:
+After upgrading Qt5 it is important to rebuild qt5ct too, if
+it is installed, or some applications may not display or
+function correctly.
 
-speedcrunch: the widget drawer does not close properly.
+There is a qt5-legacy (5.7.1) SlackBuild that is available
+for older applications that do not run correctly with this
+version. However it will not coexist with this version.
+
+Please report any problems about applications that don't
+work correctly to the Qt5 maintainer or to the mailing list.
diff --git a/libraries/qt5/qt5.SlackBuild b/libraries/qt5/qt5.SlackBuild
index c3e06bb13a..fff7d43aba 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.6}
+VERSION=${VERSION:-5.9.7}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -148,7 +148,6 @@ export CXXFLAGS="$SLKCFLAGS -std=c++11"
   -icu \
   -openssl-linked \
   -verbose \
-  -optimized-qmake \
   -dbus-linked \
   -qpa xcb \
   -xcb \
diff --git a/libraries/qt5/qt5.info b/libraries/qt5/qt5.info
index cedc8b43f6..39da582922 100644
--- a/libraries/qt5/qt5.info
+++ b/libraries/qt5/qt5.info
@@ -1,8 +1,8 @@
 PRGNAM="qt5"
-VERSION="5.9.6"
+VERSION="5.9.7"
 HOMEPAGE="http://qt-project.org/"
-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="http://download.qt.io/official_releases/qt/5.9/5.9.7/single/qt-everywhere-opensource-src-5.9.7.tar.xz"
+MD5SUM="70e617aeb1f9bbf84a12b8cf09b01ece"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="libxkbcommon libinput"