Update to 5.9.0

4 files changed, 61 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 09b88a4013b1..64a41c9c803c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Thu Feb  9 20:00:39 UTC 2017
+# Thu Jun  8 19:42:43 UTC 2017
 pkgbase = mingw-w64-qt5-location
 	pkgdesc = Provides access to position, satellite and area monitoring classes (mingw-w64)
-	pkgver = 5.8.0
+	pkgver = 5.9.0
 	pkgrel = 1
 	url = https://www.qt.io/
 	arch = any
@@ -13,17 +13,21 @@ pkgbase = mingw-w64-qt5-location
 	license = custom
 	makedepends = mingw-w64-gcc
 	makedepends = mingw-w64-pkg-config
+	makedepends = mingw-w64-angleproject
 	makedepends = mingw-w64-qt5-base-static
 	depends = mingw-w64-qt5-base
 	depends = mingw-w64-qt5-declarative
+	optdepends = mingw-w64-angleproject: Mapbox GL plugin
 	optdepends = mingw-w64-qt5-base-static: use of static libraries
 	options = !strip
 	options = !buildflags
 	options = staticlibs
-	source = https://download.qt.io/official_releases/qt/5.8/5.8.0/submodules/qtlocation-opensource-src-5.8.0.tar.xz
+	source = https://download.qt.io/official_releases/qt/5.9/5.9.0/submodules/qtlocation-opensource-src-5.9.0.tar.xz
 	source = 0001-Ensure-static-3rdparty-libs-are-linked-correctly.patch
-	md5sums = 2077d5d6f926087614c9e94021019c0e
-	md5sums = 5c0aeb724cfefeb3e7852c2c35d50fce
+	source = 0002-Enforce-use-of-ANGLE-in-Mapbox-GL-plugin.patch
+	sha256sums = e3ee0ba44b1d3df4a958cdf9c9b70d8f41fd05d5f56580504d944679830f2af6
+	sha256sums = 1e006906a649177edae0a9e4d712d90940771f929997a9ceeec920b497ffae49
+	sha256sums = ff67ff7c940268b31abe0b3fadc71a50aa02821134ce440e13a4a6086e86ceac
 
 pkgname = mingw-w64-qt5-location
 
diff --git a/0001-Ensure-static-3rdparty-libs-are-linked-correctly.patch b/0001-Ensure-static-3rdparty-libs-are-linked-correctly.patch
index 8436089ea6da..5b17a2f03860 100644
--- a/0001-Ensure-static-3rdparty-libs-are-linked-correctly.patch
+++ b/0001-Ensure-static-3rdparty-libs-are-linked-correctly.patch
@@ -1,26 +1,27 @@
-From f6a900bbfcb931b1d8d2771dcf4438671d94dfc6 Mon Sep 17 00:00:00 2001
+From 67ab2da0410246551b8972a7920ebea7595bf9e7 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Thu, 22 Dec 2016 22:30:59 +0100
-Subject: [PATCH] Ensure static 3rdparty libs are linked correctly
+Subject: [PATCH 1/2] Ensure static 3rdparty libs are linked correctly
 
+Not sure whether this is still required in Qt 5.9.0
 ---
- src/imports/location/location.pro | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
+ src/imports/location/location.pro | 3 +++
+ 1 file changed, 3 insertions(+)
 
 diff --git a/src/imports/location/location.pro b/src/imports/location/location.pro
-index 57172ad8..ddea8b23 100644
+index dec1149b..ad57a5c5 100644
 --- a/src/imports/location/location.pro
 +++ b/src/imports/location/location.pro
-@@ -62,7 +62,8 @@ include(declarativeplaces/declarativeplaces.pri)
+@@ -5,6 +5,9 @@ SOURCES += \
  
  load(qml_plugin)
  
--LIBS_PRIVATE += -L$$MODULE_BASE_OUTDIR/lib -lpoly2tri$$qtPlatformTargetSuffix() -lclip2tri$$qtPlatformTargetSuffix()
 +LIBS_PRIVATE += -L$$MODULE_BASE_OUTDIR/lib -lclip2tri$$qtPlatformTargetSuffix() -lclipper$$qtPlatformTargetSuffix() -lpoly2tri$$qtPlatformTargetSuffix()
 +QMAKE_LIBS_PRIVATE += -lclip2tri$$qtPlatformTargetSuffix() -lclipper$$qtPlatformTargetSuffix() -lpoly2tri$$qtPlatformTargetSuffix()
