Switch to source and add deque patch

3 files changed, 104 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e13ddb2547df..ac28afb5dbfa 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = axecore
 	pkgdesc = Axe Core (AXE) is an open source cryptocurrency.
 	pkgver = 1.5.0.1
-	pkgrel = 7
+	pkgrel = 8
 	url = https://axerunners.com/
 	arch = x86_64
 	license = MIT
@@ -12,8 +12,8 @@ pkgbase = axecore
 	makedepends = libtool
 	makedepends = make
 	makedepends = pkg-config
-	makedepends = protobuf
 	makedepends = qt5-tools
+	makedepends = codablock-bls-signatures
 	depends = qt5-base
 	depends = boost
 	depends = boost-libs
@@ -24,21 +24,24 @@ pkgbase = axecore
 	depends = libevent
 	depends = qrencode
 	depends = libbacktrace-git
-	provides = axed
+	provides = axe-daemon
 	provides = axe-qt
 	provides = axe-cli
-	provides = axe-tx
+	conflicts = axecore-git
+	conflicts = axecore-bin
+	conflicts = axe-cli
+	conflicts = axe-qt
+	conflicts = axe-daemon
 	source = axe256.png
 	source = axe-qt.desktop
-	source = COPYING
-	source = https://github.com/axerunners/axe/releases/download/v1.5.0.1/axecore-1.5.0.1-x86_64-linux-gnu.tar.gz
-	source = https://github.com/axerunners/axe/releases/download/v1.5.0.1/axecore-1.5.0.1-x86_64-linux-gnu.tar.gz.asc
-	validpgpkeys = 04B29AF0DA5F8EBD019C74BA278F2A095AC27140
+	source = deque.patch
+	source = https://github.com/axerunners/axe/blob/master/COPYING
+	source = https://github.com/axerunners/axe/archive/v1.5.0.1.tar.gz
 	sha256sums = 595802457042857d57d3437d4c904b524c250a06b8fa9c1f7f857ad3775bafab
 	sha256sums = c6971f66cbbc7acb74885d35d5f7a9b42ada9a95e864f9c71e67d6f9e8264900
-	sha256sums = 9277abe7d3462deb49df07221f13643c2aa55ebc10725c0b9d6d82df8dd7b457
+	sha256sums = ded0b32ec96d8cbe996557d57c1c31583d30567377d3e9a0c3168f0aec3c817e
+	sha256sums = 828c49a2a7f37e81efd8e6f2a40f073f05f391e6d8d7e3a23910b220ae0809eb
 	sha256sums = 7669039c7370c88d6f38e20838e9ab20ae9b3fefca0b658e3e65f3517bd8dd2d
-	sha256sums = SKIP
 
 pkgname = axecore
 
diff --git a/PKGBUILD b/PKGBUILD
index c93a22a14f1c..7fde336fb369 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,31 +3,51 @@
 # Based on PKGBUILD from dashcore maintained by pizzaman
 
 pkgname='axecore'
+_pkgname='axe'
 pkgver=1.5.0.1
-pkgrel=7
+pkgrel=8
 pkgdesc="Axe Core (AXE) is an open source cryptocurrency."
 arch=('x86_64')
 url="https://axerunners.com/"
 license=('MIT')
 depends=('qt5-base' 'boost' 'boost-libs' 'miniupnpc' 'protobuf' 'db4.8' 'zeromq' 'libevent' 'qrencode' 'libbacktrace-git')
