5 files changed, 58 insertions, 15 deletions
diff --git a/deps/qt5/.deps b/deps/qt5/.deps
index c276ccc..d1eaacd 100644
--- a/deps/qt5/.deps
+++ b/deps/qt5/.deps
@@ -1,3 +1,2 @@
 OpenAL
 libxkbcommon
-woff2
diff --git a/deps/qt5/.url b/deps/qt5/.url
index 6563ae9..63b180a 100644
--- a/deps/qt5/.url
+++ b/deps/qt5/.url
@@ -1 +1 @@
-https://download.qt.io/official_releases/qt/5.13/5.13.0/single/qt-everywhere-src-5.13.0.tar.xz
+https://download.qt.io/official_releases/qt/5.13/5.13.1/single/qt-everywhere-src-5.13.1.tar.xz
diff --git a/deps/qt5/patches/qt5.qtbug-76255.patch b/deps/qt5/patches/qt5.qtbug-76255.patch
new file mode 100644
index 0000000..678913c
--- /dev/null
+++ b/deps/qt5/patches/qt5.qtbug-76255.patch
@@ -0,0 +1,35 @@
+From cc32a691936f37eaaec618a71edd62f896009c9d Mon Sep 17 00:00:00 2001
+From: Joerg Bornemann <joerg.bornemann@qt.io>
+Date: Fri, 06 Sep 2019 10:54:44 +0200
+Subject: [PATCH] Fix CMake config files for -libdir different from "lib"
+
+When Qt was configured with -libdir different from "lib", one could not
+build with CMake whenever a static lib was pulled in (e.g. uitools).
+
+Do not hard-code "/lib" but use the correct variable also for static
+libraries.
+
+Fixes: QTBUG-76255
+Change-Id: I28c6861752e29e461247628d2b1f8a9ec32f0790
+Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
+Reviewed-by: Fabian Vogt <fabian@ritter-vogt.de>
+---
+
+diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
+index d4fd057..f4a34d6 100644
+--- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
++++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
+@@ -53,7 +53,11 @@
+     set(_lib_deps)
+     set(_link_flags)
+ 
+-    get_filename_component(_qt5_install_libs \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/lib\" ABSOLUTE)
++!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
++    set(_qt5_install_libs \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}\")
++!!ELSE
++    set(_qt5_install_libs \"$${CMAKE_LIB_DIR}\")
++!!ENDIF
+ 
+     if(EXISTS \"${prl_file_location}\")
+         file(STRINGS \"${prl_file_location}\" _prl_strings REGEX \"QMAKE_PRL_LIBS_FOR_CMAKE[ \\t]*=\")
+
diff --git a/deps/qt5/patches/qt5.qtbug-77364.patch b/deps/qt5/patches/qt5.qtbug-77364.patch
new file mode 100644
index 0000000..088856c
--- /dev/null
+++ b/deps/qt5/patches/qt5.qtbug-77364.patch
@@ -0,0 +1,13 @@
+diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp
+index 04290a4ce1..27773d5762 100644
+--- a/src/widgets/kernel/qwidget.cpp
++++ b/src/widgets/kernel/qwidget.cpp
+@@ -6446,7 +6446,7 @@ void QWidget::setFocusProxy(QWidget * w)
+ 
+     if (changingAppFocusWidget) {
+         QWidget *newDeepestFocusProxy = d_func()->deepestFocusProxy();
+-        QApplicationPrivate::focus_widget = newDeepestFocusProxy ? newDeepestFocusProxy : this;
++        QApplicationPrivate::setFocusWidget(newDeepestFocusProxy ? newDeepestFocusProxy : this, Qt::NoFocusReason);
+     }
+ }
+
diff --git a/deps/qt5/qt5.SlackBuild b/deps/qt5/qt5.SlackBuild
index 529aa78..079c1a1 100755
--- a/deps/qt5/qt5.SlackBuild
+++ b/deps/qt5/qt5.SlackBuild
@@ -63,17 +63,16 @@
 # Modifications for qt 5.12.1 2019 by Eric  Hameleers, Eindhoven, NL
 # Modifications for qt 5.12.3 2019 by Eric  Hameleers, Eindhoven, NL
 # Modifications for qt 5.13.0 2019 by Eric  Hameleers, Eindhoven, NL
+# Modifications for qt 5.13.1 2019 by Eric  Hameleers, Eindhoven, NL
 
 cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=qt5
-VERSION=${VERSION:-5.13.0}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-5.13.1}
+BUILD=${BUILD:-1}
 PKGSRC=$(echo $VERSION |cut -d- -f1)
 PKGVER=$(echo $VERSION |tr - _)
 
-NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
-
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$(uname -m)" in
@@ -128,6 +127,8 @@ case "$ARCH" in
     *)    TARGET=$ARCH-slackware-linux ;;
 esac
 
+NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
+
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-${PKGNAM}
 
@@ -157,15 +158,14 @@ fi
 # Fix path to mysql header:
 cat $CWD/patches/qt5.mysql.h.diff | patch -p1 --verbose || exit 1
 
-# Fix freezes in KWin on hybrid NVIDIA systems (also solved in KWin 5.16.2):
+# Fix keyboard input in webengine:
 cd qtbase
-  cat $CWD/patches/qtbase-qxcbwindow.patch | patch -p1 --verbose || exit 1
+  cat $CWD/patches/qt5.qtbug-77364.patch | patch -p1 --verbose || exit 1
 cd - 1>/dev/null
 
-# Change the default compression back to zlib for backwards compatibility,
-# QTBUG-76521:
+# Fix hardcoded lib/ dir on x86_64:
 cd qtbase
-  cat $CWD/patches/qtbase-zlib-compression.patch | patch -p1 --verbose || exit 1
+  cat $CWD/patches/qt5.qtbug-76255.patch | patch -p1 --verbose || exit 1
 cd - 1>/dev/null
 
 # CMake generates wrong -isystem /usr/include compilations flags with Qt5::Gui
@@ -177,10 +177,6 @@ cd qtbase
     | patch -p1 --verbose || exit 1
 cd - 1>/dev/null
 
-# More quoting is needed (QTBUG-76244) to fix the error in kjsembed (at least):
-# "Error:string sub-command REGEX, mode REPLACE needs at least 6 arguments total to command."
-cat $CWD/patches/qt5.qt5uitoolsconfig.patch | patch -p1 --verbose || exit 1
-
 if ! pkg-config --exists libpulse 2>/dev/null ; then
   # Forcibly disable pulseaudio in qtwebengine:
   cat $CWD/patches/qt5.pulseaudio.diff | patch -p1 --verbose || exit 1