Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ismael Luceno (82972d39d442d3160b402ffc92501fd2490de938)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ismael Luceno (82972d39d442d3160b402ffc92501fd2490de938)
  • Date: Sat, 30 Jun 2018 18:06:43 +0000

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

net/bitcoin/DETAILS | 7 +-
net/bitcoin/HISTORY | 4 +
net/bitcoin/PRE_BUILD | 4 -
net/bitcoin/patches/boost-1_66.patch | 82
-----------------------------------
4 files changed, 7 insertions(+), 90 deletions(-)

New commits:
commit 82972d39d442d3160b402ffc92501fd2490de938
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

bitcoin 0.16.1

diff --git a/net/bitcoin/DETAILS b/net/bitcoin/DETAILS
index 9e18d7a..132f136 100755
--- a/net/bitcoin/DETAILS
+++ b/net/bitcoin/DETAILS
@@ -1,10 +1,9 @@
SPELL=bitcoin
- VERSION=0.15.1
+ VERSION=0.16.1
SECURITY_PATCH=1
- PATCHLEVEL=1
SOURCE=$SPELL-$VERSION.tar.gz
- SOURCE_URL[0]=https://github.com/$SPELL/$SPELL/archive/v$VERSION.tar.gz
-
SOURCE_HASH=sha512:bffbed3894039b30b4e6281fb7aeb2ef9703050aa5b8368accc091511c28f1a138337a8ff508ab02a2e5e83f87b71f06839ecbb96b8d468d5b771bde84840f6d
+ SOURCE_URL[0]=https://bitcoincore.org/bin/bitcoin-core-$VERSION/$SOURCE
+
SOURCE_HASH=sha512:c79017ad3fcf1f035bd90456eac4a752cc73878a3c151b9c76240cc49ea230a510fe0bef162fcc0ef913caad7905d3262ee2089b79cdcb7f3eb3b93be653d03c
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE="http://bitcoin.org";
LICENSE[0]=MIT
diff --git a/net/bitcoin/HISTORY b/net/bitcoin/HISTORY
index b883d36..d94959d 100644
--- a/net/bitcoin/HISTORY
+++ b/net/bitcoin/HISTORY
@@ -1,3 +1,7 @@
+2018-06-30 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 0.16.1
+ * PRE_BUILD, patches/boost-1_66.patch: removed, not needed anymore
+
2018-02-02 Ismael Luceno <ismael AT iodev.co.uk>
* DEPENDS: added missing dependency on libevent

diff --git a/net/bitcoin/PRE_BUILD b/net/bitcoin/PRE_BUILD
deleted file mode 100755
index cfe465c..0000000
--- a/net/bitcoin/PRE_BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-apply_patch_dir patches &&
-./autogen.sh
diff --git a/net/bitcoin/patches/boost-1_66.patch
b/net/bitcoin/patches/boost-1_66.patch
deleted file mode 100644
index be13d20..0000000
--- a/net/bitcoin/patches/boost-1_66.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From 1ec0c0a01c316146434642ab2f14a7367306dbec Mon Sep 17 00:00:00 2001
-From: Suhas Daftuar <sdaftuar AT 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 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();



  • [SM-Commit] GIT changes to master grimoire by Ismael Luceno (82972d39d442d3160b402ffc92501fd2490de938), Ismael Luceno, 06/30/2018

Archive powered by MHonArc 2.6.24.

Top of Page