- 
++
  OTHER_FILES += \
      plugin.json \
+     qmldir
 -- 
-2.11.0
+2.13.0
 
diff --git a/0002-Enforce-use-of-ANGLE-in-Mapbox-GL-plugin.patch b/0002-Enforce-use-of-ANGLE-in-Mapbox-GL-plugin.patch
new file mode 100644
index 000000000000..d7ac1ab4ca1d
--- /dev/null
+++ b/0002-Enforce-use-of-ANGLE-in-Mapbox-GL-plugin.patch
@@ -0,0 +1,34 @@
+From e3adbcbab4927d061607bdca92a93551a27605fe Mon Sep 17 00:00:00 2001
+From: Martchus <martchus@gmx.net>
+Date: Sun, 4 Jun 2017 00:37:16 +0200
+Subject: [PATCH 2/2] Enforce use of ANGLE in Mapbox GL plugin
+
+* Otherwise the build of qtlocation will fail
+  when Qt is configured for 'desktop OpenGL'
+* Requires ANGLE libraries present at build
+  time and to use the plugin
+---
+ src/plugins/geoservices/mapboxgl/mapboxgl.pro | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/src/plugins/geoservices/mapboxgl/mapboxgl.pro b/src/plugins/geoservices/mapboxgl/mapboxgl.pro
+index f35f26dc..2ff41608 100644
+--- a/src/plugins/geoservices/mapboxgl/mapboxgl.pro
++++ b/src/plugins/geoservices/mapboxgl/mapboxgl.pro
+@@ -38,11 +38,10 @@ qtConfig(icu) {
+     include(../../../3rdparty/icu_dependency.pri)
+ }
+ 
+-# When building for Windows with dynamic OpenGL, this plugin
+-# can only run with ANGLE because Mapbox GL requires at least
++# Enforce use of ANGLE because Mapbox GL requires at least
+ # OpenGL ES and does not use QOpenGLFunctions for resolving
+ # the OpenGL symbols. -lopengl32 only gives OpenGL 1.1.
+-win32:qtConfig(dynamicgl) {
++win32:!qtConfig(angle) {
+     qtConfig(combined-angle-lib): LIBS_PRIVATE += -l$${LIBQTANGLE_NAME}
+     else: LIBS_PRIVATE += -l$${LIBEGL_NAME} -l$${LIBGLESV2_NAME}
+ }
+-- 
+2.13.0
+
diff --git a/PKGBUILD b/PKGBUILD
index dd2eb3d9a7fe..528fe5581c03 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,21 +9,24 @@
 
 _qt_module=qtlocation
 pkgname=mingw-w64-qt5-location
-pkgver=5.8.0
+pkgver=5.9.0
 pkgrel=1
 arch=('any')
 pkgdesc='Provides access to position, satellite and area monitoring classes (mingw-w64)'
 depends=('mingw-w64-qt5-base' 'mingw-w64-qt5-declarative')
-makedepends=('mingw-w64-gcc' 'mingw-w64-pkg-config')
+makedepends=('mingw-w64-gcc' 'mingw-w64-pkg-config' 'mingw-w64-angleproject')
+optdepends=('mingw-w64-angleproject: Mapbox GL plugin')
 options=('!strip' '!buildflags' 'staticlibs')
 groups=('mingw-w64-qt5')
 license=('GPL3' 'LGPL' 'FDL' 'custom')
 url='https://www.qt.io/'
 _pkgfqn="${_qt_module}-opensource-src-${pkgver}"
 source=("https://download.qt.io/official_releases/qt/${pkgver:0:3}/${pkgver}/submodules/${_pkgfqn}.tar.xz"
-        '0001-Ensure-static-3rdparty-libs-are-linked-correctly.patch')
-md5sums=('2077d5d6f926087614c9e94021019c0e'
-         '5c0aeb724cfefeb3e7852c2c35d50fce')
+        '0001-Ensure-static-3rdparty-libs-are-linked-correctly.patch'
+        '0002-Enforce-use-of-ANGLE-in-Mapbox-GL-plugin.patch')
+sha256sums=('e3ee0ba44b1d3df4a958cdf9c9b70d8f41fd05d5f56580504d944679830f2af6'
+            '1e006906a649177edae0a9e4d712d90940771f929997a9ceeec920b497ffae49'
+            'ff67ff7c940268b31abe0b3fadc71a50aa02821134ce440e13a4a6086e86ceac')
 
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 [[ $NO_STATIC_LIBS ]] || \