Update to 5.14.2

5 files changed, 8 insertions, 48 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e8c8650fdc32..54238777eeb9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mingw-w64-qt5-connectivity
 	pkgdesc = Provides access to Bluetooth hardware (mingw-w64)
-	pkgver = 5.14.1
+	pkgver = 5.14.2
 	pkgrel = 1
 	url = https://www.qt.io/
 	arch = any
@@ -18,10 +18,8 @@ pkgbase = mingw-w64-qt5-connectivity
 	options = !strip
 	options = !buildflags
 	options = staticlibs
-	source = https://download.qt.io/official_releases/qt/5.14/5.14.1/submodules/qtconnectivity-everywhere-src-5.14.1.tar.xz
-	source = 0001-Fix-case-of-setupapi.h-for-mingw-w64.patch
-	sha256sums = ef0cb1883c0e765cacf6c8b9422997b93fd861cf2289e56791615401eefa2d72
-	sha256sums = f78533cd673d15d81b8ab136c892d7e1b61569bb84b48b27345dfa8d6dc3123b
+	source = https://download.qt.io/official_releases/qt/5.14/5.14.2/submodules/qtconnectivity-everywhere-src-5.14.2.tar.xz
+	sha256sums = abe67b3e3a775e2a2e27c62a5391f37007ffbe72bce58b96116995616cfcbc28
 
 pkgname = mingw-w64-qt5-connectivity
 
diff --git a/0001-Fix-case-of-setupapi.h-for-mingw-w64.patch b/0001-Fix-case-of-setupapi.h-for-mingw-w64.patch
deleted file mode 100644
index 02e348f73d9a..000000000000
--- a/0001-Fix-case-of-setupapi.h-for-mingw-w64.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 7c08a83848ab4102d2ec4a98c503c7ace26e3e24 Mon Sep 17 00:00:00 2001
-From: Martchus <martchus@gmx.net>
-Date: Tue, 24 Dec 2019 13:06:11 +0100
-Subject: [PATCH] Fix case of setupapi.h for mingw-w64
-
----
- src/bluetooth/qlowenergycontroller_win.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/bluetooth/qlowenergycontroller_win.cpp b/src/bluetooth/qlowenergycontroller_win.cpp
-index ced69685..7a30be9a 100644
---- a/src/bluetooth/qlowenergycontroller_win.cpp
-+++ b/src/bluetooth/qlowenergycontroller_win.cpp
-@@ -51,7 +51,7 @@
- 
- #include <algorithm> // for std::max
- 
--#include <SetupAPI.h>
-+#include <setupapi.h>
- 
- QT_BEGIN_NAMESPACE
- 
--- 
-2.25.0
-
diff --git a/PKGBUILD b/PKGBUILD
index ff1649e0786d..b7fcec7d35af 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,14 +7,12 @@
 # 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/qtconnectivity
-
 # Includes dynamic and static versions; if only one version is requried, just
 # set $NO_STATIC_LIBS or $NO_SHARED_LIBS.
 
 _qt_module=qtconnectivity
 pkgname=mingw-w64-qt5-connectivity
-pkgver=5.14.1
+pkgver=5.14.2
 pkgrel=1
 arch=('any')
 pkgdesc="Provides access to Bluetooth hardware (mingw-w64)"
@@ -25,10 +23,8 @@ options=('!strip' '!buildflags' 'staticlibs')
 groups=('mingw-w64-qt5')
 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-Fix-case-of-setupapi.h-for-mingw-w64.patch')
-sha256sums=('ef0cb1883c0e765cacf6c8b9422997b93fd861cf2289e56791615401eefa2d72'
-            'f78533cd673d15d81b8ab136c892d7e1b61569bb84b48b27345dfa8d6dc3123b')
+source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz")
+sha256sums=('abe67b3e3a775e2a2e27c62a5391f37007ffbe72bce58b96116995616cfcbc28')
 
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 
@@ -39,15 +35,6 @@ _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 [[ $NO_SHARED_LIBS ]] || \
   _configurations+=('CONFIG+=actually_a_shared_build CONFIG+=shared')
 
-prepare() {
-  cd "${srcdir}/${_pkgfqn}"
-
-  # apply patches; further descriptions can be found in patch files itself
-  for patch in "$srcdir/"*.patch; do
-    patch -p1 -i "$patch"
-  done
-}
-
 build() {
   cd "${srcdir}/${_pkgfqn}"
 
diff --git a/PKGBUILD.sh.ep b/PKGBUILD.sh.ep
index 0a9838db0c9a..a8ebb6b47aa3 100644
--- a/PKGBUILD.sh.ep
+++ b/PKGBUILD.sh.ep
@@ -1,6 +1,6 @@
 % layout 'mingw-w64-qt5-module';
 \
-pkgver=5.14.1
+pkgver=5.14.2
 pkgrel=1
 arch=('any')
 pkgdesc="Provides access to Bluetooth hardware (mingw-w64)"
diff --git a/qtconnectivity-sha256.txt b/qtconnectivity-sha256.txt
index 5aa118ad3e81..05f086433dd8 100644
--- a/qtconnectivity-sha256.txt
+++ b/qtconnectivity-sha256.txt
@@ -1 +1 @@
-ef0cb1883c0e765cacf6c8b9422997b93fd861cf2289e56791615401eefa2d72
+abe67b3e3a775e2a2e27c62a5391f37007ffbe72bce58b96116995616cfcbc28