net-p2p/qtum: Upgrade from 0.14.13 to 0.14.14

4 files changed, 6 insertions, 85 deletions

diff --git a/net-p2p/qtum/Makefile b/net-p2p/qtum/Makefile
index 47715f80ff31..00a60aa5eb7c 100644
--- a/net-p2p/qtum/Makefile
+++ b/net-p2p/qtum/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	qtum
-PORTVERSION=	0.14.13
+PORTVERSION=	0.14.14
 DISTVERSIONPREFIX=	mainnet-ignition-v
 CATEGORIES=	net-p2p finance
 
@@ -39,11 +39,8 @@ CONFIGURE_ARGS=	--disable-man \
 USES=		autoreconf bdb:5 compiler:c++11-lib gmake libtool pkgconfig ssl
 USE_QT5=	buildtools core dbus gui linguisttools network testlib widgets
 USE_GITHUB=	yes
-GH_ACCOUNT=	qtumproject
-GH_PROJECT=	qtum
-# Add extra account:project:tag:meaninglessgroupname/sub/dir via GH_TUPLE
-# for the one git submodule used by Qtum.
-GH_TUPLE=	qtumproject:cpp-eth-qtum:488ccdc7cef0a0b4fa54c8:cppeth/src/cpp-ethereum
+GH_TUPLE=	qtumproject:qtum:${DISTVERSIONPREFIX}${PORTVERSION} \
+		qtumproject:cpp-eth-qtum:488ccdc7cef0a0b4fa54c8:cppeth/src/cpp-ethereum
 
 .include <bsd.port.pre.mk>
 
diff --git a/net-p2p/qtum/distinfo b/net-p2p/qtum/distinfo
index f29999619e24..15c7ae80be17 100644
--- a/net-p2p/qtum/distinfo
+++ b/net-p2p/qtum/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1516443928
-SHA256 (qtumproject-qtum-mainnet-ignition-v0.14.13_GH0.tar.gz) = 30cbd2ff31208e9f76558b8bef820ecdc7bc2d3d87768e6d8fb1014aab233a7c
-SIZE (qtumproject-qtum-mainnet-ignition-v0.14.13_GH0.tar.gz) = 12711274
+TIMESTAMP = 1517834793
+SHA256 (qtumproject-qtum-mainnet-ignition-v0.14.14_GH0.tar.gz) = 45a0ee545a9c9b4c623b926f3c59113968e40dbb3113da9b6369afdec7146e3b
+SIZE (qtumproject-qtum-mainnet-ignition-v0.14.14_GH0.tar.gz) = 12869242
 SHA256 (qtumproject-cpp-eth-qtum-488ccdc7cef0a0b4fa54c8_GH0.tar.gz) = 7e4325f959104ab781892d5078d33b53de2d4efddf7effe67a9d837d56872ff2
 SIZE (qtumproject-cpp-eth-qtum-488ccdc7cef0a0b4fa54c8_GH0.tar.gz) = 1113806
diff --git a/net-p2p/qtum/files/patch-src_miner.h b/net-p2p/qtum/files/patch-src_miner.h
deleted file mode 100644
index 30a4ea6b6bc2..000000000000
--- a/net-p2p/qtum/files/patch-src_miner.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/miner.h.orig	2018-01-21 15:27:53 UTC
-+++ src/miner.h
-@@ -99,7 +99,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
-     {
-         bool fAHasCreateOrCall = a.iter->GetTx().HasCreateOrCall();
-         bool fBHasCreateOrCall = b.iter->GetTx().HasCreateOrCall();
diff --git a/net-p2p/qtum/files/patch-src_txmempool.h b/net-p2p/qtum/files/patch-src_txmempool.h
deleted file mode 100644
index ce86aecd9210..000000000000
--- a/net-p2p/qtum/files/patch-src_txmempool.h
+++ /dev/null
@@ -1,65 +0,0 @@
---- src/txmempool.h.orig	2018-01-21 15:28:11 UTC
-+++ src/txmempool.h
-@@ -231,7 +231,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);
-@@ -253,7 +253,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();
-@@ -268,7 +268,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();
-@@ -282,7 +282,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();
-     }
-@@ -291,7 +291,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();
-@@ -314,7 +314,7 @@ public:
- class CompareTxMemPoolEntryByAncestorFeeOrGasPrice
- {
- public:
--    bool operator()(const CTxMemPoolEntry& a, const CTxMemPoolEntry& b)
-+    bool operator()(const CTxMemPoolEntry& a, const CTxMemPoolEntry& b) const
-     {
-         bool fAHasCreateOrCall = a.GetTx().HasCreateOrCall();
-         bool fBHasCreateOrCall = b.GetTx().HasCreateOrCall();
-@@ -801,7 +801,7 @@ typedef std::pair<double, CTxMemPool::tx
- 
- struct TxCoinAgePriorityCompare
- {
--    bool operator()(const TxCoinAgePriority& a, const TxCoinAgePriority& b)
-+    bool operator()(const TxCoinAgePriority& a, const TxCoinAgePriority& b) const
-     {
-         if (a.first == b.first)
-             return CompareTxMemPoolEntryByScore()(*(b.second), *(a.second)); //Reverse order to make sort less than