Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-p2p/litecoind/, net-p2p/litecoind/files/
Date: Fri, 02 Jun 2017 07:04:38
Message-Id: 1496386634.ff8fa3b25d4610c3054fb8a8aad9d2fe7ac6e945.soap@gentoo
1 commit: ff8fa3b25d4610c3054fb8a8aad9d2fe7ac6e945
2 Author: Peter Levine <plevine457 <AT> gmail <DOT> com>
3 AuthorDate: Sun May 28 00:20:00 2017 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Fri Jun 2 06:57:14 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff8fa3b2
7
8 net-p2p/litecoind: Fix building with GCC-6
9
10 Bug: https://bugs.gentoo.org/show_bug.cgi?id=594686
11 Package-Manager: Portage-2.3.6, Repoman-2.3.2
12 Closes: https://github.com/gentoo/gentoo/pull/4782
13
14 .../litecoind/files/litecoind-0.10.4.0-gcc6.patch | 47 ++++++++++++++++++++++
15 net-p2p/litecoind/litecoind-0.10.4.0.ebuild | 3 +-
16 2 files changed, 49 insertions(+), 1 deletion(-)
17
18 diff --git a/net-p2p/litecoind/files/litecoind-0.10.4.0-gcc6.patch b/net-p2p/litecoind/files/litecoind-0.10.4.0-gcc6.patch
19 new file mode 100644
20 index 00000000000..5c7e44da3d3
21 --- /dev/null
22 +++ b/net-p2p/litecoind/files/litecoind-0.10.4.0-gcc6.patch
23 @@ -0,0 +1,47 @@
24 +From 40ce41c006787dc4a2e3b17f7abbaf8ff56c45e7 Mon Sep 17 00:00:00 2001
25 +From: Adrian Gallagher <thrasher@×××××××××××××××××.com>
26 +Date: Tue, 25 Oct 2016 17:48:19 -0700
27 +Subject: [PATCH] Litecoin: Fix build boost compilation error with C++11
28 +
29 +---
30 + src/chainparams.cpp | 20 ++++++++++----------
31 + 1 file changed, 10 insertions(+), 10 deletions(-)
32 +
33 +diff --git a/src/chainparams.cpp b/src/chainparams.cpp
34 +index ba8e33d1c14..7f99e45b7ad 100644
35 +--- a/src/chainparams.cpp
36 ++++ b/src/chainparams.cpp
37 +@@ -163,11 +163,11 @@ class CMainParams : public CChainParams {
38 + vSeeds.push_back(CDNSSeedData("weminemnc.com", "dnsseed.weminemnc.com"));
39 + vSeeds.push_back(CDNSSeedData("loshan.co.uk", "seed-a.litecoin.loshan.co.uk"));
40 +
41 +- base58Prefixes[PUBKEY_ADDRESS] = list_of(48);
42 +- base58Prefixes[SCRIPT_ADDRESS] = list_of(5);
43 +- base58Prefixes[SECRET_KEY] = list_of(176);
44 +- base58Prefixes[EXT_PUBLIC_KEY] = list_of(0x04)(0x88)(0xB2)(0x1E);
45 +- base58Prefixes[EXT_SECRET_KEY] = list_of(0x04)(0x88)(0xAD)(0xE4);
46 ++ base58Prefixes[PUBKEY_ADDRESS] = std::vector<unsigned char>(1,48);
47 ++ base58Prefixes[SCRIPT_ADDRESS] = std::vector<unsigned char>(1,5);
48 ++ base58Prefixes[SECRET_KEY] = std::vector<unsigned char>(1,176);
49 ++ base58Prefixes[EXT_PUBLIC_KEY] = boost::assign::list_of(0x04)(0x88)(0xB2)(0x1E).convert_to_container<std::vector<unsigned char> >();
50 ++ base58Prefixes[EXT_SECRET_KEY] = boost::assign::list_of(0x04)(0x88)(0xAD)(0xE4).convert_to_container<std::vector<unsigned char> >();
51 +
52 + convertSeed6(vFixedSeeds, pnSeed6_main, ARRAYLEN(pnSeed6_main));
53 +
54 +@@ -225,11 +225,11 @@ class CTestNetParams : public CMainParams {
55 + vSeeds.push_back(CDNSSeedData("xurious.com", "testnet-seed.ltc.xurious.com"));
56 + vSeeds.push_back(CDNSSeedData("wemine-testnet.com", "dnsseed.wemine-testnet.com"));
57 +
58 +- base58Prefixes[PUBKEY_ADDRESS] = list_of(111);
59 +- base58Prefixes[SCRIPT_ADDRESS] = list_of(196);
60 +- base58Prefixes[SECRET_KEY] = list_of(239);
61 +- base58Prefixes[EXT_PUBLIC_KEY] = list_of(0x04)(0x35)(0x87)(0xCF);
62 +- base58Prefixes[EXT_SECRET_KEY] = list_of(0x04)(0x35)(0x83)(0x94);
63 ++ base58Prefixes[PUBKEY_ADDRESS] = std::vector<unsigned char>(1,111);
64 ++ base58Prefixes[SCRIPT_ADDRESS] = std::vector<unsigned char>(1,196);
65 ++ base58Prefixes[SECRET_KEY] = std::vector<unsigned char>(1,239);
66 ++ base58Prefixes[EXT_PUBLIC_KEY] = boost::assign::list_of(0x04)(0x35)(0x87)(0xCF).convert_to_container<std::vector<unsigned char> >();
67 ++ base58Prefixes[EXT_SECRET_KEY] = boost::assign::list_of(0x04)(0x35)(0x83)(0x94).convert_to_container<std::vector<unsigned char> >();
68 +
69 + convertSeed6(vFixedSeeds, pnSeed6_test, ARRAYLEN(pnSeed6_test));
70 +
71
72 diff --git a/net-p2p/litecoind/litecoind-0.10.4.0.ebuild b/net-p2p/litecoind/litecoind-0.10.4.0.ebuild
73 index b2c9ac6a5f9..f4502b3b319 100644
74 --- a/net-p2p/litecoind/litecoind-0.10.4.0.ebuild
75 +++ b/net-p2p/litecoind/litecoind-0.10.4.0.ebuild
76 @@ -1,4 +1,4 @@
77 -# Copyright 1999-2016 Gentoo Foundation
78 +# Copyright 1999-2017 Gentoo Foundation
79 # Distributed under the terms of the GNU General Public License v2
80
81 EAPI=5
82 @@ -45,6 +45,7 @@ src_prepare() {
83 epatch "${FILESDIR}"/0.9.0-sys_leveldb.patch
84 epatch "${FILESDIR}"/litecoind-0.10.2.2-memenv_h.patch
85 epatch "${FILESDIR}"/litecoind-0.10.2.2-fix-gnustack.patch
86 + epatch "${FILESDIR}"/${P}-gcc6.patch
87 eautoreconf
88 rm -r src/leveldb
89 }