Update to 5.10.0

4 files changed, 21 insertions, 57 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e55622af2c81..d94873eb5747 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Mon Oct 16 17:36:26 UTC 2017
+# Thu Dec 14 00:06:23 UTC 2017
 pkgbase = mingw-w64-qt5-location
 	pkgdesc = Provides access to position, satellite and area monitoring classes (mingw-w64)
-	pkgver = 5.9.2
+	pkgver = 5.10.0
 	pkgrel = 1
 	url = https://www.qt.io/
 	arch = any
@@ -13,21 +13,17 @@ 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.9/5.9.2/submodules/qtlocation-opensource-src-5.9.2.tar.xz
+	source = https://download.qt.io/official_releases/qt/5.10/5.10.0/submodules/qtlocation-everywhere-src-5.10.0.tar.xz
 	source = 0001-Ensure-static-3rdparty-libs-are-linked-correctly.patch
-	source = 0002-Enforce-use-of-ANGLE-in-Mapbox-GL-plugin.patch
-	sha256sums = c81a42e44ebd4e9c33f7195e86af3deab9fde72ef0ad8dcb04acee250d356b0c
-	sha256sums = 888b3f9c8f6765abf66f67fa0f4931ef9713462a33cd9c4b583bf6dcdc431097
-	sha256sums = 6dcd0992504153a7f720ff46c4998717d4db74e69f88295d2de8fc1cb981d4d1
+	sha256sums = d84dcec7cfbc99a13e048f935783b0c2e1cb540defc82d77ac869a5b76aa85c7
+	sha256sums = a4380c11444f11f79f5c78d76121e45aa27add611bc53204bb867fdf0832888c
 
 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 1894839c9acb..6ef34ea6e827 100644
--- a/0001-Ensure-static-3rdparty-libs-are-linked-correctly.patch
+++ b/0001-Ensure-static-3rdparty-libs-are-linked-correctly.patch
@@ -1,7 +1,7 @@
-From 75e1f8c1e4a3dffed27bbe6e82c940b8201457c9 Mon Sep 17 00:00:00 2001
+From 3912c09ab1d9fc9659765fd7db3fe7161e203320 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Thu, 22 Dec 2016 22:30:59 +0100
-Subject: [PATCH 1/2] Ensure static 3rdparty libs are linked correctly
+Subject: [PATCH] Ensure static 3rdparty libs are linked correctly
 
 Not sure whether this is still required in Qt 5.9.0
 ---
@@ -23,5 +23,5 @@ index dec1149b..ad57a5c5 100644
      plugin.json \
      qmldir
 -- 
-2.14.2
+2.15.1
 
diff --git a/0002-Enforce-use-of-ANGLE-in-Mapbox-GL-plugin.patch b/0002-Enforce-use-of-ANGLE-in-Mapbox-GL-plugin.patch
deleted file mode 100644
index cf730a4d40db..000000000000
--- a/0002-Enforce-use-of-ANGLE-in-Mapbox-GL-plugin.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From d3a663e73d22975ab1705e02bf981e451f1241dd 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.14.2
-
diff --git a/PKGBUILD b/PKGBUILD
index 18944a382057..f7ffa03f5c17 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,26 +7,28 @@
 # Includes dynamic and static versions; if only one version is requried, just
 # set $NO_STATIC_LIBS or $NO_SHARED_LIBS.
 
+# Skip building mapboxgl as it increases compile time significantly and
+# likely not a lot of people actually using it; if you need it, just remove the
+# following line:
+_mapboxcfg='QT.global.disabled_features+=geoservices_mapboxgl'
+
 _qt_module=qtlocation
 pkgname=mingw-w64-qt5-location
-pkgver=5.9.2
+pkgver=5.10.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' 'mingw-w64-angleproject')
-optdepends=('mingw-w64-angleproject: Mapbox GL plugin')
+makedepends=('mingw-w64-gcc' 'mingw-w64-pkg-config')
 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'
-        '0002-Enforce-use-of-ANGLE-in-Mapbox-GL-plugin.patch')
-sha256sums=('c81a42e44ebd4e9c33f7195e86af3deab9fde72ef0ad8dcb04acee250d356b0c'
-            '888b3f9c8f6765abf66f67fa0f4931ef9713462a33cd9c4b583bf6dcdc431097'
-            '6dcd0992504153a7f720ff46c4998717d4db74e69f88295d2de8fc1cb981d4d1')
+_pkgfqn="${_qt_module}-everywhere-src-${pkgver}"
+source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz"
+        '0001-Ensure-static-3rdparty-libs-are-linked-correctly.patch')
+sha256sums=('d84dcec7cfbc99a13e048f935783b0c2e1cb540defc82d77ac869a5b76aa85c7'
+            'a4380c11444f11f79f5c78d76121e45aa27add611bc53204bb867fdf0832888c')
 
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 [[ $NO_STATIC_LIBS ]] || \
@@ -52,7 +54,7 @@ build() {
     for _config in "${_configurations[@]}"; do
       msg2 "Building ${_config##*=} version for ${_arch}"
       mkdir -p build-${_arch}-${_config##*=} && pushd build-${_arch}-${_config##*=}
-      ${_arch}-qmake-qt5 ../${_qt_module}.pro ${_config}
+      ${_arch}-qmake-qt5 ../${_qt_module}.pro ${_config} ${_mapboxcfg}
       make
       popd
     done