Date: Monday, June 18, 2018 @ 18:10:44 Author: shibumi Revision: 344018
archrelease: copy trunk to community-x86_64 Added: bitcoin/repos/community-x86_64/0001-Make-boost-multi_index-comparators-const.patch (from rev 344017, bitcoin/trunk/0001-Make-boost-multi_index-comparators-const.patch) bitcoin/repos/community-x86_64/PKGBUILD (from rev 344017, bitcoin/trunk/PKGBUILD) bitcoin/repos/community-x86_64/bitcoin.sysusers (from rev 344017, bitcoin/trunk/bitcoin.sysusers) bitcoin/repos/community-x86_64/bitcoin.tmpfiles (from rev 344017, bitcoin/trunk/bitcoin.tmpfiles) Deleted: bitcoin/repos/community-x86_64/0001-Make-boost-multi_index-comparators-const.patch bitcoin/repos/community-x86_64/PKGBUILD bitcoin/repos/community-x86_64/bitcoin.sysusers bitcoin/repos/community-x86_64/bitcoin.tmpfiles -----------------------------------------------------+ 0001-Make-boost-multi_index-comparators-const.patch | 170 +++++++------- PKGBUILD | 206 +++++++++--------- bitcoin.sysusers | 2 bitcoin.tmpfiles | 4 4 files changed, 191 insertions(+), 191 deletions(-) Deleted: 0001-Make-boost-multi_index-comparators-const.patch =================================================================== --- 0001-Make-boost-multi_index-comparators-const.patch 2018-06-18 18:10:32 UTC (rev 344017) +++ 0001-Make-boost-multi_index-comparators-const.patch 2018-06-18 18:10:44 UTC (rev 344018) @@ -1,85 +0,0 @@ -From 1ec0c0a01c316146434642ab2f14a7367306dbec Mon Sep 17 00:00:00 2001 -From: Suhas Daftuar <sdaft...@gmail.com> -Date: Thu, 7 Dec 2017 09:57:53 -0500 -Subject: [PATCH] Make boost::multi_index comparators const - -This fixes compatibility with boost 1.66 ---- - src/miner.h | 4 ++-- - src/txmempool.h | 10 +++++----- - 2 files changed, 7 insertions(+), 7 deletions(-) - -diff --git a/src/miner.h b/src/miner.h -index 36276dc36..d81ec6421 100644 ---- a/src/miner.h -+++ b/src/miner.h -@@ -71,7 +71,7 @@ struct modifiedentry_iter { - // except operating on CTxMemPoolModifiedEntry. - // TODO: refactor to avoid duplication of this logic. - struct CompareModifiedEntry { -- bool operator()(const CTxMemPoolModifiedEntry &a, const CTxMemPoolModifiedEntry &b) -+ bool operator()(const CTxMemPoolModifiedEntry &a, const CTxMemPoolModifiedEntry &b) const - { - double f1 = (double)a.nModFeesWithAncestors * b.nSizeWithAncestors; - double f2 = (double)b.nModFeesWithAncestors * a.nSizeWithAncestors; -@@ -86,7 +86,7 @@ struct CompareModifiedEntry { - // This is sufficient to sort an ancestor package in an order that is valid - // to appear in a block. - struct CompareTxIterByAncestorCount { -- bool operator()(const CTxMemPool::txiter &a, const CTxMemPool::txiter &b) -+ bool operator()(const CTxMemPool::txiter &a, const CTxMemPool::txiter &b) const - { - if (a->GetCountWithAncestors() != b->GetCountWithAncestors()) - return a->GetCountWithAncestors() < b->GetCountWithAncestors(); -diff --git a/src/txmempool.h b/src/txmempool.h -index 346585ab1..86a008d7b 100644 ---- a/src/txmempool.h -+++ b/src/txmempool.h -@@ -204,7 +204,7 @@ struct mempoolentry_txid - class CompareTxMemPoolEntryByDescendantScore - { - public: -- bool operator()(const CTxMemPoolEntry& a, const CTxMemPoolEntry& b) -+ bool operator()(const CTxMemPoolEntry& a, const CTxMemPoolEntry& b) const - { - bool fUseADescendants = UseDescendantScore(a); - bool fUseBDescendants = UseDescendantScore(b); -@@ -226,7 +226,7 @@ public: - } - - // Calculate which score to use for an entry (avoiding division). -- bool UseDescendantScore(const CTxMemPoolEntry &a) -+ bool UseDescendantScore(const CTxMemPoolEntry &a) const - { - double f1 = (double)a.GetModifiedFee() * a.GetSizeWithDescendants(); - double f2 = (double)a.GetModFeesWithDescendants() * a.GetTxSize(); -@@ -241,7 +241,7 @@ public: - class CompareTxMemPoolEntryByScore - { - public: -- bool operator()(const CTxMemPoolEntry& a, const CTxMemPoolEntry& b) -+ bool operator()(const CTxMemPoolEntry& a, const CTxMemPoolEntry& b) const - { - double f1 = (double)a.GetModifiedFee() * b.GetTxSize(); - double f2 = (double)b.GetModifiedFee() * a.GetTxSize(); -@@ -255,7 +255,7 @@ public: - class CompareTxMemPoolEntryByEntryTime - { - public: -- bool operator()(const CTxMemPoolEntry& a, const CTxMemPoolEntry& b) -+ bool operator()(const CTxMemPoolEntry& a, const CTxMemPoolEntry& b) const - { - return a.GetTime() < b.GetTime(); - } -@@ -264,7 +264,7 @@ public: - class CompareTxMemPoolEntryByAncestorFee - { - public: -- bool operator()(const CTxMemPoolEntry& a, const CTxMemPoolEntry& b) -+ bool operator()(const CTxMemPoolEntry& a, const CTxMemPoolEntry& b) const - { - double aFees = a.GetModFeesWithAncestors(); - double aSize = a.GetSizeWithAncestors(); --- -2.15.1 - Copied: bitcoin/repos/community-x86_64/0001-Make-boost-multi_index-comparators-const.patch (from rev 344017, bitcoin/trunk/0001-Make-boost-multi_index-comparators-const.patch) =================================================================== --- 0001-Make-boost-multi_index-comparators-const.patch (rev 0) +++ 0001-Make-boost-multi_index-comparators-const.patch 2018-06-18 18:10:44 UTC (rev 344018) @@ -0,0 +1,85 @@ +From 1ec0c0a01c316146434642ab2f14a7367306dbec Mon Sep 17 00:00:00 2001 +From: Suhas Daftuar <sdaft...@gmail.com> +Date: Thu, 7 Dec 2017 09:57:53 -0500 +Subject: [PATCH] Make boost::multi_index comparators const + +This fixes compatibility with boost 1.66 +--- + src/miner.h | 4 ++-- + src/txmempool.h | 10 +++++----- + 2 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/src/miner.h b/src/miner.h +index 36276dc36..d81ec6421 100644 +--- a/src/miner.h ++++ b/src/miner.h +@@ -71,7 +71,7 @@ struct modifiedentry_iter { + // except operating on CTxMemPoolModifiedEntry. + // TODO: refactor to avoid duplication of this logic. + struct CompareModifiedEntry { +- bool operator()(const CTxMemPoolModifiedEntry &a, const CTxMemPoolModifiedEntry &b) ++ bool operator()(const CTxMemPoolModifiedEntry &a, const CTxMemPoolModifiedEntry &b) const + { + double f1 = (double)a.nModFeesWithAncestors * b.nSizeWithAncestors; + double f2 = (double)b.nModFeesWithAncestors * a.nSizeWithAncestors; +@@ -86,7 +86,7 @@ struct CompareModifiedEntry { + // This is sufficient to sort an ancestor package in an order that is valid + // to appear in a block. + struct CompareTxIterByAncestorCount { +- bool operator()(const CTxMemPool::txiter &a, const CTxMemPool::txiter &b) ++ bool operator()(const CTxMemPool::txiter &a, const CTxMemPool::txiter &b) const + { + if (a->GetCountWithAncestors() != b->GetCountWithAncestors()) + return a->GetCountWithAncestors() < b->GetCountWithAncestors(); +diff --git a/src/txmempool.h b/src/txmempool.h +index 346585ab1..86a008d7b 100644 +--- a/src/txmempool.h ++++ b/src/txmempool.h +@@ -204,7 +204,7 @@ struct mempoolentry_txid + class CompareTxMemPoolEntryByDescendantScore + { + public: +- bool operator()(const CTxMemPoolEntry& a, const CTxMemPoolEntry& b) ++ bool operator()(const CTxMemPoolEntry& a, const CTxMemPoolEntry& b) const + { + bool fUseADescendants = UseDescendantScore(a); + bool fUseBDescendants = UseDescendantScore(b); +@@ -226,7 +226,7 @@ public: + } + + // Calculate which score to use for an entry (avoiding division). +- bool UseDescendantScore(const CTxMemPoolEntry &a) ++ bool UseDescendantScore(const CTxMemPoolEntry &a) const + { + double f1 = (double)a.GetModifiedFee() * a.GetSizeWithDescendants(); + double f2 = (double)a.GetModFeesWithDescendants() * a.GetTxSize(); +@@ -241,7 +241,7 @@ public: + class CompareTxMemPoolEntryByScore + { + public: +- bool operator()(const CTxMemPoolEntry& a, const CTxMemPoolEntry& b) ++ bool operator()(const CTxMemPoolEntry& a, const CTxMemPoolEntry& b) const + { + double f1 = (double)a.GetModifiedFee() * b.GetTxSize(); + double f2 = (double)b.GetModifiedFee() * a.GetTxSize(); +@@ -255,7 +255,7 @@ public: + class CompareTxMemPoolEntryByEntryTime + { + public: +- bool operator()(const CTxMemPoolEntry& a, const CTxMemPoolEntry& b) ++ bool operator()(const CTxMemPoolEntry& a, const CTxMemPoolEntry& b) const + { + return a.GetTime() < b.GetTime(); + } +@@ -264,7 +264,7 @@ public: + class CompareTxMemPoolEntryByAncestorFee + { + public: +- bool operator()(const CTxMemPoolEntry& a, const CTxMemPoolEntry& b) ++ bool operator()(const CTxMemPoolEntry& a, const CTxMemPoolEntry& b) const + { + double aFees = a.GetModFeesWithAncestors(); + double aSize = a.GetSizeWithAncestors(); +-- +2.15.1 + Deleted: PKGBUILD =================================================================== --- PKGBUILD 2018-06-18 18:10:32 UTC (rev 344017) +++ PKGBUILD 2018-06-18 18:10:44 UTC (rev 344018) @@ -1,103 +0,0 @@ -# $Id$ -# Maintainer : Christian Rebischke <chris.rebisc...@archlinux.org> -# Contributor: Timothy Redaelli <timothy.redae...@gmail.com> -# Contributor: shahid <hellla...@gmail.com> - -#_dbver=4.8.30 -pkgbase=bitcoin -pkgname=('bitcoin-daemon' 'bitcoin-cli' 'bitcoin-qt' 'bitcoin-tx') -pkgver=0.16.0 -pkgrel=3 -arch=('x86_64') -url="https://www.bitcoin.org/" -makedepends=('boost' 'libevent' 'qt5-base' 'qt5-tools' 'qrencode' 'miniupnpc' 'protobuf' 'zeromq') -license=('MIT') -source=("$pkgname-$pkgver.tar.gz::https://github.com/bitcoin/bitcoin/archive/v$pkgver.tar.gz" - "0001-Make-boost-multi_index-comparators-const.patch" - "bitcoin.sysusers" - "bitcoin.tmpfiles") -sha256sums=('8ade43e420b6aad00645d79239c21947e47f37d1f974b4948b0da0b6999c28d5' - 'f302218b0366c2102a3447330684adcdb576217aba5d1bb157e73717d6734ce5' - '6f70b0d3d5e4a3f78b15d8f49515cd33cbf0c9d2ac22f94f0d3fabb3f620e458' - 'b769c977b193680f2f549997fd8e07f6aa507071dfd519d59255ab4c687ebfcd') -validpgpkeys=(71A3B16735405025D447E8F274810B012346C9A6) - -prepare() { - cd "$pkgbase-$pkgver" - #patch -Np1 -i "$srcdir/0001-Make-boost-multi_index-comparators-const.patch" - ./autogen.sh -} - -build() { - cd $pkgbase-$pkgver - ./configure --prefix=/usr --with-gui=qt5 --with-incompatible-bdb #LDFLAGS="-L$srcdir/db4/lib/ $LDFLAGS" CPPFLAGS="-I$srcdir/db4/include/ $CPPFLAGS" - make -} - -package_bitcoin-qt() { - pkgdesc="Bitcoin is a peer-to-peer network based digital currency - Qt" - depends=(boost-libs libevent qt5-base miniupnpc libminiupnpc.so qrencode protobuf zeromq) - - cd $pkgbase-$pkgver - install -Dm755 src/qt/bitcoin-qt "$pkgdir"/usr/bin/bitcoin-qt - install -Dm644 doc/man/bitcoin-qt.1 \ - "$pkgdir"/usr/share/man/man1/bitcoin-qt.1 - install -Dm644 contrib/debian/bitcoin-qt.desktop \ - "$pkgdir"/usr/share/applications/bitcoin.desktop - install -Dm644 share/pixmaps/bitcoin128.png \ - "$pkgdir"/usr/share/pixmaps/bitcoin128.png - - install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" -} - -package_bitcoin-daemon() { - pkgdesc="Bitcoin is a peer-to-peer network based digital currency - daemon" - depends=(boost-libs libevent miniupnpc libminiupnpc.so zeromq) - - cd $pkgbase-$pkgver - install -Dm755 src/bitcoind "$pkgdir"/usr/bin/bitcoind - install -Dm644 contrib/bitcoind.bash-completion \ - "$pkgdir"/usr/share/bash-completion/completions/bitcoind - install -Dm644 doc/man/bitcoind.1 \ - "$pkgdir"/usr/share/man/man1/bitcoind.1 - install -Dm644 contrib/debian/examples/bitcoin.conf \ - "$pkgdir/usr/share/doc/$pkgname/examples/bitcoin.conf" - install -Dm644 contrib/init/bitcoind.service \ - "$pkgdir/usr/lib/systemd/system/bitcoind.service" - install -Dm644 "$srcdir/bitcoin.sysusers" \ - "$pkgdir/usr/lib/sysusers.d/bitcoin.conf" - install -Dm644 "$srcdir/bitcoin.tmpfiles" \ - "$pkgdir/usr/lib/tmpfiles.d/bitcoin.conf" - - install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" -} - -package_bitcoin-cli() { - pkgdesc="Bitcoin is a peer-to-peer network based digital currency - RPC client" - depends=(boost-libs libevent) - - cd $pkgbase-$pkgver - install -Dm755 src/bitcoin-cli "$pkgdir"/usr/bin/bitcoin-cli - install -Dm644 contrib/bitcoin-cli.bash-completion \ - "$pkgdir"/usr/share/bash-completion/completions/bitcoin-cli - install -Dm644 doc/man/bitcoin-cli.1 \ - "$pkgdir"/usr/share/man/man1/bitcoin-cli.1 - - install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" -} - -package_bitcoin-tx() { - pkgdesc="Bitcoin is a peer-to-peer network based digital currency - Transaction tool" - depends=(boost-libs openssl) - - cd $pkgbase-$pkgver - install -Dm755 src/bitcoin-tx "$pkgdir"/usr/bin/bitcoin-tx - install -Dm644 contrib/bitcoin-tx.bash-completion \ - "$pkgdir"/usr/share/bash-completion/completions/bitcoin-tx - install -Dm644 doc/man/bitcoin-tx.1 \ - "$pkgdir"/usr/share/man/man1/bitcoin-tx.1 - - install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" -} - -# vim:set ts=2 sw=2 et: Copied: bitcoin/repos/community-x86_64/PKGBUILD (from rev 344017, bitcoin/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2018-06-18 18:10:44 UTC (rev 344018) @@ -0,0 +1,103 @@ +# $Id$ +# Maintainer : Christian Rebischke <chris.rebisc...@archlinux.org> +# Contributor: Timothy Redaelli <timothy.redae...@gmail.com> +# Contributor: shahid <hellla...@gmail.com> + +#_dbver=4.8.30 +pkgbase=bitcoin +pkgname=('bitcoin-daemon' 'bitcoin-cli' 'bitcoin-qt' 'bitcoin-tx') +pkgver=0.16.1 +pkgrel=1 +arch=('x86_64') +url="https://www.bitcoin.org/" +makedepends=('boost' 'libevent' 'qt5-base' 'qt5-tools' 'qrencode' 'miniupnpc' 'protobuf' 'zeromq') +license=('MIT') +source=("$pkgname-$pkgver.tar.gz::https://github.com/bitcoin/bitcoin/archive/v$pkgver.tar.gz" + "0001-Make-boost-multi_index-comparators-const.patch" + "bitcoin.sysusers" + "bitcoin.tmpfiles") +sha256sums=('c0065f63509c1ca8b45057b415f8e4cbaf0f234def6090511d68fd3df3a56380' + 'f302218b0366c2102a3447330684adcdb576217aba5d1bb157e73717d6734ce5' + '6f70b0d3d5e4a3f78b15d8f49515cd33cbf0c9d2ac22f94f0d3fabb3f620e458' + 'b769c977b193680f2f549997fd8e07f6aa507071dfd519d59255ab4c687ebfcd') +validpgpkeys=(71A3B16735405025D447E8F274810B012346C9A6) + +prepare() { + cd "$pkgbase-$pkgver" + #patch -Np1 -i "$srcdir/0001-Make-boost-multi_index-comparators-const.patch" + ./autogen.sh +} + +build() { + cd $pkgbase-$pkgver + ./configure --prefix=/usr --with-gui=qt5 --with-incompatible-bdb #LDFLAGS="-L$srcdir/db4/lib/ $LDFLAGS" CPPFLAGS="-I$srcdir/db4/include/ $CPPFLAGS" + make +} + +package_bitcoin-qt() { + pkgdesc="Bitcoin is a peer-to-peer network based digital currency - Qt" + depends=(boost-libs libevent qt5-base miniupnpc libminiupnpc.so qrencode protobuf zeromq) + + cd $pkgbase-$pkgver + install -Dm755 src/qt/bitcoin-qt "$pkgdir"/usr/bin/bitcoin-qt + install -Dm644 doc/man/bitcoin-qt.1 \ + "$pkgdir"/usr/share/man/man1/bitcoin-qt.1 + install -Dm644 contrib/debian/bitcoin-qt.desktop \ + "$pkgdir"/usr/share/applications/bitcoin.desktop + install -Dm644 share/pixmaps/bitcoin128.png \ + "$pkgdir"/usr/share/pixmaps/bitcoin128.png + + install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" +} + +package_bitcoin-daemon() { + pkgdesc="Bitcoin is a peer-to-peer network based digital currency - daemon" + depends=(boost-libs libevent miniupnpc libminiupnpc.so zeromq) + + cd $pkgbase-$pkgver + install -Dm755 src/bitcoind "$pkgdir"/usr/bin/bitcoind + install -Dm644 contrib/bitcoind.bash-completion \ + "$pkgdir"/usr/share/bash-completion/completions/bitcoind + install -Dm644 doc/man/bitcoind.1 \ + "$pkgdir"/usr/share/man/man1/bitcoind.1 + install -Dm644 contrib/debian/examples/bitcoin.conf \ + "$pkgdir/usr/share/doc/$pkgname/examples/bitcoin.conf" + install -Dm644 contrib/init/bitcoind.service \ + "$pkgdir/usr/lib/systemd/system/bitcoind.service" + install -Dm644 "$srcdir/bitcoin.sysusers" \ + "$pkgdir/usr/lib/sysusers.d/bitcoin.conf" + install -Dm644 "$srcdir/bitcoin.tmpfiles" \ + "$pkgdir/usr/lib/tmpfiles.d/bitcoin.conf" + + install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" +} + +package_bitcoin-cli() { + pkgdesc="Bitcoin is a peer-to-peer network based digital currency - RPC client" + depends=(boost-libs libevent) + + cd $pkgbase-$pkgver + install -Dm755 src/bitcoin-cli "$pkgdir"/usr/bin/bitcoin-cli + install -Dm644 contrib/bitcoin-cli.bash-completion \ + "$pkgdir"/usr/share/bash-completion/completions/bitcoin-cli + install -Dm644 doc/man/bitcoin-cli.1 \ + "$pkgdir"/usr/share/man/man1/bitcoin-cli.1 + + install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" +} + +package_bitcoin-tx() { + pkgdesc="Bitcoin is a peer-to-peer network based digital currency - Transaction tool" + depends=(boost-libs openssl) + + cd $pkgbase-$pkgver + install -Dm755 src/bitcoin-tx "$pkgdir"/usr/bin/bitcoin-tx + install -Dm644 contrib/bitcoin-tx.bash-completion \ + "$pkgdir"/usr/share/bash-completion/completions/bitcoin-tx + install -Dm644 doc/man/bitcoin-tx.1 \ + "$pkgdir"/usr/share/man/man1/bitcoin-tx.1 + + install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" +} + +# vim:set ts=2 sw=2 et: Deleted: bitcoin.sysusers =================================================================== --- bitcoin.sysusers 2018-06-18 18:10:32 UTC (rev 344017) +++ bitcoin.sysusers 2018-06-18 18:10:44 UTC (rev 344018) @@ -1 +0,0 @@ -u bitcoin - - /var/lib/bitcoin Copied: bitcoin/repos/community-x86_64/bitcoin.sysusers (from rev 344017, bitcoin/trunk/bitcoin.sysusers) =================================================================== --- bitcoin.sysusers (rev 0) +++ bitcoin.sysusers 2018-06-18 18:10:44 UTC (rev 344018) @@ -0,0 +1 @@ +u bitcoin - - /var/lib/bitcoin Deleted: bitcoin.tmpfiles =================================================================== --- bitcoin.tmpfiles 2018-06-18 18:10:32 UTC (rev 344017) +++ bitcoin.tmpfiles 2018-06-18 18:10:44 UTC (rev 344018) @@ -1,2 +0,0 @@ -d /var/lib/bitcoin 0770 bitcoin bitcoin - - -d /etc/bitcoin 0770 bitcoin bitcoin - - Copied: bitcoin/repos/community-x86_64/bitcoin.tmpfiles (from rev 344017, bitcoin/trunk/bitcoin.tmpfiles) =================================================================== --- bitcoin.tmpfiles (rev 0) +++ bitcoin.tmpfiles 2018-06-18 18:10:44 UTC (rev 344018) @@ -0,0 +1,2 @@ +d /var/lib/bitcoin 0770 bitcoin bitcoin - - +d /etc/bitcoin 0770 bitcoin bitcoin - -