Update to 5.8.0

1 files changed, 19 insertions, 21 deletions

diff --git a/0023-Use-correct-pkg-config-static-flag.patch b/0023-Use-correct-pkg-config-static-flag.patch
index 356037840ffa..9c57e11316bc 100644
--- a/0023-Use-correct-pkg-config-static-flag.patch
+++ b/0023-Use-correct-pkg-config-static-flag.patch
@@ -1,28 +1,26 @@
-From 737579eb780ab8a22e075d8032a5ce983d397064 Mon Sep 17 00:00:00 2001
+From 58f6e5d904464923eebcbb80ec0c774a30b30569 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:50:21 +0200
-Subject: [PATCH 23/26] Use correct pkg-config --static flag
+Subject: [PATCH 23/30] Use correct pkg-config --static flag
 
 ---
- configure | 5 +++++
- 1 file changed, 5 insertions(+)
+ configure.pri | 3 +++
+ 1 file changed, 3 insertions(+)
 
-diff --git a/configure b/configure
-index 9ecc7f9ada..40db8b196a 100755
---- a/configure
-+++ b/configure
-@@ -4166,6 +4166,11 @@ if [ -z "$PKG_CONFIG" ]; then
-     # See if PKG_CONFIG is set in the mkspec:
-     PKG_CONFIG="`"$CFG_QMAKE_PATH" -qtconf "$QTCONFFILE" -E -nocache -spec "$XQMAKESPEC" "CONFIG=" $DEV_NULL 2>&1 | sed -n -e 's,^PKG_CONFIG = \(.*\),\1,p'`"
-     [ -n "$PKG_CONFIG" ] && [ "$OPT_VERBOSE" = "yes" ] && echo "Found pkg-config from mkspec: $PKG_CONFIG"
-+
-+    if [ "$CFG_SHARED" = "no" ] ; then
-+        PKG_CONFIG="$PKG_CONFIG --static"
-+        [ "$OPT_VERBOSE" = "yes" ] && echo "Using '$PKG_CONFIG' because we're doing a static build"
-+    fi
- fi
- if [ -z "$PKG_CONFIG" ]; then
-     PKG_CONFIG=`"$WHICH" pkg-config 2>/dev/null`
+diff --git a/configure.pri b/configure.pri
+index 0c4b8ebbf8..8afb893e88 100644
+--- a/configure.pri
++++ b/configure.pri
+@@ -138,6 +138,9 @@ defineTest(qtConfTest_detectPkgConfig) {
+             qtLog("Found pkg-config from path: $$pkgConfig")
+         }
+     }
++    !isEmpty(pkgConfig):qtConfig(static) {
++        pkgConfig = "$$pkgConfig --static"
++    }
+ 
+     $$qtConfEvaluate("features.cross_compile") {
+         # cross compiling, check that pkg-config is set up sanely
 -- 
-2.11.0
+2.11.1