Switch to cmake and bump to ABC 0.21.0

3 files changed, 39 insertions, 59 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 793169c367c6..9ac3941c5695 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,14 @@
 pkgbase = bitcoin-abc-qt
-	pkgdesc = Bitcoin ABC with bitcoind, bitcoin-cli, bitcoin-tx, and bitcoin-qt
-	pkgver = 0.20.12
-	pkgrel = 2
+	pkgdesc = Bitcoin ABC with bitcoind, bitcoin-cli, bitcoin-tx, bitcoin-seeder and bitcoin-qt
+	pkgver = 0.21.0
+	pkgrel = 0
 	url = https://bitcoinabc.org
 	install = bitcoin.install
 	arch = i686
 	arch = x86_64
 	license = MIT
+	makedepends = cmake
+	makedepends = ninja
 	makedepends = boost
 	makedepends = qt5-tools
 	depends = boost-libs
@@ -22,26 +24,26 @@ pkgbase = bitcoin-abc-qt
 	provides = bitcoin-daemon
 	provides = bitcoin-tx
 	provides = bitcoin-qt
+	provides = bitcoin-seeder
 	conflicts = bitcoin-cli
 	conflicts = bitcoin-daemon
 	conflicts = bitcoin-tx
 	conflicts = bitcoin-qt
+	conflicts = bitcoin-seeder
 	backup = etc/bitcoin/bitcoin.conf
 	backup = etc/logrotate.d/bitcoin
-	source = https://github.com/Bitcoin-ABC/bitcoin-abc/archive/v0.20.12.tar.gz
+	source = https://github.com/Bitcoin-ABC/bitcoin-abc/archive/v0.21.0.tar.gz
 	source = bitcoin.conf
 	source = bitcoin.logrotate
 	source = bitcoin.service
 	source = bitcoin-reindex.service
 	source = bitcoin.install
-	source = deque.patch
-	sha256sums = f29be95fd199c28be196750dcbaf43a2f6a40dfe098838fa70b503b495a2588e
+	sha256sums = e9304832afbbf37e76aa3f90cabdf2fdc97093986412f28906a5595be55c3735
 	sha256sums = b1908344281498d39bfa40c3b9725f9c95bf22602cd46e6120a1f17bad9dae35
 	sha256sums = 8f05207b586916d489b7d25a68eaacf6e678d7cbb5bfbac551903506b32f904f
 	sha256sums = 9643eed2c20d78a9c7347df64099765773615f79d3b8a95693d871c933516880
 	sha256sums = 35ff9331d7df8b90adfc7d82752cca4f8b7ff23a29e5d10b07e4e3fc78050679
 	sha256sums = 6db7458a85a0b469ab95ad78e431d0a5db078d8809a5f4340ee040f304a9dc0d
-	sha256sums = 8bb5f7be0b24f53084dbd51ca1a3cc3ff0fbb648b6ea7723c1ab6f7bcadb7673
 
 pkgname = bitcoin-abc-qt
 
diff --git a/PKGBUILD b/PKGBUILD
index c22e10634705..20349b79f14a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,72 +1,61 @@
 # Maintainer: Josh Ellithorpe <quest@mac.com>
 
 pkgname=bitcoin-abc-qt
-pkgver=0.20.12
-pkgrel=2
-pkgdesc="Bitcoin ABC with bitcoind, bitcoin-cli, bitcoin-tx, and bitcoin-qt"
+pkgver=0.21.0
+pkgrel=0
+pkgdesc="Bitcoin ABC with bitcoind, bitcoin-cli, bitcoin-tx, bitcoin-seeder and bitcoin-qt"
 arch=('i686' 'x86_64')
 url="https://bitcoinabc.org"
 depends=('boost-libs' 'libevent' 'desktop-file-utils' 'qt5-base' 'protobuf' 'openssl' 'miniupnpc' 'zeromq' 'qrencode')
-makedepends=('boost' 'qt5-tools')
+makedepends=('cmake' 'ninja' 'boost' 'qt5-tools')
 license=('MIT')
 source=(https://github.com/Bitcoin-ABC/bitcoin-abc/archive/v$pkgver.tar.gz
         bitcoin.conf
         bitcoin.logrotate
         bitcoin.service
         bitcoin-reindex.service
-        bitcoin.install
-        deque.patch)
-sha256sums=('f29be95fd199c28be196750dcbaf43a2f6a40dfe098838fa70b503b495a2588e'
+        bitcoin.install)
+sha256sums=('e9304832afbbf37e76aa3f90cabdf2fdc97093986412f28906a5595be55c3735'
             'b1908344281498d39bfa40c3b9725f9c95bf22602cd46e6120a1f17bad9dae35'
             '8f05207b586916d489b7d25a68eaacf6e678d7cbb5bfbac551903506b32f904f'
             '9643eed2c20d78a9c7347df64099765773615f79d3b8a95693d871c933516880'
             '35ff9331d7df8b90adfc7d82752cca4f8b7ff23a29e5d10b07e4e3fc78050679'
-            '6db7458a85a0b469ab95ad78e431d0a5db078d8809a5f4340ee040f304a9dc0d'
-            '8bb5f7be0b24f53084dbd51ca1a3cc3ff0fbb648b6ea7723c1ab6f7bcadb7673')
+            '6db7458a85a0b469ab95ad78e431d0a5db078d8809a5f4340ee040f304a9dc0d')
 backup=('etc/bitcoin/bitcoin.conf'
         'etc/logrotate.d/bitcoin')
