commit: 46a06dba99f561c4413c4dca9bfad0ff53b26467 Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org> AuthorDate: Sun May 5 01:54:51 2019 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Sun May 5 19:04:00 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46a06dba
dev-libs/protobuf-c: Fix building with >=dev-libs/protobuf-3.7. Fixes: https://bugs.gentoo.org/684028 Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache.Org> Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> .../protobuf-c/files/protobuf-c-1.3.1-protobuf-3.7.patch | 13 +++++++++++++ dev-libs/protobuf-c/protobuf-c-1.3.1.ebuild | 4 ++++ 2 files changed, 17 insertions(+) diff --git a/dev-libs/protobuf-c/files/protobuf-c-1.3.1-protobuf-3.7.patch b/dev-libs/protobuf-c/files/protobuf-c-1.3.1-protobuf-3.7.patch new file mode 100644 index 00000000000..218dec00f87 --- /dev/null +++ b/dev-libs/protobuf-c/files/protobuf-c-1.3.1-protobuf-3.7.patch @@ -0,0 +1,13 @@ +https://github.com/protobuf-c/protobuf-c/commit/7456d1621223d425b8a3fd74e435a79c046169fb + +--- /t/generated-code2/cxx-generate-packed-data.cc ++++ /t/generated-code2/cxx-generate-packed-data.cc +@@ -998,7 +998,7 @@ + static void dump_test_unknown_fields (void) + { + EmptyMess mess; +- const google::protobuf::Message::Reflection *reflection = mess.GetReflection(); ++ const google::protobuf::Reflection *reflection = mess.GetReflection(); + google::protobuf::UnknownFieldSet *fs = reflection->MutableUnknownFields(&mess); + + #if GOOGLE_PROTOBUF_VERSION >= 2001000 diff --git a/dev-libs/protobuf-c/protobuf-c-1.3.1.ebuild b/dev-libs/protobuf-c/protobuf-c-1.3.1.ebuild index b5226f54628..8bc5d70da05 100644 --- a/dev-libs/protobuf-c/protobuf-c-1.3.1.ebuild +++ b/dev-libs/protobuf-c/protobuf-c-1.3.1.ebuild @@ -24,6 +24,10 @@ DEPEND="${RDEPEND} S="${WORKDIR}/${MY_P}" +PATCHES=( + "${FILESDIR}/${PN}-1.3.1-protobuf-3.7.patch" +) + src_prepare() { default if ! use test; then
