From 8a9d2b17a136e7ae059619618cf4d8a12ea696e9 Mon Sep 17 00:00:00 2001 From: Alexis Ballier Date: Wed, 7 Sep 2022 18:08:45 +0200 Subject: net-libs/ignition-msgs: fix build with latest protobuf Signed-off-by: Alexis Ballier --- net-libs/ignition-msgs/files/std.patch | 29 +++++++++++++++++++++++ net-libs/ignition-msgs/ignition-msgs-5.9.0.ebuild | 1 + 2 files changed, 30 insertions(+) create mode 100644 net-libs/ignition-msgs/files/std.patch (limited to 'net-libs/ignition-msgs') diff --git a/net-libs/ignition-msgs/files/std.patch b/net-libs/ignition-msgs/files/std.patch new file mode 100644 index 000000000000..2f795b08833d --- /dev/null +++ b/net-libs/ignition-msgs/files/std.patch @@ -0,0 +1,29 @@ +Index: gz-msgs-ignition-msgs5_5.9.0/src/Generator.cc +=================================================================== +--- gz-msgs-ignition-msgs5_5.9.0.orig/src/Generator.cc ++++ gz-msgs-ignition-msgs5_5.9.0/src/Generator.cc +@@ -67,7 +67,7 @@ Generator::~Generator() + + ///////////////////////////////////////////////// + bool Generator::Generate(const FileDescriptor *_file, +- const string &/*_parameter*/, ++ const std::string &/*_parameter*/, + OutputDirectory *_generatorContext, + std::string * /*_error*/) const + { +Index: gz-msgs-ignition-msgs5_5.9.0/src/Generator.hh +=================================================================== +--- gz-msgs-ignition-msgs5_5.9.0.orig/src/Generator.hh ++++ gz-msgs-ignition-msgs5_5.9.0/src/Generator.hh +@@ -44,9 +44,9 @@ class Generator : public CodeGenerator + /// \param[in] _generatorContext Output directory. + /// \param[in] _error Unused string value + public: virtual bool Generate(const FileDescriptor *_file, +- const string &_parameter, ++ const std::string &_parameter, + OutputDirectory *_generatorContext, +- string *_error) const; ++ std::string *_error) const; + + // private: GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(Generator); + }; diff --git a/net-libs/ignition-msgs/ignition-msgs-5.9.0.ebuild b/net-libs/ignition-msgs/ignition-msgs-5.9.0.ebuild index 7172903d1f5b..326c0a377f89 100644 --- a/net-libs/ignition-msgs/ignition-msgs-5.9.0.ebuild +++ b/net-libs/ignition-msgs/ignition-msgs-5.9.0.ebuild @@ -23,3 +23,4 @@ DEPEND="${RDEPEND} BDEPEND="dev-util/ignition-cmake:2" CMAKE_BUILD_TYPE=RelWithDebInfo S="${WORKDIR}/gz-msgs-ignition-msgs5_${PV}" +PATCHES=( "${FILESDIR}/std.patch" ) -- cgit v1.2.3-65-gdbad