diff options
author | Andreas Sturmlechner <asturm@gentoo.org> | 2017-01-22 22:01:13 +0100 |
---|---|---|
committer | Andreas Sturmlechner <asturm@gentoo.org> | 2017-01-24 02:17:23 +0100 |
commit | cff04654f02bccf426af47586aa224126b871201 (patch) | |
tree | 89b849c3001778b8a2929c9c7a35bd695344f8d8 /net-p2p/bitcoin-qt/files | |
parent | net-p2p/bitcoin-cli: Drop old (diff) | |
download | gentoo-cff04654f02bccf426af47586aa224126b871201.tar.gz gentoo-cff04654f02bccf426af47586aa224126b871201.tar.bz2 gentoo-cff04654f02bccf426af47586aa224126b871201.zip |
net-p2p/bitcoin-qt: Drop old
Package-Manager: portage-2.3.0
Diffstat (limited to 'net-p2p/bitcoin-qt/files')
-rw-r--r-- | net-p2p/bitcoin-qt/files/0.12.0-libressl.patch | 26 | ||||
-rw-r--r-- | net-p2p/bitcoin-qt/files/miniupnpc-14.patch | 28 |
2 files changed, 0 insertions, 54 deletions
diff --git a/net-p2p/bitcoin-qt/files/0.12.0-libressl.patch b/net-p2p/bitcoin-qt/files/0.12.0-libressl.patch deleted file mode 100644 index 73f6f12a3a36..000000000000 --- a/net-p2p/bitcoin-qt/files/0.12.0-libressl.patch +++ /dev/null @@ -1,26 +0,0 @@ -commit c5449b0bb7e6918773579fad6ea08c60e82cb73c -Author: Luke Dashjr <luke-jr+git@utopios.org> -Date: Thu Mar 17 07:24:22 2016 +0000 - - Bugfix: Actually fix LibreSSL build - -diff --git a/src/qt/rpcconsole.cpp b/src/qt/rpcconsole.cpp -index cf59357..e51a5e9 100644 ---- a/src/qt/rpcconsole.cpp -+++ b/src/qt/rpcconsole.cpp -@@ -264,10 +264,12 @@ RPCConsole::RPCConsole(const PlatformStyle *platformStyle, QWidget *parent) : - - // set library version labels - --#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) -- ui->openSSLVersion->setText(OpenSSL_version(OPENSSL_VERSION)); --#else -+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) - ui->openSSLVersion->setText(SSLeay_version(SSLEAY_VERSION)); -+#elif defined OPENSSL_VERSION -+ ui->openSSLVersion->setText(OpenSSL_version(OPENSSL_VERSION)); -+#elif defined LIBRESSL_VERSION_TEXT -+ ui->openSSLVersion->setText(LIBRESSL_VERSION_TEXT); - #endif - - #ifdef ENABLE_WALLET diff --git a/net-p2p/bitcoin-qt/files/miniupnpc-14.patch b/net-p2p/bitcoin-qt/files/miniupnpc-14.patch deleted file mode 100644 index aa8e32ff7c1a..000000000000 --- a/net-p2p/bitcoin-qt/files/miniupnpc-14.patch +++ /dev/null @@ -1,28 +0,0 @@ -commit 9f3e48e5219a09b5ddfd6883d1f0498910eff4b6 (origin-pull/6583/head) -Author: Pavel Vasin <pavel@vasin.nl> -Date: Sun Aug 23 23:53:49 2015 +0300 - - add support for miniupnpc api version 14 - - The value of new arg ttl is set to 2 as it's recommended default. - -diff --git a/src/net.cpp b/src/net.cpp -index fb5726a..4c6331f 100644 ---- a/src/net.cpp -+++ b/src/net.cpp -@@ -1120,10 +1120,14 @@ void ThreadMapPort() - #ifndef UPNPDISCOVER_SUCCESS - /* miniupnpc 1.5 */ - devlist = upnpDiscover(2000, multicastif, minissdpdpath, 0); --#else -+#elif MINIUPNPC_API_VERSION < 14 - /* miniupnpc 1.6 */ - int error = 0; - devlist = upnpDiscover(2000, multicastif, minissdpdpath, 0, 0, &error); -+#else -+ /* miniupnpc 1.9.20150730 */ -+ int error = 0; -+ devlist = upnpDiscover(2000, multicastif, minissdpdpath, 0, 0, 2, &error); - #endif - - struct UPNPUrls urls; |