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-analyzer/sinfo/files/, net-analyzer/sinfo/
Date: Sun, 30 Jul 2017 09:10:13
Message-Id: 1501405717.07d085fc169d0f605e7f16ebbe9c4f3521ac2691.soap@gentoo
1 commit: 07d085fc169d0f605e7f16ebbe9c4f3521ac2691
2 Author: Peter Levine <plevine457 <AT> gmail <DOT> com>
3 AuthorDate: Wed Jun 28 06:34:24 2017 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Sun Jul 30 09:08:37 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07d085fc
7
8 net-analyzer/sinfo: Fix building with GCC-6
9
10 Bug: https://bugs.gentoo.org/show_bug.cgi?id=594990
11 Package-Manager: Portage-2.3.6, Repoman-2.3.2
12 Closes: https://github.com/gentoo/gentoo/pull/5001
13
14 net-analyzer/sinfo/files/sinfo-0.0.48-gcc6.patch | 24 ++++++++++++++++++++++++
15 net-analyzer/sinfo/sinfo-0.0.48.ebuild | 3 ++-
16 2 files changed, 26 insertions(+), 1 deletion(-)
17
18 diff --git a/net-analyzer/sinfo/files/sinfo-0.0.48-gcc6.patch b/net-analyzer/sinfo/files/sinfo-0.0.48-gcc6.patch
19 new file mode 100644
20 index 00000000000..0b8f4a347fe
21 --- /dev/null
22 +++ b/net-analyzer/sinfo/files/sinfo-0.0.48-gcc6.patch
23 @@ -0,0 +1,24 @@
24 +Bug: https://bugs.gentoo.org/594990
25 +
26 +--- a/libmessageio/tcpmessageserverconnection.cc
27 ++++ b/libmessageio/tcpmessageserverconnection.cc
28 +@@ -91,7 +91,7 @@
29 + }
30 +
31 +
32 +-void TCPMessageServerConnection::queueAndSendMessageSlot(Message & message)
33 ++void TCPMessageServerConnection::queueAndSendMessageSlot(const Message & message)
34 + {
35 +
36 + if (sendQueue.size()<maxSendQueueSize)
37 +--- a/libmessageio/tcpmessageserverconnection.h
38 ++++ b/libmessageio/tcpmessageserverconnection.h
39 +@@ -32,7 +32,7 @@
40 + void handleReadMessageSize(const boost::system::error_code& err, size_t length);
41 + void handleReadMessage(const boost::system::error_code& err, size_t length);
42 +
43 +- void queueAndSendMessageSlot(Message & message);
44 ++ void queueAndSendMessageSlot(const Message & message);
45 + std::list<Message> sendQueue;
46 + bool sendQueueCurrentlySending;
47 + void startNewTransmission();
48
49 diff --git a/net-analyzer/sinfo/sinfo-0.0.48.ebuild b/net-analyzer/sinfo/sinfo-0.0.48.ebuild
50 index bbee5392b74..ef6d765d62a 100644
51 --- a/net-analyzer/sinfo/sinfo-0.0.48.ebuild
52 +++ b/net-analyzer/sinfo/sinfo-0.0.48.ebuild
53 @@ -1,4 +1,4 @@
54 -# Copyright 1999-2014 Gentoo Foundation
55 +# Copyright 1999-2017 Gentoo Foundation
56 # Distributed under the terms of the GNU General Public License v2
57
58 EAPI=5
59 @@ -26,6 +26,7 @@ DEPEND="
60 src_prepare() {
61 cp "${FILESDIR}"/${P}-acinclude.m4 acinclude.m4 || die
62 epatch "${FILESDIR}"/${PN}-0.0.47-tinfo.patch
63 + epatch "${FILESDIR}"/${P}-gcc6.patch
64 eautoreconf
65 }