1.6.3

3 files changed, 8 insertions, 48 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 38ae9485a412..e9ad7539cceb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = tremotesf
 	pkgdesc = Remote GUI for transmission-daemon
-	pkgver = 1.6.1
-	pkgrel = 2
+	pkgver = 1.6.3
+	pkgrel = 1
 	url = https://github.com/equeim/tremotesf2
 	arch = x86_64
 	license = GPL3
@@ -12,10 +12,8 @@ pkgbase = tremotesf
 	depends = qt5-base
 	depends = kwidgetsaddons
 	depends = hicolor-icon-theme
-	source = https://github.com/equeim/tremotesf2/archive/1.6.1.tar.gz
-	source = qt-5.14.patch
-	sha256sums = bd498eaa7f9cb4f05d2e19272fc09e5906a4af0a86853ee67c241adf6d70cc55
-	sha256sums = 8d4985dc11168944937db09e93cf20c36c1dcbae467ee4d836c05dab2d58d5f1
+	source = https://github.com/equeim/tremotesf2/archive/1.6.3.tar.gz
+	sha256sums = a4ae32edde72d629e0897bbf71cc674732787ba21b3d8b8151e1bb13e299b5f8
 
 pkgname = tremotesf
 
diff --git a/PKGBUILD b/PKGBUILD
index ec0d2e6e8220..bc0ebed2c653 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Alexey Rochev <equeim@gmail.com>
 
 pkgname='tremotesf'
-pkgver=1.6.1
-pkgrel=2
+pkgver=1.6.3
+pkgrel=1
 pkgdesc='Remote GUI for transmission-daemon'
 _reponame='tremotesf2'
 url="https://github.com/equeim/${_reponame}"
@@ -10,14 +10,11 @@ arch=('x86_64')
 license=('GPL3')
 depends=('qt5-base' 'kwidgetsaddons' 'hicolor-icon-theme')
 makedepends=('qt5-tools' 'cmake' 'ninja' 'gettext')
-source=("${url}/archive/${pkgver}.tar.gz" 'qt-5.14.patch')
-sha256sums=('bd498eaa7f9cb4f05d2e19272fc09e5906a4af0a86853ee67c241adf6d70cc55'
-            '8d4985dc11168944937db09e93cf20c36c1dcbae467ee4d836c05dab2d58d5f1')
+source=("${url}/archive/${pkgver}.tar.gz")
+sha256sums=('a4ae32edde72d629e0897bbf71cc674732787ba21b3d8b8151e1bb13e299b5f8')
 
 prepare() {
     mkdir -p build
-    cd "${_reponame}-${pkgver}"
-    patch -Np1 -i ../qt-5.14.patch
 }
 
 build() {
diff --git a/qt-5.14.patch b/qt-5.14.patch
deleted file mode 100644
index 9e8399170204..000000000000
--- a/qt-5.14.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- a/src/libtremotesf/stdutils.h
-+++ b/src/libtremotesf/stdutils.h
-@@ -25,26 +25,27 @@
- #include <QHash>
- #include <QString>
- 
-+#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
- namespace std {
-     template<>
-     class hash<QString> {
-     public:
--        size_t operator()(const QString& string) const
-+        size_t operator()(const QString& string) const noexcept(noexcept(qHash(string)))
-         {
--            return qHash(string);
-+            return qHash(string, qHash(std::hash<int>{}(0)));
-         }
-     };
- 
-     template<>
-     class hash<QByteArray> {
-     public:
--        size_t operator()(const QByteArray& bytes) const
-+        size_t operator()(const QByteArray& bytes) const noexcept(noexcept(qHash(bytes)))
-         {
--            return qHash(bytes);
-+            return qHash(bytes, qHash(std::hash<int>{}(0)));
-         }
-     };
- }
--
-+#endif
- 
- namespace tremotesf
- {