summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexey Rochev2020-01-04 03:29:39 +0300
committerAlexey Rochev2020-01-04 03:29:39 +0300
commit5efd2682dcd7f7c81137377a41a7187c789ec1a4 (patch)
treed1c831ed7cdebf5fc1ed78be9d6addba07eef5ad
parentebbb955c2d924f2c78e37cda362ebe9d674543c3 (diff)
downloadaur-5efd2682dcd7f7c81137377a41a7187c789ec1a4.tar.gz
Add patch to fix build with Qt 5.14
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD11
-rw-r--r--qt-5.14.patch35
3 files changed, 45 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 90ff4b11999..38ae9485a41 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = tremotesf
pkgdesc = Remote GUI for transmission-daemon
pkgver = 1.6.1
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/equeim/tremotesf2
arch = x86_64
license = GPL3
@@ -13,7 +13,9 @@ pkgbase = tremotesf
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
pkgname = tremotesf
diff --git a/PKGBUILD b/PKGBUILD
index 05abd76f985..ec0d2e6e822 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
pkgname='tremotesf'
pkgver=1.6.1
-pkgrel=1
+pkgrel=2
pkgdesc='Remote GUI for transmission-daemon'
_reponame='tremotesf2'
url="https://github.com/equeim/${_reponame}"
@@ -10,16 +10,19 @@ arch=('x86_64')
license=('GPL3')
depends=('qt5-base' 'kwidgetsaddons' 'hicolor-icon-theme')
makedepends=('qt5-tools' 'cmake' 'ninja' 'gettext')
-source=("${url}/archive/${pkgver}.tar.gz")
-sha256sums=('bd498eaa7f9cb4f05d2e19272fc09e5906a4af0a86853ee67c241adf6d70cc55')
+source=("${url}/archive/${pkgver}.tar.gz" 'qt-5.14.patch')
+sha256sums=('bd498eaa7f9cb4f05d2e19272fc09e5906a4af0a86853ee67c241adf6d70cc55'
+ '8d4985dc11168944937db09e93cf20c36c1dcbae467ee4d836c05dab2d58d5f1')
prepare() {
mkdir -p build
+ cd "${_reponame}-${pkgver}"
+ patch -Np1 -i ../qt-5.14.patch
}
build() {
cd build
- cmake ../${_reponame}-${pkgver} \
+ cmake "../${_reponame}-${pkgver}" \
-G Ninja \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_BUILD_TYPE=Release
diff --git a/qt-5.14.patch b/qt-5.14.patch
new file mode 100644
index 00000000000..9e839917020
--- /dev/null
+++ b/qt-5.14.patch
@@ -0,0 +1,35 @@
+--- 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
+ {