Update to 5.15.1

5 files changed, 14 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fa8e5a43282e..f58442d4f92c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mingw-w64-qt5-location
 	pkgdesc = Provides access to position, satellite and area monitoring classes (mingw-w64)
-	pkgver = 5.15.0
+	pkgver = 5.15.1
 	pkgrel = 1
 	url = https://www.qt.io/
 	arch = any
@@ -11,17 +11,15 @@ pkgbase = mingw-w64-qt5-location
 	license = custom
 	makedepends = mingw-w64-gcc
 	makedepends = mingw-w64-pkg-config
-	makedepends = mingw-w64-qt5-base-static
 	depends = mingw-w64-qt5-base
 	depends = mingw-w64-qt5-declarative
-	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.15/5.15.0/submodules/qtlocation-everywhere-src-5.15.0.tar.xz
+	source = https://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qtlocation-everywhere-src-5.15.1.tar.xz
 	source = 0001-Ensure-static-3rdparty-libs-are-linked-correctly.patch
-	sha256sums = c68b0778a521e5522641c41b1778999dd408ebfda1e0de166a83743268be5f3f
-	sha256sums = 986e6bf33dfb3e85fa7b46cdcb954899e4c66345dcb18008c5cf748660c797b3
+	sha256sums = 093af763a70d126c4b9f6a22ebf8218fe95dc0151e40666b2389fdf55c9f1a2c
+	sha256sums = 0f20c005812f031cfb70ac83f370a894819847c6e4447b2229bc50c1708dd2d0
 
 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 55b0d3f8ff68..4c019f3f3d7d 100644
--- a/0001-Ensure-static-3rdparty-libs-are-linked-correctly.patch
+++ b/0001-Ensure-static-3rdparty-libs-are-linked-correctly.patch
@@ -1,4 +1,4 @@
-From 1e8b3cfb7b54ceda75d5bc346abbdf080eda97f5 Mon Sep 17 00:00:00 2001
+From 7e32a0fe5a2c08e1a4e5d14e8d34139ccbd908c9 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
@@ -23,5 +23,5 @@ index 40605806..fa82a012 100644
      plugin.json \
      qmldir
 -- 
-2.26.2
+2.28.0
 
diff --git a/PKGBUILD b/PKGBUILD
index cca561c1b8c3..2f644443d5fb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,15 +4,12 @@
 # All my PKGBUILDs are managed at https://github.com/Martchus/PKGBUILDs where
 # you also find the URL of a binary repository.
 
-# This file is created from PKGBUILD.sh.in contained by the mentioned repository.
+# This file is created from PKGBUILD.sh.ep contained by the mentioned repository.
 # Do not edit it manually! See README.md in the repository's root directory
 # for more information.
 
 # All patches are managed at https://github.com/Martchus/qtlocation
 
-# Includes dynamic and static versions; if only one version is requried, just
-# set $NO_STATIC_LIBS or $NO_SHARED_LIBS.
-
 # Skip building mapbox and mapboxgl; that decreases the compile time significantly and
 # likely not a lot of people actually using it; if you need it, just remove the corresponding
 # qmake flags:
@@ -20,7 +17,7 @@ _additional_qmake_args+='-- -no-feature-geoservices_mapbox -no-feature-geoservic
 
 _qt_module=qtlocation
 pkgname=mingw-w64-qt5-location
-pkgver=5.15.0
+pkgver=5.15.1
 pkgrel=1
 arch=('any')
 pkgdesc='Provides access to position, satellite and area monitoring classes (mingw-w64)'
@@ -33,17 +30,12 @@ url='https://www.qt.io/'
 _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=('c68b0778a521e5522641c41b1778999dd408ebfda1e0de166a83743268be5f3f'
-            '986e6bf33dfb3e85fa7b46cdcb954899e4c66345dcb18008c5cf748660c797b3')
+sha256sums=('093af763a70d126c4b9f6a22ebf8218fe95dc0151e40666b2389fdf55c9f1a2c'
+            '0f20c005812f031cfb70ac83f370a894819847c6e4447b2229bc50c1708dd2d0')
 
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 
-[[ $NO_STATIC_LIBS ]] || \
-  makedepends+=('mingw-w64-qt5-base-static') \
-  optdepends+=('mingw-w64-qt5-base-static: use of static libraries') \
-  _configurations+=('CONFIG+=no_smart_library_merge CONFIG+=static')
-[[ $NO_SHARED_LIBS ]] || \
-  _configurations+=('CONFIG+=actually_a_shared_build CONFIG+=shared')
+_configurations+=('CONFIG+=actually_a_shared_build CONFIG+=shared')
 
 prepare() {
   cd "${srcdir}/${_pkgfqn}"
diff --git a/PKGBUILD.sh.ep b/PKGBUILD.sh.ep
index f2c0a0cf55d6..f00fb09ce0ce 100644
--- a/PKGBUILD.sh.ep
+++ b/PKGBUILD.sh.ep
@@ -12,10 +12,10 @@ _additional_qmake_args+='-- -no-feature-geoservices_mapbox -no-feature-geoservic
 
 % end
 \
-pkgver=5.15.0
+pkgver=5.15.1
 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')
+depends=(<%== qt5deps qw(base declarative) %>)
 makedepends=('mingw-w64-gcc' 'mingw-w64-pkg-config')
 license=('GPL3' 'LGPL' 'FDL' 'custom')
diff --git a/qtlocation-sha256.txt b/qtlocation-sha256.txt
index e25d843c6ecb..40c9289e8911 100644
--- a/qtlocation-sha256.txt
+++ b/qtlocation-sha256.txt
@@ -1 +1 @@
-c68b0778a521e5522641c41b1778999dd408ebfda1e0de166a83743268be5f3f
+093af763a70d126c4b9f6a22ebf8218fe95dc0151e40666b2389fdf55c9f1a2c