From b1eede5fa7b8f357bf7c238c7d2f38ff603892fa Mon Sep 17 00:00:00 2001
From: mid-kid <esteve.varela@gmail.com>
Date: Tue, 11 Sep 2018 22:17:47 +0200
Subject: [PATCH] Upgrade qt5

---
 satellites/qt5-base.sat      | 12 +++++++-----
 satellites/qt5-svg.sat       |  4 ++--
 satellites/qt5-tools.sat     |  4 ++--
 satellites/qt5-x11extras.sat |  4 ++--
 4 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/satellites/qt5-base.sat b/satellites/qt5-base.sat
index 310f546..3ff64a6 100644
--- a/satellites/qt5-base.sat
+++ b/satellites/qt5-base.sat
@@ -1,10 +1,10 @@
 name=qt5
 submodule=base
-majver=5.10
+majver=5.11
 version=$majver.1
 
 dlextract "http://download.qt.io/official_releases/qt/$majver/$version/submodules/qt$submodule-everywhere-src-$version.tar.xz" \
-          '1d5ebf49abb2897d573cee622a12f54d'
+          'c656471f138d3810187a523293e2cc28'
 _
 
 cd "qt$submodule-everywhere-src-$version"
@@ -14,13 +14,15 @@ sed -i -e "s/^\(QMAKE_CFLAGS_RELEASE.*\)/\1 $(safe_sed "$CFLAGS")/" mkspecs/comm
 sed -i -e "s/^\(QMAKE_CXXFLAGS_RELEASE.*\)/\1 $(safe_sed "$CXXFLAGS")/" mkspecs/common/gcc-base.conf
 sed -i -e "s/^\(QMAKE_LFLAGS_RELEASE.*\)/\1 $(safe_sed "$LDFLAGS")/" mkspecs/common/g++-unix.conf
 
-# Make sure all the possible libraries are linked from the OS, as Qt might use it's own if they aren't available.
+# Make sure all the possible libraries are linked from the OS, as Qt might use its own if they aren't available.
 optional=""
 for opt in libpng libjpeg freetype harfbuzz xcb xkbcommon-x11; do
     lib="$opt"
-    [ "$lib" = freetype ] && lib=freetype2
+    opts=
+    [ "$lib" = 'freetype' ] && lib=freetype2
+    [ "$lib" = 'harfbuzz' ] && opts='--atleast-version 1.6.0'
 
-    pkg-config --exists "$lib" && optional+=" -system-$opt" || optional+=" -no-$opt"
+    pkg-config --exists $opts "$lib" && optional+=" -system-$opt" || optional+=" -no-$opt"
 done
 
 # TODO: Use system double-conversion
diff --git a/satellites/qt5-svg.sat b/satellites/qt5-svg.sat
index 9a2c315..8947119 100644
--- a/satellites/qt5-svg.sat
+++ b/satellites/qt5-svg.sat
@@ -2,11 +2,11 @@ import 'compile/qt'
 
 name=qt5
 submodule=svg
-majver=5.10
+majver=5.11
 version=$majver.1
 
 dlextract "http://download.qt.io/official_releases/qt/$majver/$version/submodules/qt$submodule-everywhere-src-$version.tar.xz" \
-          'cc0e01cf8c81ad18231b8ac1c409f3cb'
+          'c7dfa4b3504105ec45f888c9012d1969'
 _
 
 cd "qt$submodule-everywhere-src-$version"
diff --git a/satellites/qt5-tools.sat b/satellites/qt5-tools.sat
index d175cca..902d593 100644
--- a/satellites/qt5-tools.sat
+++ b/satellites/qt5-tools.sat
@@ -2,11 +2,11 @@ import 'compile/qt'
 
 name=qt5
 submodule=tools
-majver=5.10
+majver=5.11
 version=$majver.1
 
 dlextract "http://download.qt.io/official_releases/qt/$majver/$version/submodules/qt$submodule-everywhere-src-$version.tar.xz" \
-          '95526aac12236421f05634c8df4f52f4'
+          '41aea9500d21bd03bfa718b1d715cbba'
 _
 
 cd "qt$submodule-everywhere-src-$version"
diff --git a/satellites/qt5-x11extras.sat b/satellites/qt5-x11extras.sat
index 7ee046c..4781843 100644
--- a/satellites/qt5-x11extras.sat
+++ b/satellites/qt5-x11extras.sat
@@ -2,11 +2,11 @@ import 'compile/qt'
 
 name=qt5
 submodule=x11extras
-majver=5.10
+majver=5.11
 version=$majver.1
 
 dlextract "http://download.qt.io/official_releases/qt/$majver/$version/submodules/qt$submodule-everywhere-src-$version.tar.xz" \
-          '55ef3736f245d011341c0e3d052071a4'
+          '6e08ba5d9a6b01fcd55f2b80a0ab995e'
 _
 
 cd "qt$submodule-everywhere-src-$version"