summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Barz2019-09-23 13:16:24 +0200
committerFelix Barz2019-09-23 13:16:24 +0200
commit0cff9228a1049035bc902672eb28a69f9dc1dd93 (patch)
tree06c3d307f89442cff93a1ed3d421a07f3c8d50ad
parenta61056867db987da530086a2a6bc74163f0c4988 (diff)
downloadaur-qpmx.tar.gz
patch to build against latest json serializer
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD5
-rw-r--r--jsonserializer.patch17
3 files changed, 24 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 949af5f96f71..49f0807fd0aa 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = qpmx
pkgdesc = A frontend for qpm, to provide source and build caching
pkgver = 1.6.0
- pkgrel = 2
+ pkgrel = 3
url = https://github.com/Skycoder42/qpmx
arch = i686
arch = x86_64
@@ -11,9 +11,11 @@ pkgbase = qpmx
depends = qt5-base
depends = qt5-jsonserializer
source = qpmx-1.6.0::git+https://github.com/Skycoder42/qpmx.git#tag=1.6.0
+ source = jsonserializer.patch
source = qpmx.rule
source = plugin.rule
sha256sums = SKIP
+ sha256sums = 9aea1f15a4ca3f7a42bbc15d2e837a65c4fff6b4d991352a935a18513a6abd35
sha256sums = 13f2e499671cb094ff244946b733a8e6898152fe60c77cb93bef1e1a19ffbd0e
sha256sums = a7f6099680d692285332ae7db3cf1414f4d664ceccb701d45ac73ecaa08a65dc
diff --git a/PKGBUILD b/PKGBUILD
index 8b51d6265528..d8c85c2570bf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@ pkgbase=qpmx
pkgname=(qpmx qpmx-gitsource qpmx-qpmsource)
group=qpmx-full
pkgver=1.6.0
-pkgrel=2
+pkgrel=3
pkgdesc="A frontend for qpm, to provide source and build caching"
arch=('i686' 'x86_64')
url="https://github.com/Skycoder42/$pkgname"
@@ -12,9 +12,11 @@ depends=('qt5-base' 'qt5-jsonserializer')
makedepends=('qt5-tools' 'git')
_pkgfqn=$pkgname-$pkgver
source=("$_pkgfqn::git+https://github.com/Skycoder42/$pkgname.git#tag=$pkgver"
+ "jsonserializer.patch"
"$pkgname.rule"
"plugin.rule")
sha256sums=('SKIP'
+ '9aea1f15a4ca3f7a42bbc15d2e837a65c4fff6b4d991352a935a18513a6abd35'
'13f2e499671cb094ff244946b733a8e6898152fe60c77cb93bef1e1a19ffbd0e'
'a7f6099680d692285332ae7db3cf1414f4d664ceccb701d45ac73ecaa08a65dc')
@@ -35,6 +37,7 @@ prepare() {
git_submod_rm submodules/qpmx-sample-package
git submodule update --init --recursive
+ git apply ../jsonserializer.patch
}
build() {
diff --git a/jsonserializer.patch b/jsonserializer.patch
new file mode 100644
index 000000000000..6465d1c53e7d
--- /dev/null
+++ b/jsonserializer.patch
@@ -0,0 +1,17 @@
+diff --git a/qpmx/qpmxformat.h b/qpmx/qpmxformat.h
+index 0555c28..7c869f9 100644
+--- a/qpmx/qpmxformat.h
++++ b/qpmx/qpmxformat.h
+@@ -189,4 +189,12 @@ Q_DECLARE_METATYPE(QpmxDevAlias)
+ Q_DECLARE_METATYPE(QpmxUserFormat)
+ Q_DECLARE_METATYPE(QpmxCacheFormat)
+
++inline uint qHash(const QpmxDependency &, uint seed) { return seed; }
++inline uint qHash(const QpmxFormatLicense &, uint seed) { return seed; }
++inline uint qHash(const QpmxFormat &, uint seed) { return seed; }
++inline uint qHash(const QpmxDevDependency &, uint seed) { return seed; }
++inline uint qHash(const QpmxDevAlias &, uint seed) { return seed; }
++inline uint qHash(const QpmxUserFormat &, uint seed) { return seed; }
++inline uint qHash(const QpmxCacheFormat &, uint seed) { return seed; }
++
+ #endif // QPMXFORMAT_H