-provides=('bitcoin-cli' 'bitcoin-daemon' 'bitcoin-tx' 'bitcoin-qt')
-conflicts=('bitcoin-cli' 'bitcoin-daemon' 'bitcoin-tx' 'bitcoin-qt')
+provides=('bitcoin-cli' 'bitcoin-daemon' 'bitcoin-tx' 'bitcoin-qt' 'bitcoin-seeder')
+conflicts=('bitcoin-cli' 'bitcoin-daemon' 'bitcoin-tx' 'bitcoin-qt' 'bitcoin-seeder')
 install=bitcoin.install
 
 build() {
   cd "$srcdir/bitcoin-abc-$pkgver"
 
   msg2 'Building...'
-  patch -p1 < ../deque.patch
-  ./autogen.sh
-  ./configure \
-    --prefix=/usr \
-    --libexecdir=/usr/lib/bitcoin \
-    --sysconfdir=/etc \
-    --sharedstatedir=/usr/share/bitcoin \
-    --localstatedir=/var/lib/bitcoin \
-    --enable-hardening \
-    --with-gui=qt5 \
-    --with-gnu-ld \
-    --with-incompatible-bdb \
-    --disable-maintainer-mode \
-    --enable-reduce-exports \
-    --disable-gui-tests \
-    --enable-static
-  make
+  mkdir -p build
+  pushd build
+
+  cmake -GNinja .. \
+    -DENABLE_CLANG_TIDY=OFF \
+    -DCLIENT_VERSION_IS_RELEASE=ON \
+    -DENABLE_REDUCE_EXPORTS=ON \
+    -DENABLE_STATIC_LIBSTDCXX=ON \
+    -DCMAKE_INSTALL_PREFIX=$pkgdir/usr
+
+  ninja
+  popd
 }
 
 check() {
-  cd "$srcdir/bitcoin-abc-$pkgver"
+  cd "$srcdir/bitcoin-abc-$pkgver/build"
 
   msg2 'Testing...'
-  make check
+  ninja check
 }
 
 package() {
   cd "$srcdir/bitcoin-abc-$pkgver"
 
-  msg2 'Fixing core references...'
-  sed -i -e 's/Bitcoin Core/Bitcoin ABC/g' contrib/debian/bitcoin-qt.desktop
-
-  msg2 'Installing wallet...'
-  install -Dm755 src/qt/bitcoin-qt "$pkgdir"/usr/bin/bitcoin-qt
+  msg2 'Installing desktop shortcut...'
   install -Dm644 contrib/debian/bitcoin-qt.desktop \
     "$pkgdir"/usr/share/applications/bitcoin.desktop
   install -Dm644 share/pixmaps/bitcoin-abc128.png \
@@ -75,9 +64,6 @@ package() {
   msg2 'Installing license...'
   install -Dm 644 COPYING -t "$pkgdir/usr/share/licenses/${pkgname}"
 
-  msg2 'Installing man pages...'
-  install -Dm 644 doc/man/*.1 -t "$pkgdir/usr/share/man/man1"
-
   msg2 'Installing examples...'
   install -Dm644 "contrib/debian/examples/bitcoin.conf" \
     -t "$pkgdir/usr/share/doc/bitcoin/examples"
@@ -95,8 +81,12 @@ package() {
   install -dm 700 "$pkgdir/etc/bitcoin"
   install -dm 755 "$pkgdir/srv/bitcoin"
 
-  msg2 'Installing bitcoin...'
-  make DESTDIR="$pkgdir" install
+  pushd build
+  msg2 'Installing executables and man pages...'
+  cmake -DCOMPONENT=bitcoind -P cmake_install.cmake
+  cmake -DCOMPONENT=bitcoin-qt -P cmake_install.cmake
+  cmake -DCOMPONENT=bitcoin-seeder -P cmake_install.cmake
+  popd
 
   msg2 'Installing bitcoin.conf...'
   install -Dm 600 "$srcdir/bitcoin.conf" -t "$pkgdir/etc/bitcoin"
diff --git a/deque.patch b/deque.patch
deleted file mode 100644
index d00ee661a95d..000000000000
--- a/deque.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/httpserver.cpp b/src/httpserver.cpp
-index d9beebc..9d2806e 100644
---- a/src/httpserver.cpp
-+++ b/src/httpserver.cpp
-@@ -39,6 +39,7 @@
- #include <cstdlib>
- #include <cstring>
- #include <future>
-+#include <deque>
- #include <memory>
- 
- /** Maximum size of http request (request line + headers) */