Date: Tuesday, January 2, 2018 @ 14:42:08 Author: jelle Revision: 277705
upgpkg: bitcoin 0.15.1-3 boost 1.66 rebuild Added: bitcoin/trunk/0001-Make-boost-multi_index-comparators-const.patch Modified: bitcoin/trunk/PKGBUILD -----------------------------------------------------+ 0001-Make-boost-multi_index-comparators-const.patch | 85 ++++++++++++++++++ PKGBUILD | 14 +- 2 files changed, 93 insertions(+), 6 deletions(-) Added: 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-01-02 14:42:08 UTC (rev 277705) @@ -0,0 +1,85 @@ +From 1ec0c0a01c316146434642ab2f14a7367306dbec Mon Sep 17 00:00:00 2001 +From: Suhas Daftuar <[email protected]> +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 + Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-01-02 14:21:00 UTC (rev 277704) +++ PKGBUILD 2018-01-02 14:42:08 UTC (rev 277705) @@ -7,13 +7,14 @@ pkgbase=bitcoin pkgname=('bitcoin-daemon' 'bitcoin-cli' 'bitcoin-qt' 'bitcoin-tx') pkgver=0.15.1 -pkgrel=2 +pkgrel=3 arch=('x86_64') url="http://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";) -sha256sums=('e429d4f257f2b5b6d0caaf36ed1a5f5203e5918c57837efac00b0c322a1fef79') +source=($pkgname-$pkgver.tar.gz::"https://github.com/bitcoin/bitcoin/archive/v$pkgver.tar.gz"; "0001-Make-boost-multi_index-comparators-const.patch") +sha256sums=('e429d4f257f2b5b6d0caaf36ed1a5f5203e5918c57837efac00b0c322a1fef79' + 'f302218b0366c2102a3447330684adcdb576217aba5d1bb157e73717d6734ce5') validpgpkeys=(71A3B16735405025D447E8F274810B012346C9A6) _parse_gpg_statusfile() { @@ -144,10 +145,11 @@ fi } -#prepare() { -# cd "$pkgbase" +prepare() { + cd "$pkgbase-$pkgver" # _validate_gpg_tag "v${pkgver}" -#} + patch -Np1 -i $srcdir/0001-Make-boost-multi_index-comparators-const.patch +} build() { cd $pkgbase-$pkgver
