[gentoo-commits] repo/gentoo:master commit in: net-libs/ignition-msgs/files/, net-libs/ignition-msgs/

[gentoo-commits] repo/gentoo:master commit in: net-libs/ignition-msgs/files/, net-libs/ignition-msgs/

[Alexis Ballier]

commit:     8a9d2b17a136e7ae059619618cf4d8a12ea696e9
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Wed Sep  7 16:08:45 2022 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Tue Sep 27 15:33:00 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a9d2b17

net-libs/ignition-msgs: fix build with latest protobuf

Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>

 net-libs/ignition-msgs/files/std.patch            | 29 +++++++++++++++++++++++
 net-libs/ignition-msgs/ignition-msgs-5.9.0.ebuild |  1 +
 2 files changed, 30 insertions(+)

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" )

[gentoo-commits] repo/gentoo:master commit in: net-libs/ignition-msgs/files/, net-libs/ignition-msgs/

[Alexis Ballier]

commit:     07210e5dd340344e240296b6a86cd7724b498466
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 25 11:52:29 2023 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Fri Aug 25 12:54:03 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07210e5d

net-libs/ignition-msgs: fix build with latest protobuf

Closes: https://bugs.gentoo.org/912890
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>

 net-libs/ignition-msgs/files/protobuf.patch        | 13 +++++++++++++
 net-libs/ignition-msgs/ignition-msgs-5.11.0.ebuild |  1 +
 2 files changed, 14 insertions(+)

diff --git a/net-libs/ignition-msgs/files/protobuf.patch b/net-libs/ignition-msgs/files/protobuf.patch
new file mode 100644
index 000000000000..5a441ae4d2a9
--- /dev/null
+++ b/net-libs/ignition-msgs/files/protobuf.patch
@@ -0,0 +1,13 @@
+Index: gz-msgs-ignition-msgs5_5.11.0/CMakeLists.txt
+===================================================================
+--- gz-msgs-ignition-msgs5_5.11.0.orig/CMakeLists.txt
++++ gz-msgs-ignition-msgs5_5.11.0/CMakeLists.txt
+@@ -62,7 +62,7 @@ message(STATUS "\n\n-- ====== Finding De
+ 
+ #--------------------------------------
+ # Find Protobuf
+-set(REQ_PROTOBUF_VER 3)
++set(REQ_PROTOBUF_VER 4)
+ ign_find_package(IgnProtobuf
+                  VERSION ${REQ_PROTOBUF_VER}
+                  REQUIRED

diff --git a/net-libs/ignition-msgs/ignition-msgs-5.11.0.ebuild b/net-libs/ignition-msgs/ignition-msgs-5.11.0.ebuild
index 552d7c3fb165..647b49fb7925 100644
--- a/net-libs/ignition-msgs/ignition-msgs-5.11.0.ebuild
+++ b/net-libs/ignition-msgs/ignition-msgs-5.11.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}/protobuf.patch" )