From 3a397094147bc4ba251ef6dce464a16965c3133a Mon Sep 17 00:00:00 2001 From: Adrian Gallagher Date: Sun, 25 Jun 2017 17:22:58 -0700 Subject: [PATCH 1/4] Update protobuf dependancy Fixes protobuf2.6 depreciated warning. Issue https://github.com/litecoin-project/litecoin/issues/291 --- doc/build-osx.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/build-osx.md b/doc/build-osx.md index 21ae238c1e..6d8b68dacd 100644 --- a/doc/build-osx.md +++ b/doc/build-osx.md @@ -16,7 +16,7 @@ Then install [Homebrew](http://brew.sh). Dependencies ---------------------- - brew install automake berkeley-db4 libtool boost --c++11 miniupnpc openssl pkg-config homebrew/versions/protobuf260 --c++11 qt5 libevent + brew install automake berkeley-db4 libtool boost --c++11 miniupnpc openssl pkg-config protobuf --c++11 qt5 libevent In case you want to build the disk image with `make deploy` (.dmg / optional), you need RSVG From 19217d9d3fd29aef92b5cc885b9f6f625480ccb0 Mon Sep 17 00:00:00 2001 From: Jonas Schnelli Date: Tue, 21 Feb 2017 14:36:36 +0100 Subject: [PATCH 2/4] Fix segfault crash when shutdown the GUI in disablewallet mode Github-Pull: #9817 Rebased-From: 312c4f10574ccf6dfe0d4ecb3ce928733d3a1e52 --- src/qt/bitcoingui.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp index 6426186b6e..4dd707107c 100644 --- a/src/qt/bitcoingui.cpp +++ b/src/qt/bitcoingui.cpp @@ -499,7 +499,10 @@ void BitcoinGUI::setClientModel(ClientModel *clientModel) // Propagate cleared model to child objects rpcConsole->setClientModel(nullptr); #ifdef ENABLE_WALLET - walletFrame->setClientModel(nullptr); + if (walletFrame) + { + walletFrame->setClientModel(nullptr); + } #endif // ENABLE_WALLET unitDisplayControl->setOptionsModel(nullptr); } From 4202c826b4b32742928e74320512325ee3d3aea1 Mon Sep 17 00:00:00 2001 From: fanquake Date: Wed, 17 May 2017 17:41:52 +0800 Subject: [PATCH 3/4] [depends] miniupnpc 2.0.20170509 Github-Pull: #10414 Rebased-From: af5d48c9a03182fdf121623bd98136b66d0fcb27 --- depends/packages/miniupnpc.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/depends/packages/miniupnpc.mk b/depends/packages/miniupnpc.mk index e34cf7be2f..1bb8cb5d26 100644 --- a/depends/packages/miniupnpc.mk +++ b/depends/packages/miniupnpc.mk @@ -1,8 +1,8 @@ package=miniupnpc -$(package)_version=2.0 +$(package)_version=2.0.20170509 $(package)_download_path=http://miniupnp.free.fr/files $(package)_file_name=$(package)-$($(package)_version).tar.gz -$(package)_sha256_hash=d434ceb8986efbe199c5ca53f90ed53eab290b1e6d0530b717eb6fa49d61f93b +$(package)_sha256_hash=d3c368627f5cdfb66d3ebd64ca39ba54d6ff14a61966dbecb8dd296b7039f16a define $(package)_set_vars $(package)_build_opts=CC="$($(package)_cc)" From 1dff93624147d6990571a1e726524339d9844338 Mon Sep 17 00:00:00 2001 From: Alex Morcos Date: Thu, 18 May 2017 16:57:53 -0400 Subject: [PATCH 4/4] Populate services in GetLocalAddress Previously if we didn't have any local addresses, GetLocalAddress would return 0.0.0.0 and then we'd swap in a peer's notion of our address in AdvertiseLocal, but then nServices would never get set. Github-Pull: #10424 Rebased-From: 307013469f9a3b8f13d3eb9dbeea419a55148493 --- src/net.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/net.cpp b/src/net.cpp index 1184519bc0..6bf8f42873 100644 --- a/src/net.cpp +++ b/src/net.cpp @@ -179,7 +179,7 @@ static std::vector convertSeed6(const std::vector &vSeedsIn // one by discovery. CAddress GetLocalAddress(const CNetAddr *paddrPeer) { - CAddress ret(CService("0.0.0.0",GetListenPort()), NODE_NONE); + CAddress ret(CService("0.0.0.0",GetListenPort()), nLocalServices); CService addr; if (GetLocal(addr, paddrPeer)) {