Gentoo Archives: gentoo-commits

From: Alexis Ballier <aballier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/ignition-msgs/files/, net-libs/ignition-msgs/
Date: Tue, 27 Sep 2022 15:33:17
Message-Id: 1664292780.8a9d2b17a136e7ae059619618cf4d8a12ea696e9.aballier@gentoo
1 commit: 8a9d2b17a136e7ae059619618cf4d8a12ea696e9
2 Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
3 AuthorDate: Wed Sep 7 16:08:45 2022 +0000
4 Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
5 CommitDate: Tue Sep 27 15:33:00 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a9d2b17
7
8 net-libs/ignition-msgs: fix build with latest protobuf
9
10 Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>
11
12 net-libs/ignition-msgs/files/std.patch | 29 +++++++++++++++++++++++
13 net-libs/ignition-msgs/ignition-msgs-5.9.0.ebuild | 1 +
14 2 files changed, 30 insertions(+)
15
16 diff --git a/net-libs/ignition-msgs/files/std.patch b/net-libs/ignition-msgs/files/std.patch
17 new file mode 100644
18 index 000000000000..2f795b08833d
19 --- /dev/null
20 +++ b/net-libs/ignition-msgs/files/std.patch
21 @@ -0,0 +1,29 @@
22 +Index: gz-msgs-ignition-msgs5_5.9.0/src/Generator.cc
23 +===================================================================
24 +--- gz-msgs-ignition-msgs5_5.9.0.orig/src/Generator.cc
25 ++++ gz-msgs-ignition-msgs5_5.9.0/src/Generator.cc
26 +@@ -67,7 +67,7 @@ Generator::~Generator()
27 +
28 + /////////////////////////////////////////////////
29 + bool Generator::Generate(const FileDescriptor *_file,
30 +- const string &/*_parameter*/,
31 ++ const std::string &/*_parameter*/,
32 + OutputDirectory *_generatorContext,
33 + std::string * /*_error*/) const
34 + {
35 +Index: gz-msgs-ignition-msgs5_5.9.0/src/Generator.hh
36 +===================================================================
37 +--- gz-msgs-ignition-msgs5_5.9.0.orig/src/Generator.hh
38 ++++ gz-msgs-ignition-msgs5_5.9.0/src/Generator.hh
39 +@@ -44,9 +44,9 @@ class Generator : public CodeGenerator
40 + /// \param[in] _generatorContext Output directory.
41 + /// \param[in] _error Unused string value
42 + public: virtual bool Generate(const FileDescriptor *_file,
43 +- const string &_parameter,
44 ++ const std::string &_parameter,
45 + OutputDirectory *_generatorContext,
46 +- string *_error) const;
47 ++ std::string *_error) const;
48 +
49 + // private: GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(Generator);
50 + };
51
52 diff --git a/net-libs/ignition-msgs/ignition-msgs-5.9.0.ebuild b/net-libs/ignition-msgs/ignition-msgs-5.9.0.ebuild
53 index 7172903d1f5b..326c0a377f89 100644
54 --- a/net-libs/ignition-msgs/ignition-msgs-5.9.0.ebuild
55 +++ b/net-libs/ignition-msgs/ignition-msgs-5.9.0.ebuild
56 @@ -23,3 +23,4 @@ DEPEND="${RDEPEND}
57 BDEPEND="dev-util/ignition-cmake:2"
58 CMAKE_BUILD_TYPE=RelWithDebInfo
59 S="${WORKDIR}/gz-msgs-ignition-msgs5_${PV}"
60 +PATCHES=( "${FILESDIR}/std.patch" )