Update to 5.12.2

4 files changed, 11 insertions, 60 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 53cc458d2ecf..6a3527ff0941 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mingw-w64-qt5-tools
 	pkgdesc = A cross-platform application and UI framework (Development Tools, QtHelp; mingw-w64)
-	pkgver = 5.12.1
+	pkgver = 5.12.2
 	pkgrel = 1
 	url = https://www.qt.io/
 	arch = i686
@@ -20,12 +20,10 @@ pkgbase = mingw-w64-qt5-tools
 	options = !strip
 	options = !buildflags
 	options = staticlibs
-	source = https://download.qt.io/official_releases/qt/5.12/5.12.1/submodules/qttools-everywhere-src-5.12.1.tar.xz
+	source = https://download.qt.io/official_releases/qt/5.12/5.12.2/submodules/qttools-everywhere-src-5.12.2.tar.xz
 	source = 0001-Fix-linguist-macro.patch
-	source = 0002-Make-windeployqt-cross-platform-again.patch
-	sha256sums = ab1da4fbd84a9d3873e4ed212a0ae614c6059b8e7dca2f0a599a6f7e61f6cbf3
-	sha256sums = af21681c33589ae384c6582091ac9fe2b09abae33af19c8b0d5eb840c38d20ce
-	sha256sums = ce38a762867b988de6b9b4ecea21272a19132c855c1a7438c9754ae2a8b0ee5f
+	sha256sums = 4aa3a089794ab1c629b666fffb5da4371351a9e85ea691d5d988c2ff63586005
+	sha256sums = 6b1c35f587b31a0ec6aa813b836ea671b31639e7832351a9960402708f7d7906
 
 pkgname = mingw-w64-qt5-tools
 
diff --git a/0001-Fix-linguist-macro.patch b/0001-Fix-linguist-macro.patch
index f3efcd7b1bc1..953a2819184b 100644
--- a/0001-Fix-linguist-macro.patch
+++ b/0001-Fix-linguist-macro.patch
@@ -1,7 +1,7 @@
-From d5b1888554bb78bd4a96705caa557bfae357e9fb Mon Sep 17 00:00:00 2001
+From 98202039059e7f96c2d6962a83c416cdcc2fd0b4 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 25 Sep 2016 21:44:42 +0200
-Subject: [PATCH 1/2] Fix linguist macro
+Subject: [PATCH] Fix linguist macro
 
 - Prevent CMake appending extra 'Qt5::lupdate'/'Qt5::lrelease' to
   command line when invoking lupdate/lrelease
@@ -38,5 +38,5 @@ index b9959730..75776e0e 100644
              DEPENDS ${_abs_FILE} VERBATIM
          )
 -- 
-2.20.1
+2.21.0
 
diff --git a/0002-Make-windeployqt-cross-platform-again.patch b/0002-Make-windeployqt-cross-platform-again.patch
deleted file mode 100644
index d904098f8072..000000000000
--- a/0002-Make-windeployqt-cross-platform-again.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 230f11ae808dbb73b7675030b024fe63e0982397 Mon Sep 17 00:00:00 2001
-From: Martchus <martchus@gmx.net>
-Date: Sun, 3 Feb 2019 17:40:35 +0100
-Subject: [PATCH 2/2] Make windeployqt cross-platform (again)
-
----
- src/windeployqt/main.cpp | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/src/windeployqt/main.cpp b/src/windeployqt/main.cpp
-index 955a3077..2ad1a177 100644
---- a/src/windeployqt/main.cpp
-+++ b/src/windeployqt/main.cpp
-@@ -40,7 +40,12 @@
- #include <QtCore/QOperatingSystemVersion>
- #include <QtCore/QSharedPointer>
- #include <QtCore/QVector>
-+
-+#ifdef Q_OS_WIN
- #include <QtCore/qt_windows.h>
-+#else
-+#define IMAGE_FILE_MACHINE_ARM64 0xaa64
-+#endif
- 
- #include <algorithm>
- #include <iostream>
-@@ -1100,6 +1105,7 @@ static QStringList compilerRunTimeLibs(Platform platform, bool isDebug, unsigned
-                 result.append(dllFi.absoluteFilePath());
-     }
-         break;
-+#ifdef Q_OS_WIN
-     case WindowsDesktop: { // MSVC/Desktop: Add redistributable packages.
-         QString vcRedistDirName = vcRedistDir();
-         if (vcRedistDirName.isEmpty())
-@@ -1138,6 +1144,7 @@ static QStringList compilerRunTimeLibs(Platform platform, bool isDebug, unsigned
-         }
-         result.append(redistFiles);
-     }
-+#endif
-     default:
-         break;
-     }
--- 
-2.20.1
-
diff --git a/PKGBUILD b/PKGBUILD
index ec73e0136d34..c5c5394fe8f1 100644..100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -16,7 +16,7 @@
 
 _qt_module=qttools
 pkgname="mingw-w64-qt5-tools"
-pkgver=5.12.1
+pkgver=5.12.2
 pkgrel=1
 arch=('i686' 'x86_64')
 pkgdesc="A cross-platform application and UI framework (Development Tools, QtHelp; mingw-w64)"
@@ -28,11 +28,9 @@ license=('GPL3' 'LGPL3' 'FDL' 'custom')
 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-linguist-macro.patch'
-        '0002-Make-windeployqt-cross-platform-again.patch')
-sha256sums=('ab1da4fbd84a9d3873e4ed212a0ae614c6059b8e7dca2f0a599a6f7e61f6cbf3'
-            'af21681c33589ae384c6582091ac9fe2b09abae33af19c8b0d5eb840c38d20ce'
-            'ce38a762867b988de6b9b4ecea21272a19132c855c1a7438c9754ae2a8b0ee5f')
+        '0001-Fix-linguist-macro.patch')
+sha256sums=('4aa3a089794ab1c629b666fffb5da4371351a9e85ea691d5d988c2ff63586005'
+            '6b1c35f587b31a0ec6aa813b836ea671b31639e7832351a9960402708f7d7906')
 
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'