From a74f6105022b644eddc78dace6ec59c60c695caa Mon Sep 17 00:00:00 2001 From: Luka Paulic Date: Wed, 10 Apr 2019 14:02:38 +0200 Subject: [PATCH 1/2] protobuf-c: fix x86 build fail Signed-off-by: Luka Paulic --- ...nerated-code2-cxx-generate-packed-data-fix.patch | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 libs/protobuf-c/patches/001-t-generated-code2-cxx-generate-packed-data-fix.patch diff --git a/libs/protobuf-c/patches/001-t-generated-code2-cxx-generate-packed-data-fix.patch b/libs/protobuf-c/patches/001-t-generated-code2-cxx-generate-packed-data-fix.patch new file mode 100644 index 000000000..2d83cec59 --- /dev/null +++ b/libs/protobuf-c/patches/001-t-generated-code2-cxx-generate-packed-data-fix.patch @@ -0,0 +1,13 @@ +Index: protobuf-c-1.3.1/t/generated-code2/cxx-generate-packed-data.cc +=================================================================== +--- protobuf-c-1.3.1.orig/t/generated-code2/cxx-generate-packed-data.cc ++++ protobuf-c-1.3.1/t/generated-code2/cxx-generate-packed-data.cc +@@ -998,7 +998,7 @@ static void dump_test_packed_repeated_en + 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 From b40718dcbccb99cbbc0558e53ead47e15cca327b Mon Sep 17 00:00:00 2001 From: Luka Paulic Date: Wed, 10 Apr 2019 21:59:51 +0200 Subject: [PATCH 2/2] protobuf-c: bump PKG_RELEASE Signed-off-by: Luka Paulic --- libs/protobuf-c/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/protobuf-c/Makefile b/libs/protobuf-c/Makefile index 6199766c3..e04483318 100644 --- a/libs/protobuf-c/Makefile +++ b/libs/protobuf-c/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libprotobuf-c PKG_VERSION:=1.3.1 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=protobuf-c-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/protobuf-c/protobuf-c/releases/download/v$(PKG_VERSION)