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/bitcoin-qt/, net-p2p/bitcoin-qt/files/
Date: Tue, 31 Dec 2019 13:24:23
Message-Id: 1577798650.df43761599a959604676e2245b6e44d7d6a8e44b.soap@gentoo
1 commit: df43761599a959604676e2245b6e44d7d6a8e44b
2 Author: David Seifert <soap <AT> gentoo <DOT> org>
3 AuthorDate: Tue Dec 31 13:24:10 2019 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Tue Dec 31 13:24:10 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df437615
7
8 net-p2p/bitcoin-qt: Add patch for missing include
9
10 Closes: https://bugs.gentoo.org/703544
11 Package-Manager: Portage-2.3.84, Repoman-2.3.20
12 Signed-off-by: David Seifert <soap <AT> gentoo.org>
13
14 net-p2p/bitcoin-qt/bitcoin-qt-0.16.3.ebuild | 1 +
15 net-p2p/bitcoin-qt/bitcoin-qt-0.17.1.ebuild | 1 +
16 net-p2p/bitcoin-qt/bitcoin-qt-0.18.0.ebuild | 1 +
17 ...coin-qt-0.16.3-boost-1.72-missing-include.patch | 24 ++++++++++++++++++++++
18 4 files changed, 27 insertions(+)
19
20 diff --git a/net-p2p/bitcoin-qt/bitcoin-qt-0.16.3.ebuild b/net-p2p/bitcoin-qt/bitcoin-qt-0.16.3.ebuild
21 index e6d5e30a932..0ee413a509b 100644
22 --- a/net-p2p/bitcoin-qt/bitcoin-qt-0.16.3.ebuild
23 +++ b/net-p2p/bitcoin-qt/bitcoin-qt-0.16.3.ebuild
24 @@ -87,6 +87,7 @@ src_prepare() {
25
26 local knots_patchdir="${WORKDIR}/${KNOTS_P}.patches/"
27
28 + eapply "${FILESDIR}"/${PN}-0.16.3-boost-1.72-missing-include.patch
29 eapply "${knots_patchdir}/${KNOTS_P}.syslibs.patch"
30
31 if use knots; then
32
33 diff --git a/net-p2p/bitcoin-qt/bitcoin-qt-0.17.1.ebuild b/net-p2p/bitcoin-qt/bitcoin-qt-0.17.1.ebuild
34 index 28c1e57132f..1ae0e2eadb7 100644
35 --- a/net-p2p/bitcoin-qt/bitcoin-qt-0.17.1.ebuild
36 +++ b/net-p2p/bitcoin-qt/bitcoin-qt-0.17.1.ebuild
37 @@ -85,6 +85,7 @@ src_prepare() {
38
39 local knots_patchdir="${WORKDIR}/${KNOTS_P}.patches/"
40
41 + eapply "${FILESDIR}"/${PN}-0.16.3-boost-1.72-missing-include.patch
42 eapply "${knots_patchdir}/${KNOTS_P}.syslibs.patch"
43
44 if use knots; then
45
46 diff --git a/net-p2p/bitcoin-qt/bitcoin-qt-0.18.0.ebuild b/net-p2p/bitcoin-qt/bitcoin-qt-0.18.0.ebuild
47 index 0aa8b5e1079..5c492841815 100644
48 --- a/net-p2p/bitcoin-qt/bitcoin-qt-0.18.0.ebuild
49 +++ b/net-p2p/bitcoin-qt/bitcoin-qt-0.18.0.ebuild
50 @@ -85,6 +85,7 @@ src_prepare() {
51
52 local knots_patchdir="${WORKDIR}/${KNOTS_P}.patches/"
53
54 + eapply "${FILESDIR}"/${PN}-0.16.3-boost-1.72-missing-include.patch
55 eapply "${knots_patchdir}/${KNOTS_P}.syslibs.patch"
56
57 if use knots; then
58
59 diff --git a/net-p2p/bitcoin-qt/files/bitcoin-qt-0.16.3-boost-1.72-missing-include.patch b/net-p2p/bitcoin-qt/files/bitcoin-qt-0.16.3-boost-1.72-missing-include.patch
60 new file mode 100644
61 index 00000000000..b553a245806
62 --- /dev/null
63 +++ b/net-p2p/bitcoin-qt/files/bitcoin-qt-0.16.3-boost-1.72-missing-include.patch
64 @@ -0,0 +1,24 @@
65 +From a5929130223973636f3fd25fbfaf2953f2ec96a9 Mon Sep 17 00:00:00 2001
66 +From: Jan Beich <jbeich@×××××××.org>
67 +Date: Fri, 25 Oct 2019 13:05:17 +0000
68 +Subject: [PATCH] http: add missing header bootlegged by boost < 1.72
69 +
70 +httpserver.cpp:74:10: error: no template named 'deque' in namespace 'std'
71 + std::deque<std::unique_ptr<WorkItem>> queue;
72 + ~~~~~^
73 +---
74 + src/httpserver.cpp | 1 +
75 + 1 file changed, 1 insertion(+)
76 +
77 +diff --git a/src/httpserver.cpp b/src/httpserver.cpp
78 +index 81137771871f..d9c711332358 100644
79 +--- a/src/httpserver.cpp
80 ++++ b/src/httpserver.cpp
81 +@@ -15,6 +15,7 @@
82 + #include <sync.h>
83 + #include <ui_interface.h>
84 +
85 ++#include <deque>
86 + #include <memory>
87 + #include <stdio.h>
88 + #include <stdlib.h>