From c760bdbe99bc0789afffd159f3ef69f2fc136cb5 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Fri, 1 Mar 2019 12:03:31 -0300 Subject: [PATCH] protobuf-c: rebuild against protobuf-3.7.0 [ci skip] --- ...ix-Reflection-not-exist-in-namespace.patch | 24 +++++++++++++++++++ srcpkgs/protobuf-c/template | 7 +++--- 2 files changed, 28 insertions(+), 3 deletions(-) create mode 100644 srcpkgs/protobuf-c/patches/fix-Reflection-not-exist-in-namespace.patch diff --git a/srcpkgs/protobuf-c/patches/fix-Reflection-not-exist-in-namespace.patch b/srcpkgs/protobuf-c/patches/fix-Reflection-not-exist-in-namespace.patch new file mode 100644 index 00000000000..f283874680c --- /dev/null +++ b/srcpkgs/protobuf-c/patches/fix-Reflection-not-exist-in-namespace.patch @@ -0,0 +1,24 @@ +From 080724364a5aad61728f8eba57677467bf329088 Mon Sep 17 00:00:00 2001 +From: storyun +Date: Wed, 19 Sep 2018 11:34:48 +0900 +Subject: [PATCH] Invalid namespace + +google::protobuf::message::Reflaction is not exist namespace. +--- + t/generated-code2/cxx-generate-packed-data.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/t/generated-code2/cxx-generate-packed-data.cc b/t/generated-code2/cxx-generate-packed-data.cc +index 4fd3e25..0865d2e 100644 +--- t/generated-code2/cxx-generate-packed-data.cc ++++ t/generated-code2/cxx-generate-packed-data.cc +@@ -998,7 +998,7 @@ static void dump_test_packed_repeated_enum (void) + 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/srcpkgs/protobuf-c/template b/srcpkgs/protobuf-c/template index 36bbd03687a..fbba1cbebc0 100644 --- a/srcpkgs/protobuf-c/template +++ b/srcpkgs/protobuf-c/template @@ -1,10 +1,11 @@ # Template file for 'protobuf-c' pkgname=protobuf-c version=1.3.1 -revision=1 +revision=2 build_style=gnu-configure +configure_args="$(vopt_enable protoc)" hostmakedepends="pkg-config protobuf" -makedepends="protobuf-devel boost-devel" +makedepends="protobuf-devel boost-devel $(vopt_if protoc libprotoc-devel)" short_desc="C implementation of the Google Protocol Buffers" maintainer="Enno Boland " license="BSD-2-Clause" @@ -14,10 +15,10 @@ checksum=51472d3a191d6d7b425e32b612e477c06f73fe23e07f6a6a839b11808e9d2267 # buildprocess calls compiler while building, disable it on cross build build_options="protoc" +desc_option_protoc="Build protoc-c compiler" if [ -z "$CROSS_BUILD" ]; then build_options_default="protoc" fi -configure_args="$(vopt_enable protoc)" post_install() { vlicense LICENSE