summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorClaudio Kozický2020-11-04 17:07:21 +0100
committerClaudio Kozický2020-11-04 17:07:21 +0100
commitaf4c3181f5a11c410498e63c416952a6b1926b8d (patch)
tree59d26e23f169e82e07319ef28119d41d5608dbf2
parent5486a17119278eae6eb09dd3535932036010187c (diff)
downloadaur-af4c3181f5a11c410498e63c416952a6b1926b8d.tar.gz
Update to 0.9.0
-rw-r--r--.SRCINFO76
-rw-r--r--.gitignore7
-rw-r--r--PKGBUILD171
-rw-r--r--QPainterPath.patch12
-rw-r--r--boost.patch44
-rw-r--r--deque.patch12
-rw-r--r--peercoin-qt-tor@.service23
-rw-r--r--peercoin-qt.install18
-rw-r--r--peercoin-qt@.service22
-rw-r--r--peercoin.install17
-rw-r--r--peercoind.install18
11 files changed, 182 insertions, 238 deletions
diff --git a/.SRCINFO b/.SRCINFO
index e04a0eeb1e26..c6edb1efe5c8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,50 +1,58 @@
pkgbase = peercoin
- pkgdesc = Official Peercoin wallet.
- pkgver = 0.7.1
+ pkgdesc = A peer-to-peer network-based digital currency
+ pkgver = 0.9.0
pkgrel = 1
- url = peercoin.net
+ url = https://www.peercoin.net/
arch = x86_64
- arch = i686
license = MIT
- makedepends = gcc
- makedepends = make
makedepends = boost
- makedepends = miniupnpc
- makedepends = openssl
- makedepends = qt5-base
makedepends = qt5-tools
depends = boost-libs
- depends = openssl
+ depends = db
+ depends = libevent
depends = miniupnpc
+ depends = openssl
+ depends = protobuf
+ depends = qrencode
depends = qt5-base
- conflicts = peercoind-git
- conflicts = peercoin-qt-git
- replaces = ppcoin-daemon
- replaces = ppcoin-qt
- replaces = ppcoind
- source = https://github.com/peercoin/peercoin/archive/v0.7.1ppc.tar.gz
- source = peercoin-qt@.service
- source = peercoin-qt-tor@.service
- source = boost.patch
- sha256sums = 1c2aae8870300f9f56b46e886a6b4501d032e7f0ec85db3e08ab5a2b7cf1090a
- sha256sums = bc898697baab589b87b0b78edd5aed35a3b800fe039afc03637b4895cfd28f32
- sha256sums = 3f71859675561dd35c4527d96651b07996968e318dfbf26e8ce959f61a0d682f
- sha256sums = fbfe8ff248971cba5e676581f6f2dde5e870962014920b6c7f0a2ea88d12a967
+ depends = zeromq
+ source = peercoin-0.9.0.tar.gz::https://github.com/peercoin/peercoin/archive/v0.9.0ppc.tar.gz
+ source = deque.patch
+ source = QPainterPath.patch
+ b2sums = c6b50d5c004216582d487e86470789bf3d146e2c42f8562e759fa65d2c3be72a03fe75f5dd2270da14ceb7538e499ad62cfe363ad66a0fddfc69d4ff4eb64ffc
+ b2sums = 980c8ab54178b254defeecb9f19ecbf9f5e7433d5206995adae1d432e448ac923334be46df644adc428057a8dec57a692636ab007b4b392ff3230bc1aec3de1a
+ b2sums = 865befa6759a559b5764efc80ee626fe6ca7dc01b13d585a30f168c544d3e0d270cc3c8e3aec5fb8feaf2451ccf91eaaf9e88453538241e3b639e5160a7f737d
-pkgname = peercoin-qt
- pkgdesc = Official implementation of Peercoin, the sustainable and secure cryptocurrency alternative to Bitcoin - QT wallet.
- install = peercoin-qt.install
- depends = qt5-base
- depends = miniupnpc
+pkgname = peercoin-cli
+ pkgdesc = A peer-to-peer network-based digital currency - RPC client
depends = boost-libs
- depends = qrencode
+ depends = libevent
+ depends = openssl
+
+pkgname = peercoin-daemon
+ pkgdesc = A peer-to-peer network-based digital currency - daemon
+ depends = boost-libs
+ depends = db
+ depends = libevent
depends = miniupnpc
+ depends = openssl
+ depends = zeromq
+ backup = etc/peercoin/peercoin.conf
-pkgname = peercoind
- pkgdesc = Official implementation of Peercoin, the sustainable and secure cryptocurrency alternative to Bitcoin - daemon.
- install = peercoind.install
- depends = gcc
- depends = make
+pkgname = peercoin-qt
+ pkgdesc = A peer-to-peer network-based digital currency - Qt
depends = boost-libs
+ depends = db
+ depends = libevent
depends = miniupnpc
+ depends = protobuf
+ depends = qrencode
+ depends = qt5-base
+ depends = openssl
+ depends = zeromq
+
+pkgname = peercoin-tx
+ pkgdesc = A peer-to-peer network-based digital currency - transaction tool
+ depends = boost-libs
+ depends = openssl
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..c63323adb07a
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,7 @@
+peercoin-*.tar.gz
+peercoin-cli-*.pkg.tar.*
+peercoin-daemon-*.pkg.tar.*
+peercoin-qt-*.pkg.tar.*
+peercoin-tx-*.pkg.tar.*
+pkg/
+src/
diff --git a/PKGBUILD b/PKGBUILD
index 5de51870aacc..b61850139431 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,81 +1,128 @@
-## Maintainer: peerchemist <peerchemist@protonmail.ch>
+# Maintainer: Claudio Kozický <claudiokozicky@gmail.com>
+# Contributor: peerchemist <peerchemist@protonmail.ch>
-pkgname=('peercoin-qt' 'peercoind')
-pkgbase=peercoin
-_gitname=peercoin
-pkgver=0.7.1
+pkgname=('peercoin-cli' 'peercoin-daemon' 'peercoin-qt' 'peercoin-tx')
+pkgbase='peercoin'
+pkgver=0.9.0
pkgrel=1
-pkgdesc="Official Peercoin wallet."
-makedepends=('gcc' 'make' 'boost' 'miniupnpc' 'openssl' 'qt5-base' 'qt5-tools')
-depends=('boost-libs' 'openssl' 'miniupnpc' 'qt5-base')
-replaces=("ppcoin-daemon" "ppcoin-qt" "ppcoind")
-conflicts=("peercoind-git" "peercoin-qt-git")
-arch=('x86_64' 'i686')
-url='peercoin.net'
+pkgdesc="A peer-to-peer network-based digital currency"
+arch=('x86_64')
+url="https://www.peercoin.net/"
license=('MIT')
-source=(https://github.com/peercoin/peercoin/archive/v${pkgver}ppc.tar.gz
- peercoin-qt@.service
- peercoin-qt-tor@.service
- boost.patch
- )
-sha256sums=('1c2aae8870300f9f56b46e886a6b4501d032e7f0ec85db3e08ab5a2b7cf1090a'
- 'bc898697baab589b87b0b78edd5aed35a3b800fe039afc03637b4895cfd28f32'
- '3f71859675561dd35c4527d96651b07996968e318dfbf26e8ce959f61a0d682f'
- 'fbfe8ff248971cba5e676581f6f2dde5e870962014920b6c7f0a2ea88d12a967')
+depends=('boost-libs' 'db' 'libevent' 'miniupnpc' 'openssl' 'protobuf'
+ 'qrencode' 'qt5-base' 'zeromq')
+makedepends=('boost' 'qt5-tools')
+source=("$pkgbase-$pkgver.tar.gz::https://github.com/peercoin/peercoin/archive/v${pkgver}ppc.tar.gz"
+ 'deque.patch'
+ 'QPainterPath.patch')
+b2sums=('c6b50d5c004216582d487e86470789bf3d146e2c42f8562e759fa65d2c3be72a03fe75f5dd2270da14ceb7538e499ad62cfe363ad66a0fddfc69d4ff4eb64ffc'
+ '980c8ab54178b254defeecb9f19ecbf9f5e7433d5206995adae1d432e448ac923334be46df644adc428057a8dec57a692636ab007b4b392ff3230bc1aec3de1a'
+ '865befa6759a559b5764efc80ee626fe6ca7dc01b13d585a30f168c544d3e0d270cc3c8e3aec5fb8feaf2451ccf91eaaf9e88453538241e3b639e5160a7f737d')
prepare() {
- cd "$srcdir/${_gitname}-${pkgver}ppc"
- patch -Np1 -i "${startdir}/boost.patch"
- ./autogen.sh
+ cd "$pkgbase-${pkgver}ppc"
+ patch --strip 1 --input "$srcdir/deque.patch" # fix compilation error
+ patch --strip 1 --input "$srcdir/QPainterPath.patch" # fix compilation error
}
build() {
- cd "$srcdir/${_gitname}-${pkgver}ppc"
-
- msg2 'Building...'
- ./configure --with-incompatible-bdb --with-gui=qt5
- make
+ cd "$pkgbase-${pkgver}ppc"
+ ./autogen.sh
+ ./configure --prefix /usr --with-incompatible-bdb
+ make
}
check() {
- cd "$srcdir/${_gitname}-${pkgver}ppc"
-
- make check
+ cd "$pkgbase-${pkgver}ppc"
+ make --keep-going check
}
-package_peercoin-qt() {
-
- pkgdesc="Official implementation of Peercoin, the sustainable and secure cryptocurrency alternative to Bitcoin - QT wallet."
- makedepends=('gcc' 'make' 'qt5-base' 'boost' 'gcc' 'make' 'qrencode' 'openssl' 'miniupnpc' 'qt5-tools')
- depends=('qt5-base' 'miniupnpc' 'boost-libs' 'qrencode' 'miniupnpc')
- optdepeds=('systemd' 'tor')
- install=peercoin-qt.install
-
- install -Dm644 $pkgname@.service "${pkgdir}/usr/lib/systemd/system/$pkgname@.service"
- install -Dm644 $pkgname-tor@.service "${pkgdir}/usr/lib/systemd/system/$pkgname-tor@.service"
-
- cd "$srcdir/${_gitname}-${pkgver}ppc"
- install -Dm644 "contrib/debian/${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop"
- install -Dm755 "src/qt/peercoin-qt" "${pkgdir}/usr/bin/$pkgname"
- #install -Dm644 COPYING "${pkgdir}/usr/share/licenses/peercoin/COPYING"
- install -Dm644 "src/qt/res/icons/peercoin.png" "${pkgdir}/usr/share/pixmaps/peercoin.png"
-
+package_peercoin-cli() {
+ pkgdesc="A peer-to-peer network-based digital currency - RPC client"
+ depends=('boost-libs' 'libevent' 'openssl')
+
+ cd "$pkgbase-${pkgver}ppc"
+ install -D --mode 644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
+
+ install -D --mode 644 \
+ contrib/peercoin-cli.bash-completion \
+ "$pkgdir/usr/share/bash-completion/completions/peercoin-cli"
+ install -D --mode 644 \
+ doc/man/peercoin-cli.1 \
+ "$pkgdir/usr/share/man/man1/peercoin-cli.1"
+ install -D --mode 755 \
+ src/peercoin-cli \
+ "$pkgdir/usr/bin/peercoin-cli"
+}
+
+package_peercoin-daemon() {
+ pkgdesc="A peer-to-peer network-based digital currency - daemon"
+ depends=('boost-libs' 'db' 'libevent' 'miniupnpc' 'openssl' 'zeromq')
+ optdepeneds=('tor')
+ backup=('etc/peercoin/peercoin.conf')
+
+ cd "$pkgbase-${pkgver}ppc"
+ install -D --mode 644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
+
+ install -D --mode 644 \
+ contrib/debian/examples/peercoin.conf \
+ "$pkgdir/etc/peercoin/peercoin.conf"
+ install -D --mode 644 \
+ contrib/peercoind.bash-completion \
+ "$pkgdir/usr/share/bash-completion/completions/peercoind"
+ install -D --mode 644 \
+ contrib/systemd/peercoind@.service \
+ "$pkgdir/usr/lib/systemd/system/peercoind@.service"
+ install -D --mode 644 \
+ contrib/systemd/peercoind-tor@.service \
+ "$pkgdir/usr/lib/systemd/system/peercoind-tor@.service"
+ install -D --mode 644 \
+ contrib/debian/manpages/peercoin.conf.5 \
+ "$pkgdir/usr/share/man/man5/peercoin.conf.5"
+ install -D --mode 644 \
+ contrib/debian/manpages/peercoind.1 \
+ "$pkgdir/usr/share/man/man1/peercoind.1"
+ install -D --mode 755 \
+ src/peercoind \
+ "$pkgdir/usr/bin/peercoind"
}
-package_peercoind() {
-
- makedepends=('boost' 'gcc' 'make' 'openssl' 'miniupnpc')
- depends=('gcc' 'make' 'boost-libs' 'miniupnpc')
- optdepeneds=('systemd' 'tor')
- pkgdesc="Official implementation of Peercoin, the sustainable and secure cryptocurrency alternative to Bitcoin - daemon."
- install=peercoind.install
+package_peercoin-qt() {
+ pkgdesc="A peer-to-peer network-based digital currency - Qt"
+ depends=('boost-libs' 'db' 'libevent' 'miniupnpc' 'protobuf' 'qrencode'
+ 'qt5-base' 'openssl' 'zeromq')
+
+ cd "$pkgbase-${pkgver}ppc"
+ install -D --mode 644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
+
+ install -D --mode 644 \
+ contrib/debian/peercoin-qt.desktop \
+ "$pkgdir/usr/share/applications/peercoin-qt.desktop"
+ install -D --mode 644 \
+ contrib/debian/manpages/peercoin-qt.1 \
+ "$pkgdir/usr/share/man/man1/peercoin-qt.1"
+ install -D --mode 644 \
+ share/pixmaps/peercoin128.png \
+ "$pkgdir/usr/share/pixmaps/peercoin128.png"
+ install -D --mode 755 \
+ src/qt/peercoin-qt \
+ "$pkgdir/usr/bin/peercoin-qt"
+}
- install -Dm644 "$srcdir/${_gitname}-${pkgver}ppc/COPYING" "$pkgdir/usr/share/licenses/peercoin/COPYING"
+package_peercoin-tx() {
+ pkgdesc="A peer-to-peer network-based digital currency - transaction tool"
+ depends=('boost-libs' 'openssl')
- cd "$srcdir/${_gitname}-${pkgver}ppc"
- install -Dm755 "src/peercoind" "$pkgdir/usr/bin/$pkgname"
- install -Dm755 "src/peercoin-cli" "$pkgdir/usr/bin/peercoin-cli"
- install -Dm644 "contrib/systemd/${_gitname}d-tor@.service" "$pkgdir/usr/lib/systemd/system/${_gitname}d-tor@.service"
- install -Dm644 "contrib/systemd/${_gitname}d@.service" "$pkgdir/usr/lib/systemd/system/${_gitname}d@.service"
+ cd "$pkgbase-${pkgver}ppc"
+ install -D --mode 644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
+ install -D --mode 644 \
+ contrib/peercoin-tx.bash-completion \
+ "$pkgdir/usr/share/bash-completion/completions/peercoin-tx"
+ install -D --mode 644 \
+ doc/man/peercoin-tx.1 \
+ "$pkgdir/usr/share/man/man1/peercoin-tx.1"
+ install -D --mode 755 \
+ src/peercoin-tx \
+ "$pkgdir/usr/bin/peercoin-tx"
}
diff --git a/QPainterPath.patch b/QPainterPath.patch
new file mode 100644
index 000000000000..fff16b71a87f
--- /dev/null
+++ b/QPainterPath.patch
@@ -0,0 +1,12 @@
+diff --git a/src/qt/trafficgraphwidget.cpp b/src/qt/trafficgraphwidget.cpp
+index f86979946..0021a2585 100644
+--- a/src/qt/trafficgraphwidget.cpp
++++ b/src/qt/trafficgraphwidget.cpp
+@@ -6,6 +6,7 @@
+ #include <qt/clientmodel.h>
+
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QColor>
+ #include <QTimer>
+
diff --git a/boost.patch b/boost.patch
deleted file mode 100644
index ad58e32a632f..000000000000
--- a/boost.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff --git a/bitcoin-qt.pro b/bitcoin-qt.pro
-index a90ee449f029..18f2612dfd72 100644
---- a/bitcoin-qt.pro
-+++ b/bitcoin-qt.pro
-@@ -8,6 +8,7 @@ greaterThan(QT_MAJOR_VERSION, 4):QT+=widgets
- DEFINES += QT_GUI BOOST_THREAD_USE_LIB BOOST_SPIRIT_THREADSAFE HAVE_WORKING_BOOST_SLEEP_FOR
- CONFIG += no_include_pwd
- CONFIG += thread
-+CONFIG += c++11
-
- # for boost 1.37, add -mt to the boost libraries
- # use: qmake BOOST_LIB_SUFFIX=-mt
-diff --git a/src/util.h b/src/util.h
-index 3599d0e66fe6..cf3dc0eadb12 100644
---- a/src/util.h
-+++ b/src/util.h
-@@ -24,6 +24,8 @@ typedef int pid_t; /* define for Windows compatibility */
- #include <utility>
- #include <vector>
- #include <string>
-+#include <chrono>
-+#include <thread>
-
- #include <boost/version.hpp>
- #include <boost/thread.hpp>
-@@ -109,17 +111,7 @@ T* alignup(T* p)
-
- inline void MilliSleep(int64 n)
- {
--// Boost's sleep_for was uninterruptable when backed by nanosleep from 1.50
--// until fixed in 1.52. Use the deprecated sleep method for the broken case.
--// See: https://svn.boost.org/trac/boost/ticket/7238
--#if defined(HAVE_WORKING_BOOST_SLEEP_FOR)
-- boost::this_thread::sleep_for(boost::chrono::milliseconds(n));
--#elif defined(HAVE_WORKING_BOOST_SLEEP)
-- boost::this_thread::sleep(boost::posix_time::milliseconds(n));
--#else
-- //should never get here
--#error missing boost sleep implementation
--#endif
-+ std::this_thread::sleep_for(std::chrono::milliseconds(n));
- }
-
- #ifndef THROW_WITH_STACKTRACE
diff --git a/deque.patch b/deque.patch
new file mode 100644
index 000000000000..018c934515f9
--- /dev/null
+++ b/deque.patch
@@ -0,0 +1,12 @@
+diff --git a/src/httpserver.cpp b/src/httpserver.cpp
+index d36c74b01..2d835387f 100644
+--- a/src/httpserver.cpp
++++ b/src/httpserver.cpp
+@@ -13,6 +13,7 @@
+ #include <sync.h>
+ #include <ui_interface.h>
+
++#include <deque>
+ #include <memory>
+ #include <stdio.h>
+ #include <stdlib.h>
diff --git a/peercoin-qt-tor@.service b/peercoin-qt-tor@.service
deleted file mode 100644
index fef90e9cf554..000000000000
--- a/peercoin-qt-tor@.service
+++ /dev/null
@@ -1,23 +0,0 @@
-[Unit]
-Description=Ppcoin-qt
-After=network.target
-After=graphical.target
-Requires=tor.service
-
-[Service]
-User=%i
-Group=users
-Type=simple
-Restart=on-failure
-RestartSec=15
-Environment=DISPLAY=:0
-Environment=XAUTHORITY=%h/.Xauthority
-ExecStart=/usr/bin/peercoin-qt -proxy=127.0.0.1:9050
-## security
-PrivateTmp=true
-PrivateDevices=true
-ProtectSystem=full
-NoNewPrivileges=true
-
-[Install]
-WantedBy=default.target
diff --git a/peercoin-qt.install b/peercoin-qt.install
deleted file mode 100644
index 8361a4c3ab2f..000000000000
--- a/peercoin-qt.install
+++ /dev/null
@@ -1,18 +0,0 @@
-post_install() {
- update-desktop-database -q
- systemctl daemon-reload
- # ln to keep compatibility
- ln -s /usr/bin/peercoin-qt /usr/bin/ppcoin-qt
-
- echo ""
- echo "If you are having troubles with blockchain download, just backup wallet.dat, remove .ppcoin directory and start over."
-}
-
-post_upgrade() {
- post_install $1
-}
-
-post_remove() {
- post_install $1
- rm /usr/bin/ppcoin-qt
-}
diff --git a/peercoin-qt@.service b/peercoin-qt@.service
deleted file mode 100644
index f8337aff99f6..000000000000
--- a/peercoin-qt@.service
+++ /dev/null
@@ -1,22 +0,0 @@
-[Unit]
-Description=Peercoin-qt
-After=network.target
-After=graphical.target
-
-[Service]
-User=%i
-Group=users
-Type=simple
-Restart=on-failure
-RestartSec=15
-Environment=DISPLAY=:0
-Environment=XAUTHORITY=%h/.Xauthority
-ExecStart=/usr/bin/peercoin-qt
-## security
-PrivateTmp=true
-PrivateDevices=true
-ProtectSystem=full
-NoNewPrivileges=true
-
-[Install]
-WantedBy=default.target
diff --git a/peercoin.install b/peercoin.install
deleted file mode 100644
index ebfad360448c..000000000000
--- a/peercoin.install
+++ /dev/null
@@ -1,17 +0,0 @@
-post_install() {
- update-desktop-database -q
- systemctl daemon-reload
- ln -s /usr/bin/peercoind /usr/bin/ppcoind
-
- echo ""
- echo "If you are having troubles with blockchain download, just backup wallet.dat, remove .ppcoin directory and start over."
-}
-
-post_upgrade() {
- post_install $1
-}
-
-post_remove() {
- post_install $1
- rm /usr/bin/peercoind
-}
diff --git a/peercoind.install b/peercoind.install
deleted file mode 100644
index 73564fecf543..000000000000
--- a/peercoind.install
+++ /dev/null
@@ -1,18 +0,0 @@
-post_install() {
- update-desktop-database -q
- systemctl daemon-reload
- # ln to old name to keep compatibility
- ln -s /usr/bin/peercoind /usr/bin/ppcoind
-
- echo ""
- echo "If you are having troubles with blockchain download, just backup wallet.dat, remove .ppcoin directory and start over."
-}
-
-post_upgrade() {
- post_install $1
-}
-
-post_remove() {
- post_install $1
- rm /usr/bin/ppcoind
-}