Date: Sun, 10 Jun 2018 12:37:35 +0000 (UTC) From: Tijl Coosemans <tijl@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r472132 - head/net-p2p/qtum/files Message-ID: <201806101237.w5ACbZec098155@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tijl Date: Sun Jun 10 12:37:35 2018 New Revision: 472132 URL: https://svnweb.freebsd.org/changeset/ports/472132 Log: Restore patch removed in r471914. It is still needed on FreeBSD 10. Reported by: exp-run Added: head/net-p2p/qtum/files/ - copied from r471913, head/net-p2p/qtum/files/ Modified: head/net-p2p/qtum/files/patch-src_wallet_wallet.h Modified: head/net-p2p/qtum/files/patch-src_wallet_wallet.h ============================================================================== --- head/net-p2p/qtum/files/patch-src_wallet_wallet.h Thu Jun 7 12:54:42 2018 (r471913) +++ head/net-p2p/qtum/files/patch-src_wallet_wallet.h Sun Jun 10 12:37:35 2018 (r472132) @@ -1,15 +1,6 @@ ---- src/wallet/wallet.h.orig 2018-01-23 18:15:09.538396000 +0200 -+++ src/wallet/wallet.h 2018-01-23 18:15:13.206365000 +0200 -@@ -90,8 +90,6 @@ - class CScript; - class CTxMemPool; - class CWalletTx; --class CTokenTx; --class CContractBookData; - - /** (client) version numbers for particular wallet features */ - enum WalletFeature -@@ -579,6 +577,129 @@ +--- src/wallet/wallet.h.orig 2018-05-25 13:32:42 UTC ++++ src/wallet/wallet.h +@@ -668,7 +668,130 @@ class CAccountingEntry (private) std::vector<char> _ssExtra; }; @@ -19,7 +10,7 @@ +public: + std::string name; + std::string abi; -+ + + CContractBookData() + {} +}; @@ -136,13 +127,15 @@ + + uint256 GetHash() const; +}; - ++ /** * A CWallet is an extension of a keystore, which also maintains a set of transactions and balances, -@@ -1156,128 +1277,4 @@ + * and provides the ability to create new transactions. +@@ -1304,129 +1427,5 @@ bool CWallet::DummySignTx(CMutableTransaction &txNew, + } return true; } - +- -class CTokenInfo -{ -public: @@ -266,5 +259,5 @@ - CContractBookData() - {} -}; -- + #endif // BITCOIN_WALLET_WALLET_H
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201806101237.w5ACbZec098155>