From owner-svn-ports-all@freebsd.org Sun Jun 10 12:37:36 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9E7071020341; Sun, 10 Jun 2018 12:37:36 +0000 (UTC) (envelope-from tijl@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 516AA7FB52; Sun, 10 Jun 2018 12:37:36 +0000 (UTC) (envelope-from tijl@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 341CF4F01; Sun, 10 Jun 2018 12:37:36 +0000 (UTC) (envelope-from tijl@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w5ACbZWq098156; Sun, 10 Jun 2018 12:37:35 GMT (envelope-from tijl@FreeBSD.org) Received: (from tijl@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w5ACbZec098155; Sun, 10 Jun 2018 12:37:35 GMT (envelope-from tijl@FreeBSD.org) Message-Id: <201806101237.w5ACbZec098155@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tijl set sender to tijl@FreeBSD.org using -f From: Tijl Coosemans Date: Sun, 10 Jun 2018 12:37:35 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r472132 - head/net-p2p/qtum/files X-SVN-Group: ports-head X-SVN-Commit-Author: tijl X-SVN-Commit-Paths: head/net-p2p/qtum/files X-SVN-Commit-Revision: 472132 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 10 Jun 2018 12:37:36 -0000 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 _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