summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaximilian Weiss2022-04-29 07:35:57 -0700
committerMaximilian Weiss2022-04-29 07:35:57 -0700
commite9c101e785cafb83b06e4f8476ac5cee7f9bf01d (patch)
treee70498f253f2d42ece130b3a04160d5a290258e5
parent2c76798ce98ccea36cc50b83f802a72125096927 (diff)
downloadaur-e9c101e785cafb83b06e4f8476ac5cee7f9bf01d.tar.gz
Fix build error with v23
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD11
-rw-r--r--fix.patch12
3 files changed, 23 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 98e826816404..40b92259ba31 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
pkgbase = namecoin-core-wallet
pkgdesc = This package provides the Namecoin Core GUI client, CLI daemon, and daemon user service.
pkgver = v23.0
- pkgrel = 1
- epoch = 1651238671
+ pkgrel = 2
+ epoch = 1651238672
url = https://namecoin.org/
arch = i686
arch = x86_64
@@ -39,10 +39,12 @@ pkgbase = namecoin-core-wallet
source = namecoin1500x1500.png
source = namecoind.service
source = namecoind@.service
+ source = fix.patch
sha256sums = SKIP
sha256sums = 0226f5a570bbbde63f332d43d9d712287b316c726280f2ae9e21b1b365b3f0dc
sha256sums = f1e0593b872e18e0aebbf399bb5d77be255cb0aa160964c0528698a33f89ba04
sha256sums = 0a8cb03f33a895ccaed63fb9d946db69bee7188b7a9f41bc92879167c2718dcf
sha256sums = 216bf1642feb5c37cc82a0801faf0717308f98e5aed86d75dac8fafd150a4b68
+ sha256sums = bd15bfc46bb56634c1bec23435e2275cfafc3a93abf8cbc3a038b81505e2e8b0
pkgname = namecoin-core-wallet
diff --git a/PKGBUILD b/PKGBUILD
index 64a9f64dacc0..825e9096c02e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,12 +7,12 @@
pkgname=namecoin-core-wallet
pkgver=v23.0
-pkgrel=1
+pkgrel=2
# Epoch is always set to the most recent PKGBUILD update time.
# This allows for a forced downgrade without messing up versioning.
-epoch=1651238671
+epoch=1651238672
# Release commit for 23.0
@@ -35,19 +35,22 @@ source=('git+https://github.com/namecoin/namecoin-core'
'namecoin.desktop'
'namecoin1500x1500.png'
'namecoind.service'
- 'namecoind@.service')
+ 'namecoind@.service'
+ 'fix.patch')
sha256sums=('SKIP'
'0226f5a570bbbde63f332d43d9d712287b316c726280f2ae9e21b1b365b3f0dc'
'f1e0593b872e18e0aebbf399bb5d77be255cb0aa160964c0528698a33f89ba04'
'0a8cb03f33a895ccaed63fb9d946db69bee7188b7a9f41bc92879167c2718dcf'
- '216bf1642feb5c37cc82a0801faf0717308f98e5aed86d75dac8fafd150a4b68')
+ '216bf1642feb5c37cc82a0801faf0717308f98e5aed86d75dac8fafd150a4b68'
+ 'bd15bfc46bb56634c1bec23435e2275cfafc3a93abf8cbc3a038b81505e2e8b0')
prepare() {
mkdir -p "$srcdir/tmp"
cd "$srcdir/namecoin-core/"
git checkout "$_commit"
+ git apply "$srcdir/fix.patch"
}
diff --git a/fix.patch b/fix.patch
new file mode 100644
index 000000000000..ffc5f4e2e773
--- /dev/null
+++ b/fix.patch
@@ -0,0 +1,12 @@
+diff --git a/src/qt/buynamespage.h b/src/qt/buynamespage.h
+index 041848213..46f37658b 100644
+--- a/src/qt/buynamespage.h
++++ b/src/qt/buynamespage.h
+@@ -4,6 +4,7 @@
+ #include <qt/platformstyle.h>
+
+ #include <QWidget>
++#include <optional>
+
+ class WalletModel;
+