diff --git a/bitcoin-0.15.1.tar.gz b/bitcoin-0.15.1.tar.gz deleted file mode 100644 index ff09ca2..0000000 --- a/bitcoin-0.15.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:98b3a98a67054123bef6714e4035e18f9250a1b6d63829258ad057906e75d8b1 -size 7547736 diff --git a/bitcoin-0.16.0.tar.gz b/bitcoin-0.16.0.tar.gz new file mode 100644 index 0000000..a7c42ce --- /dev/null +++ b/bitcoin-0.16.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8ade43e420b6aad00645d79239c21947e47f37d1f974b4948b0da0b6999c28d5 +size 6627084 diff --git a/bitcoin-boost_1_66.patch b/bitcoin-boost_1_66.patch deleted file mode 100644 index 4003fa0..0000000 --- a/bitcoin-boost_1_66.patch +++ /dev/null @@ -1,82 +0,0 @@ -From 1ec0c0a01c316146434642ab2f14a7367306dbec Mon Sep 17 00:00:00 2001 -From: Suhas Daftuar -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 36276dc362c5..d81ec6421cb8 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 346585ab115e..86a008d7b211 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 @@ class CompareTxMemPoolEntryByDescendantScore - } - - // 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 @@ class CompareTxMemPoolEntryByDescendantScore - 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 @@ class CompareTxMemPoolEntryByScore - 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 @@ class CompareTxMemPoolEntryByEntryTime - 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(); diff --git a/bitcoin.changes b/bitcoin.changes index 1e34ca4..711fb6e 100644 --- a/bitcoin.changes +++ b/bitcoin.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Fri Mar 9 12:24:09 UTC 2018 - develop7@develop7.info + +- Update to version 0.16.0 + * Segwit Wallet + * BIP173 (Bech32) Address support ("bc1..." addresses) + * HD-wallets by default + * Replace-By-Fee by default in GUI + * Wallets directory configuration (`-walletdir`) + * Build: Minimum GCC bumped to 4.8.x + * Support for signalling pruned nodes (BIP159) + * Performance: SHA256 assembly enabled by default + * GUI changes + * RPC changes +- Remove bitcoin-boost_1_66.patch + ------------------------------------------------------------------- Tue Jan 2 21:13:00 UTC 2018 - jengelh@inai.de diff --git a/bitcoin.spec b/bitcoin.spec index 7eda175..f2fc096 100644 --- a/bitcoin.spec +++ b/bitcoin.spec @@ -24,7 +24,7 @@ %define consensus 1 %define is_base 1 Name: bitcoin -Version: 0.15.1 +Version: 0.16.0 Release: 0 Summary: P2P Digital Currency License: MIT @@ -34,7 +34,6 @@ Source0: https://github.com/%{name}/%{name}/archive/v%{version}.tar.gz#/% Source1: %{base}d.service Source2: %{base}d.firewall Source3: %{base}d.conf -Patch0: bitcoin-boost_1_66.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: gcc-c++ @@ -171,7 +170,6 @@ This package provides automated tests for %{name}-qt5 and %{name}d. %prep %setup -q -%patch0 -p1 # remove 128 resolution from Icon= line sed -i s/128// contrib/debian/%{name}-qt.desktop