<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[136010] trunk/dports/finance/bitcoin</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/136010">136010</a></dd>
<dt>Author</dt> <dd>easieste@macports.org</dd>
<dt>Date</dt> <dd>2015-05-09 06:58:44 -0700 (Sat, 09 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Update to finance/bitcoin-0.10.1</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsfinancebitcoinPortfile">trunk/dports/finance/bitcoin/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/dports/finance/bitcoin/files/</li>
<li><a href="#trunkdportsfinancebitcoinfilessrcrpcrawtransactioncppdiff">trunk/dports/finance/bitcoin/files/src-rpcrawtransaction.cpp.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsfinancebitcoinPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/finance/bitcoin/Portfile (136009 => 136010)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/finance/bitcoin/Portfile 2015-05-09 12:25:22 UTC (rev 136009)
+++ trunk/dports/finance/bitcoin/Portfile 2015-05-09 13:58:44 UTC (rev 136010)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx">
</span><span class="cx"> name bitcoin
</span><span class="cx"> categories finance crypto
</span><del>-version 0.10.0
</del><ins>+version 0.10.1
</ins><span class="cx"> platforms darwin
</span><span class="cx"> license MIT
</span><span class="cx"> maintainers easieste yopmail.com:sami.laine openmaintainer
</span><span class="lines">@@ -17,11 +17,11 @@
</span><span class="cx"> operating through the nodes of the network.
</span><span class="cx"> homepage http://www.bitcoin.org/
</span><span class="cx">
</span><del>-master_sites https://github.com/[string repeat "$name/" 2]archive/
-distname v${version}
</del><ins>+master_sites https://bitcoin.org/bin/bitcoin-core-0.10.1/
+
</ins><span class="cx"> worksrcdir ${name}-${version}
</span><del>-checksums rmd160 4f0148a29071f7aff727cc1d617abc4d4932889e \
- sha256 be57f3b0d64a797873189e45851f3b3510832e14ff18b5f563e1ba8911d145ac
</del><ins>+checksums rmd160 5aeaaeeff59d77b9f8e1a5a3bba04379d7190c73 \
+ sha256 287873f9ba4fd49cd4e4be7eba070d2606878f1690c5be0273164d37cbf3c138
</ins><span class="cx">
</span><span class="cx"> depends_build port:pkgconfig \
</span><span class="cx"> port:autoconf \
</span><span class="lines">@@ -34,18 +34,15 @@
</span><span class="cx"> port:miniupnpc \
</span><span class="cx"> port:protobuf-cpp
</span><span class="cx">
</span><del>-use_autoreconf yes
-autoreconf.cmd ./autogen.sh
-autoreconf.args
-
-#configure.args --with-gui=no
-#build.args
</del><span class="cx"> use_parallel_build no
</span><span class="cx">
</span><ins>+patchfiles \
+ src-rpcrawtransaction.cpp.diff
+
</ins><span class="cx"> # TODO: Restore GUI: needs to move to qt5, as it doesn't look like qt4 is going to get fixed.
</span><span class="cx"> default_variants +daemon
</span><span class="cx">
</span><del>-variant gui description {BROKEN in qt4 moc of boost headers Attempt build with qt4} {
</del><ins>+variant gui description {NOT WORKING Build with qt4 (Broken in qt4 moc inclusion of boost headers) } {
</ins><span class="cx"> configure.cmd-append --with-gui=qt4
</span><span class="cx"> depends_lib-append port:qt4-mac
</span><span class="cx"> build.args-add appbundle
</span><span class="lines">@@ -58,11 +55,11 @@
</span><span class="cx">
</span><span class="cx"> destroot {
</span><span class="cx"> xinstall -d ${destroot}${prefix}/bin
</span><del>- if {![variant_isset daemon]} {
- set bundle_name Bitcoin-Qt.app
- xinstall -m 755 -d ${destroot}${applications_dir}
- copy ${worksrcpath}/${bundle_name} ${destroot}${applications_dir}/${bundle_name}
- }
</del><ins>+# if {![variant_isset daemon]} {
+# set bundle_name Bitcoin-Qt.app
+# xinstall -m 755 -d ${destroot}${applications_dir}
+# copy ${worksrcpath}/${bundle_name} ${destroot}${applications_dir}/${bundle_name}
+# }
</ins><span class="cx"> xinstall -m 755 -W ${worksrcpath} src/bitcoind ${destroot}${prefix}/bin
</span><span class="cx"> xinstall -m 755 -W ${worksrcpath} src/bitcoin-cli ${destroot}${prefix}/bin
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportsfinancebitcoinfilessrcrpcrawtransactioncppdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/finance/bitcoin/files/src-rpcrawtransaction.cpp.diff (0 => 136010)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/finance/bitcoin/files/src-rpcrawtransaction.cpp.diff (rev 0)
+++ trunk/dports/finance/bitcoin/files/src-rpcrawtransaction.cpp.diff 2015-05-09 13:58:44 UTC (rev 136010)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+# Adapted from fix <https://github.com/bitcoin/bitcoin/issues/6056>
+diff -r 23cbba64aefc src/rpcrawtransaction.cpp
+--- src/rpcrawtransaction.cpp Sat Apr 25 10:04:50 2015 +0200
++++ src/rpcrawtransaction.cpp Sat May 09 15:40:41 2015 +0200
+@@ -287,7 +287,7 @@
+ if (pk.IsPayToScriptHash()) {
+ CTxDestination address;
+ if (ExtractDestination(pk, address)) {
+- const CScriptID& hash = boost::get<const CScriptID&>(address);
++ const CScriptID& hash = boost::get<CScriptID>(address);
+ CScript redeemScript;
+ if (pwalletMain->GetCScript(hash, redeemScript))
+ entry.push_back(Pair("redeemScript", HexStr(redeemScript.begin(), redeemScript.end())));
</ins></span></pre>
</div>
</div>
</body>
</html>