-makedepends=('autoconf' 'automake' 'binutils' 'gcc' 'libtool' 'make' 'pkg-config' 'protobuf' 'qt5-tools')
-provides=('axed' 'axe-qt' 'axe-cli' 'axe-tx')
+makedepends=('autoconf' 'automake' 'binutils' 'gcc' 'libtool' 'make' 'pkg-config' 'qt5-tools' 'codablock-bls-signatures')
+provides=('axe-daemon' 'axe-qt' 'axe-cli')
+conflicts=('axecore-git' 'axecore-bin' 'axe-cli' 'axe-qt' 'axe-daemon')
 source=('axe256.png'
-  'axe-qt.desktop'
-  'COPYING'
-  "https://github.com/axerunners/axe/releases/download/v${pkgver}/${pkgname}-${pkgver}-$CARCH-linux-gnu.tar.gz"{,.asc})
+        'axe-qt.desktop'
+        'deque.patch'
+        'https://github.com/axerunners/axe/blob/master/COPYING'
+        "https://github.com/axerunners/axe/archive/v${pkgver}.tar.gz")
 sha256sums=('595802457042857d57d3437d4c904b524c250a06b8fa9c1f7f857ad3775bafab'
             'c6971f66cbbc7acb74885d35d5f7a9b42ada9a95e864f9c71e67d6f9e8264900'
-            '9277abe7d3462deb49df07221f13643c2aa55ebc10725c0b9d6d82df8dd7b457'
-            '7669039c7370c88d6f38e20838e9ab20ae9b3fefca0b658e3e65f3517bd8dd2d'
-            'SKIP')
-validpgpkeys=('04B29AF0DA5F8EBD019C74BA278F2A095AC27140')
+            'ded0b32ec96d8cbe996557d57c1c31583d30567377d3e9a0c3168f0aec3c817e'
+            '828c49a2a7f37e81efd8e6f2a40f073f05f391e6d8d7e3a23910b220ae0809eb'
+            '7669039c7370c88d6f38e20838e9ab20ae9b3fefca0b658e3e65f3517bd8dd2d')
+
+prepare () {
+  cd "$_pkgname-$pkgver"
+ #deque patch 2020-02-12
+ #inlcude deque.h library in httpserver.cpp found in https://github.com/dogecoin/dogecoin/pull/1626
+ #will delete when axe fixes/commits this.
+  patch --forward --strip=1 --input="../../deque.patch"
+}
+
+build() {
+  CXXFLAGS+=" -fPIC -DBOOST_VARIANT_USE_RELAXED_GET_BY_DEFAULT=1"
+  cd "$_pkgname-$pkgver"
+  CPPFLAGS="${CPPFLAGS} -I$PWD/depends/built/$CARCH-pc-linux-gnu/include"
+  LDFLAGS="${LDFLAGS} -L${PWD}/depends/built/$CARCH-pc-linux-gnu/lib -L${PWD}/depends/built/$CARCH-pc-linux-gnu/lib64"
+  ./autogen.sh
+  ./configure --prefix=`pwd`/depends/$CARCH-pc-linux-gnu --with-incompatible-bdb --with-gui=qt5 --enable-tests=no --enable-hardening
+  make
+}
 
 package() {
-  install -D -m755 "$srcdir/$pkgname-${pkgver%.*}/bin/axe-qt" "$pkgdir/usr/bin/axe-qt"
-  install -D -m755 "$srcdir/$pkgname-${pkgver%.*}/bin/axed" "$pkgdir/usr/bin/axed"
-  install -D -m755 "$srcdir/$pkgname-${pkgver%.*}/bin/axe-cli" "$pkgdir/usr/bin/axe-cli"
-  install -D -m755 "$srcdir/$pkgname-${pkgver%.*}/bin/axe-tx" "$pkgdir/usr/bin/axe-tx"
+  install -D -m755 "$srcdir/$_pkgname-${pkgver}/src/qt/axe-qt" "$pkgdir/usr/bin/axe-qt"
+  install -D -m755 "$srcdir/$_pkgname-${pkgver}/src/axed" "$pkgdir/usr/bin/axed"
+  install -D -m755 "$srcdir/$_pkgname-${pkgver}/src/axe-cli" "$pkgdir/usr/bin/axe-cli"
+  install -D -m755 "$srcdir/$_pkgname-${pkgver}/src/axe-tx" "$pkgdir/usr/bin/axe-tx"
   install -D -m644 "COPYING" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
   install -D -m644 "axe256.png" "$pkgdir/usr/share/pixmaps/axe256.png"
   install -D -m644 "axe-qt.desktop" "$pkgdir/usr/share/applications/axe-qt.desktop"
diff --git a/deque.patch b/deque.patch
new file mode 100644
index 000000000000..2c0a4561701e
--- /dev/null
+++ b/deque.patch
@@ -0,0 +1,57 @@
+From d53a3bebee798e54a83fa49e8abd7e0e3f719e03 Mon Sep 17 00:00:00 2001
+From: Bertrand Jacquin <bertrand@jacquin.bzh>
+Date: Fri, 24 Jan 2020 20:16:27 +0000
+Subject: [PATCH] httpserver: include deque
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+It seems gcc 9.2.0 requires deque to be included:
+
+  x86_64-pc-linux-gnu-g++ -std=c++11 -DHAVE_CONFIG_H -I. -I../src/config   -I. -I./obj -I/usr/include/db5.1/ -pthread -I/usr/include -I./leveldb/include -I./leveldb/helpers/memenv   -I./secp256k1/include    -pthread -I/usr/include/db5.1 -DHAVE_BUILD_INFO -D__STDC_FORMAT_MACROS    -march=native -O2 -pipe -fomit-frame-pointer -c -o libdogecoin_server_a-httpserver.o `test -f 'httpserver.cpp' || echo './'`httpserver.cpp
+  httpserver.cpp:71:10: error: ‘deque’ in namespace ‘std’ does not name a template type
+     71 |     std::deque<std::unique_ptr<WorkItem>> queue;
+        |          ^~~~~
+  httpserver.cpp:30:1: note: ‘std::deque’ is defined in header ‘<deque>’; did you forget to ‘#include <deque>’?
+     29 | #include <event2/keyvalq_struct.h>
+    +++ |+#include <deque>
+     30 |
+  httpserver.cpp: In member function ‘bool WorkQueue<WorkItem>::Enqueue(WorkItem*)’:
+  httpserver.cpp:110:13: error: ‘queue’ was not declared in this scope; did you mean ‘Enqueue’?
+    110 |         if (queue.size() >= maxDepth) {
+        |             ^~~~~
+        |             Enqueue
+  httpserver.cpp:113:9: error: ‘queue’ was not declared in this scope; did you mean ‘Enqueue’?
+    113 |         queue.emplace_back(std::unique_ptr<WorkItem>(item));
+        |         ^~~~~
+        |         Enqueue
+  httpserver.cpp: In member function ‘void WorkQueue<WorkItem>::Run()’:
+  httpserver.cpp:125:35: error: ‘queue’ was not declared in this scope; did you mean ‘Enqueue’?
+    125 |                 while (running && queue.empty())
+        |                                   ^~~~~
+        |                                   Enqueue
+  httpserver.cpp:129:31: error: ‘queue’ was not declared in this scope; did you mean ‘Enqueue’?
+    129 |                 i = std::move(queue.front());
+        |                               ^~~~~
+        |                               Enqueue
+  httpserver.cpp: In member function ‘size_t WorkQueue<WorkItem>::Depth()’:
+  httpserver.cpp:154:16: error: ‘queue’ was not declared in this scope; did you mean ‘Enqueue’?
+    154 |         return queue.size();
+        |                ^~~~~
+        |                Enqueue
+---
+ src/httpserver.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/httpserver.cpp b/src/httpserver.cpp
+index dba9527305..5c08e676df 100644
+--- a/src/httpserver.cpp
++++ b/src/httpserver.cpp
+@@ -19,6 +19,7 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <signal.h>
++#include <deque>
+ 
+ #include <event2/event.h>
+