Attachment #196876 for bug #231167

View | Details | Raw Unified | Return to bug 231167
Collapse All | Expand All




# $FreeBSD$

PORTNAME=	namecoin
PORTVERSION=	0.16.2
DISTVERSIONPREFIX=	nc
PORTEPOCH=	1
CATEGORIES=	net-p2p dns


CONFLICTS_INSTALL=	namecoin-beta-[0-9]* namecoin-beta-daemon-[0-9]* namecoin-beta-utils-[0-9]* \
		namecoin-stable-[0-9]* namecoin-stable-daemon-[0-9]* namecoin-stable-utils-[0-9]*

USES=		autoreconf compiler:c++11-lib gmake libtool pkgconfig ssl
SHEBANG_FILES=	src/test/*.py
GNU_CONFIGURE=	yes

USE_GITHUB=	yes
GH_ACCOUNT=	indolering:graphics
GH_PROJECT=	namecoin-core namecoin-graphics:graphics
GH_TAGNAME=	a13a73b:graphics

SLAVE_PORT?=	no


Lines 1-5 Link Here

(-)net-p2p/namecoin/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1500647782	1	TIMESTAMP = 1536120223
2	SHA256 (namecoin-namecoin-core-0.13.2-ab08f76_GH0.tar.gz) = 27ee9f0fca2f9d98bfc298848ad2b899a895c0c7c8e63caca2ee317c927cd178	2	SHA256 (namecoin-namecoin-core-nc0.16.2_GH0.tar.gz) = 2dec11332ce3284dfe3d9a6291eb770e1c27fcdb707f13b542494db527aa8d99
3	SIZE (namecoin-namecoin-core-0.13.2-ab08f76_GH0.tar.gz) = 5917889	3	SIZE (namecoin-namecoin-core-nc0.16.2_GH0.tar.gz) = 5510735
4	SHA256 (indolering-namecoin-graphics-a13a73b_GH0.tar.gz) = 82f308a3527d96a202099feb96a754d036bbdaa875156ad002ba2747d75000c7	4	SHA256 (indolering-namecoin-graphics-a13a73b_GH0.tar.gz) = 82f308a3527d96a202099feb96a754d036bbdaa875156ad002ba2747d75000c7
5	SIZE (indolering-namecoin-graphics-a13a73b_GH0.tar.gz) = 7364908	5	SIZE (indolering-namecoin-graphics-a13a73b_GH0.tar.gz) = 7364908




--- src/miner.h.orig	2017-02-05 10:17:27 UTC
+++ src/miner.h
@@ -73,7 +73,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;
@@ -88,7 +88,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();




--- src/txmempool.h.orig	2017-02-05 10:17:27 UTC
+++ src/txmempool.h
@@ -255,7 +255,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);
@@ -277,7 +277,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();
@@ -292,7 +292,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();
@@ -306,7 +306,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();
     }
@@ -315,7 +315,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();

Return to bug 231167

Lines 2-8 Link Here

(-)net-p2p/namecoin/Makefile (-4 / +4 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= namecoin	4	PORTNAME= namecoin
5	PORTVERSION= 0.13.2	5	PORTVERSION= 0.16.2
		6	DISTVERSIONPREFIX= nc
6	PORTEPOCH= 1	7	PORTEPOCH= 1
7	CATEGORIES= net-p2p dns	8	CATEGORIES= net-p2p dns
8		9
Lines 17-30 Link Here
17	CONFLICTS_INSTALL= namecoin-beta-[0-9]* namecoin-beta-daemon-[0-9]* namecoin-beta-utils-[0-9]* \	18	CONFLICTS_INSTALL= namecoin-beta-[0-9]* namecoin-beta-daemon-[0-9]* namecoin-beta-utils-[0-9]* \
18	namecoin-stable-[0-9]* namecoin-stable-daemon-[0-9]* namecoin-stable-utils-[0-9]*	19	namecoin-stable-[0-9]* namecoin-stable-daemon-[0-9]* namecoin-stable-utils-[0-9]*
19		20
20	USES= autoreconf compiler:c++11-lib gmake libtool pkgconfig shebangfix ssl	21	USES= autoreconf compiler:c++11-lib gmake libtool pkgconfig ssl
21	SHEBANG_FILES= src/test/*.py
22	GNU_CONFIGURE= yes	22	GNU_CONFIGURE= yes
23		23
24	USE_GITHUB= yes	24	USE_GITHUB= yes
25	GH_ACCOUNT= indolering:graphics	25	GH_ACCOUNT= indolering:graphics
26	GH_PROJECT= namecoin-core namecoin-graphics:graphics	26	GH_PROJECT= namecoin-core namecoin-graphics:graphics
27	GH_TAGNAME= ab08f76 a13a73b:graphics	27	GH_TAGNAME= a13a73b:graphics
28		28
29	SLAVE_PORT?= no	29	SLAVE_PORT?= no
30		30

Lines 1-20 Link Here

(-)net-p2p/namecoin/files/patch-src_miner.h (-20 lines)
1	--- src/miner.h.orig 2017-02-05 10:17:27 UTC
2	+++ src/miner.h
3	@@ -73,7 +73,7 @@ struct modifiedentry_iter {
4	// except operating on CTxMemPoolModifiedEntry.
5	// TODO: refactor to avoid duplication of this logic.
6	struct CompareModifiedEntry {
7	- bool operator()(const CTxMemPoolModifiedEntry &a, const CTxMemPoolModifiedEntry &b)
8	+ bool operator()(const CTxMemPoolModifiedEntry &a, const CTxMemPoolModifiedEntry &b) const
9	{
10	double f1 = (double)a.nModFeesWithAncestors * b.nSizeWithAncestors;
11	double f2 = (double)b.nModFeesWithAncestors * a.nSizeWithAncestors;
12	@@ -88,7 +88,7 @@ struct CompareModifiedEntry {
13	// This is sufficient to sort an ancestor package in an order that is valid
14	// to appear in a block.
15	struct CompareTxIterByAncestorCount {
16	- bool operator()(const CTxMemPool::txiter &a, const CTxMemPool::txiter &b)
17	+ bool operator()(const CTxMemPool::txiter &a, const CTxMemPool::txiter &b) const
18	{
19	if (a->GetCountWithAncestors() != b->GetCountWithAncestors())
20	return a->GetCountWithAncestors() < b->GetCountWithAncestors();

Lines 1-47 Link Here

(-)net-p2p/namecoin/files/patch-src_txmempool.h (-47 lines)
1	--- src/txmempool.h.orig 2017-02-05 10:17:27 UTC
2	+++ src/txmempool.h
3	@@ -255,7 +255,7 @@ struct mempoolentry_txid
4	class CompareTxMemPoolEntryByDescendantScore
5	{
6	public:
7	- bool operator()(const CTxMemPoolEntry& a, const CTxMemPoolEntry& b)
8	+ bool operator()(const CTxMemPoolEntry& a, const CTxMemPoolEntry& b) const
9	{
10	bool fUseADescendants = UseDescendantScore(a);
11	bool fUseBDescendants = UseDescendantScore(b);
12	@@ -277,7 +277,7 @@ public:
13	}
14
15	// Calculate which score to use for an entry (avoiding division).
16	- bool UseDescendantScore(const CTxMemPoolEntry &a)
17	+ bool UseDescendantScore(const CTxMemPoolEntry &a) const
18	{
19	double f1 = (double)a.GetModifiedFee() * a.GetSizeWithDescendants();
20	double f2 = (double)a.GetModFeesWithDescendants() * a.GetTxSize();
21	@@ -292,7 +292,7 @@ public:
22	class CompareTxMemPoolEntryByScore
23	{
24	public:
25	- bool operator()(const CTxMemPoolEntry& a, const CTxMemPoolEntry& b)
26	+ bool operator()(const CTxMemPoolEntry& a, const CTxMemPoolEntry& b) const
27	{
28	double f1 = (double)a.GetModifiedFee() * b.GetTxSize();
29	double f2 = (double)b.GetModifiedFee() * a.GetTxSize();
30	@@ -306,7 +306,7 @@ public:
31	class CompareTxMemPoolEntryByEntryTime
32	{
33	public:
34	- bool operator()(const CTxMemPoolEntry& a, const CTxMemPoolEntry& b)
35	+ bool operator()(const CTxMemPoolEntry& a, const CTxMemPoolEntry& b) const
36	{
37	return a.GetTime() < b.GetTime();
38	}
39	@@ -315,7 +315,7 @@ public:
40	class CompareTxMemPoolEntryByAncestorFee
41	{
42	public:
43	- bool operator()(const CTxMemPoolEntry& a, const CTxMemPoolEntry& b)
44	+ bool operator()(const CTxMemPoolEntry& a, const CTxMemPoolEntry& b) const
45	{
46	double aFees = a.GetModFeesWithAncestors();
47	double aSize = a.GetSizeWithAncestors();