summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuis Aranguren2020-02-13 12:05:07 +1100
committerLuis Aranguren2020-02-13 12:05:07 +1100
commit3b97e9078f3447d496e25c1ae0cf155bdba8c5e9 (patch)
tree735859b21abd0452ee0915be717afac5da6b8393
parentab2b57fef1aafdcfa55be88fa6dde37468137e3f (diff)
downloadaur-3b97e9078f3447d496e25c1ae0cf155bdba8c5e9.tar.gz
Changed from binaries to source.
-rw-r--r--.SRCINFO18
-rw-r--r--PKGBUILD45
-rw-r--r--deque.patch58
3 files changed, 100 insertions, 21 deletions
diff --git a/.SRCINFO b/.SRCINFO
index e67c6cb3eab..5577de5d5ef 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = dashcore
pkgdesc = Dash Core (DASH, Dashpay, formerly Darkcoin) is an open source, privacy-centric digital currency. (Includes the qt-client, the headless daemon and the command-line tool.)
pkgver = 0.14.0.5
- pkgrel = 1
+ pkgrel = 2
url = https://www.dash.org/
arch = x86_64
license = MIT
@@ -12,13 +12,16 @@ pkgbase = dashcore
makedepends = libtool
makedepends = make
makedepends = pkg-config
- makedepends = protobuf
makedepends = qt5-tools
+ makedepends = codablock-bls-signatures
depends = qt5-base
depends = boost
depends = boost-libs
depends = miniupnpc
- depends = openssl
+ depends = protobuf
+ depends = db4.8
+ depends = zeromq
+ depends = libevent
depends = qrencode
provides = dashd
provides = dash-qt
@@ -27,15 +30,14 @@ pkgbase = dashcore
conflicts = dashcore-git
source = dash256.png
source = dash-qt.desktop
+ source = deque.patch
source = https://github.com/dashpay/dash/blob/master/COPYING
- source = https://github.com/dashpay/dash/releases/download/v0.14.0.5/dashcore-0.14.0.5-x86_64-linux-gnu.tar.gz
- source = https://github.com/dashpay/dash/releases/download/v0.14.0.5/dashcore-0.14.0.5-x86_64-linux-gnu.tar.gz.asc
- validpgpkeys = 99DF0DABDEE182FA53A33AE763A96B406102E091
+ source = https://github.com/dashpay/dash/archive/v0.14.0.5.tar.gz
sha256sums = d719e01df4b47f4d6f0d4d6eac50d402bebb4127d0b6d64764fe2a42e903819b
sha256sums = 41f83cb53ecf33688d899f83e09bd52f9aa8e6d7b9b0f30810f192988b26079a
+ sha256sums = 30a3ba84ff43742467abff3fe1bc0069904eb90c40f0bc93e88e41f8f2f088da
sha256sums = b5290c16b194d488265f3af37a7ab74cb9fecea2de97b910670cefa4e0909853
- sha256sums = c40f579d30f523bf0d220e4c02ed58075cf2bd4ed9a9c73e72ac2b7420728f6a
- sha256sums = SKIP
+ sha256sums = 76e50bef2245440a636f33847c4db4d376ea09c9083f850f6702be4221c73677
pkgname = dashcore
diff --git a/PKGBUILD b/PKGBUILD
index 89e8b08606e..50c49d1f6a2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,32 +3,51 @@
# Based on PKGBUILD from darkcoin-git maintained by Viliam Kubis <viliam dot kubis at gmail dot com>
pkgname='dashcore'
+_pkgname='dash'
pkgver=0.14.0.5
-pkgrel=1
+pkgrel=2
pkgdesc="Dash Core (DASH, Dashpay, formerly Darkcoin) is an open source, privacy-centric digital currency. (Includes the qt-client, the headless daemon and the command-line tool.)"
arch=('x86_64')
url="https://www.dash.org/"
license=('MIT')
-depends=('qt5-base' 'boost' 'boost-libs' 'miniupnpc' 'openssl' 'qrencode')
-makedepends=('autoconf' 'automake' 'binutils' 'gcc' 'libtool' 'make' 'pkg-config' 'protobuf' 'qt5-tools')
+depends=('qt5-base' 'boost' 'boost-libs' 'miniupnpc' 'protobuf' 'db4.8' 'zeromq' 'libevent' 'qrencode')
+makedepends=('autoconf' 'automake' 'binutils' 'gcc' 'libtool' 'make' 'pkg-config' 'qt5-tools' 'codablock-bls-signatures')
provides=('dashd' 'dash-qt' 'dash-cli' 'dash-tx')
conflicts=('dashcore-git')
source=('dash256.png'
- 'dash-qt.desktop'
- 'https://github.com/dashpay/dash/blob/master/COPYING'
- "https://github.com/dashpay/dash/releases/download/v${pkgver}/${pkgname}-${pkgver}-$CARCH-linux-gnu.tar.gz"{,.asc})
+ 'dash-qt.desktop'
+ 'deque.patch'
+ 'https://github.com/dashpay/dash/blob/master/COPYING'
+ "https://github.com/dashpay/dash/archive/v${pkgver}.tar.gz")
sha256sums=('d719e01df4b47f4d6f0d4d6eac50d402bebb4127d0b6d64764fe2a42e903819b'
'41f83cb53ecf33688d899f83e09bd52f9aa8e6d7b9b0f30810f192988b26079a'
+ '30a3ba84ff43742467abff3fe1bc0069904eb90c40f0bc93e88e41f8f2f088da'
'b5290c16b194d488265f3af37a7ab74cb9fecea2de97b910670cefa4e0909853'
- 'c40f579d30f523bf0d220e4c02ed58075cf2bd4ed9a9c73e72ac2b7420728f6a'
- 'SKIP')
-validpgpkeys=('99DF0DABDEE182FA53A33AE763A96B406102E091')
+ '76e50bef2245440a636f33847c4db4d376ea09c9083f850f6702be4221c73677')
+
+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 dash 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/dash-qt" "$pkgdir/usr/bin/dash-qt"
- install -D -m755 "$srcdir/$pkgname-${pkgver%.*}/bin/dashd" "$pkgdir/usr/bin/dashd"
- install -D -m755 "$srcdir/$pkgname-${pkgver%.*}/bin/dash-cli" "$pkgdir/usr/bin/dash-cli"
- install -D -m755 "$srcdir/$pkgname-${pkgver%.*}/bin/dash-tx" "$pkgdir/usr/bin/dash-tx"
+ install -D -m755 "$srcdir/$_pkgname-${pkgver}/src/qt/dash-qt" "$pkgdir/usr/bin/dash-qt"
+ install -D -m755 "$srcdir/$_pkgname-${pkgver}/src/dashd" "$pkgdir/usr/bin/dashd"
+ install -D -m755 "$srcdir/$_pkgname-${pkgver}/src/dash-cli" "$pkgdir/usr/bin/dash-cli"
+ install -D -m755 "$srcdir/$_pkgname-${pkgver}/src/dash-tx" "$pkgdir/usr/bin/dash-tx"
install -D -m644 "COPYING" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
install -D -m644 "dash256.png" "$pkgdir/usr/share/pixmaps/dash256.png"
install -D -m644 "dash-qt.desktop" "$pkgdir/usr/share/applications/dash-qt.desktop"
diff --git a/deque.patch b/deque.patch
new file mode 100644
index 00000000000..8649cecfbe1
--- /dev/null
+++ b/deque.patch
@@ -0,0 +1,58 @@
+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 <future>
+
+ #include <event2/event.h>
+