protobuf-c: fix build with protobuf 3.6

Add two patches retrieved from upstream

Fixes:
 - http://autobuild.buildroot.net/results/26b84f2614f75ac101078a59afeb63bc4c0d28b7

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>

1 files changed, 110 insertions, 0 deletions

diff --git a/package/protobuf-c/0001-Add-std-to-some-types.patch b/package/protobuf-c/0001-Add-std-to-some-types.patch
new file mode 100644
index 0000000000..8f1a5d0be0
--- /dev/null
+++ b/package/protobuf-c/0001-Add-std-to-some-types.patch
@@ -0,0 +1,110 @@
+From 034e603d2a5e629c1c3fbac405638f8afb3ead51 Mon Sep 17 00:00:00 2001
+From: Fredrik Gustafsson <iveqy@iveqy.com>
+Date: Sun, 11 Mar 2018 08:57:46 +0100
+Subject: [PATCH] Add std:: to some types
+
+This is required for compilation to succeed on debian jessie with g++
+6.3.0.
+
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+[Retrieved from: https://github.com/protobuf-c/protobuf-c/pull/309]
+---
+ protoc-c/c_file.h       |  2 +-
+ protoc-c/c_generator.cc |  8 ++++----
+ protoc-c/c_helpers.cc   | 12 ++++++------
+ 3 files changed, 11 insertions(+), 11 deletions(-)
+
+diff --git a/protoc-c/c_file.h b/protoc-c/c_file.h
+index ed38ce4..84df522 100644
+--- a/protoc-c/c_file.h
++++ b/protoc-c/c_file.h
+@@ -104,7 +104,7 @@ class FileGenerator {
+   scoped_array<scoped_ptr<ExtensionGenerator> > extension_generators_;
+ 
+   // E.g. if the package is foo.bar, package_parts_ is {"foo", "bar"}.
+-  vector<string> package_parts_;
++  std::vector<string> package_parts_;
+ 
+   GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(FileGenerator);
+ };
+diff --git a/protoc-c/c_generator.cc b/protoc-c/c_generator.cc
+index a0d0cb6..79a272f 100644
+--- a/protoc-c/c_generator.cc
++++ b/protoc-c/c_generator.cc
+@@ -80,13 +80,13 @@ namespace c {
+ //   "foo=bar,baz,qux=corge"
+ // parses to the pairs:
+ //   ("foo", "bar"), ("baz", ""), ("qux", "corge")
+-void ParseOptions(const string& text, vector<pair<string, string> >* output) {
+-  vector<string> parts;
++void ParseOptions(const string& text, std::vector<std::pair<string, string> >* output) {
++  std::vector<string> parts;
+   SplitStringUsing(text, ",", &parts);
+ 
+   for (unsigned i = 0; i < parts.size(); i++) {
+     string::size_type equals_pos = parts[i].find_first_of('=');
+-    pair<string, string> value;
++    std::pair<string, string> value;
+     if (equals_pos == string::npos) {
+       value.first = parts[i];
+       value.second = "";
+@@ -105,7 +105,7 @@ bool CGenerator::Generate(const FileDescriptor* file,
+                             const string& parameter,
+                             OutputDirectory* output_directory,
+                             string* error) const {
+-  vector<pair<string, string> > options;
++  std::vector<std::pair<string, string> > options;
+   ParseOptions(parameter, &options);
+ 
+   // -----------------------------------------------------------------
+diff --git a/protoc-c/c_helpers.cc b/protoc-c/c_helpers.cc
+index b79b5b0..71b8682 100644
+--- a/protoc-c/c_helpers.cc
++++ b/protoc-c/c_helpers.cc
+@@ -177,7 +177,7 @@ string ToCamel(const string &name) {
+ }
+ 
+ string FullNameToLower(const string &full_name) {
+-  vector<string> pieces;
++  std::vector<string> pieces;
+   SplitStringUsing(full_name, ".", &pieces);
+   string rv = "";
+   for (unsigned i = 0; i < pieces.size(); i++) {
+@@ -188,7 +188,7 @@ string FullNameToLower(const string &full_name) {
+   return rv;
+ }
+ string FullNameToUpper(const string &full_name) {
+-  vector<string> pieces;
++  std::vector<string> pieces;
+   SplitStringUsing(full_name, ".", &pieces);
+   string rv = "";
+   for (unsigned i = 0; i < pieces.size(); i++) {
+@@ -199,7 +199,7 @@ string FullNameToUpper(const string &full_name) {
+   return rv;
+ }
+ string FullNameToC(const string &full_name) {
+-  vector<string> pieces;
++  std::vector<string> pieces;
+   SplitStringUsing(full_name, ".", &pieces);
+   string rv = "";
+   for (unsigned i = 0; i < pieces.size(); i++) {
+@@ -214,7 +214,7 @@ void PrintComment (io::Printer* printer, string comment)
+ {
+    if (!comment.empty())
+    {
+-      vector<string> comment_lines;
++      std::vector<string> comment_lines;
+       SplitStringUsing (comment, "\r\n", &comment_lines);
+       printer->Print ("/*\n");
+       for (int i = 0; i < comment_lines.size(); i++)
+@@ -503,8 +503,8 @@ void SplitStringToIteratorUsing(const string& full,
+ 
+ void SplitStringUsing(const string& full,
+                       const char* delim,
+-                      vector<string>* result) {
+-  std::back_insert_iterator< vector<string> > it(*result);
++                      std::vector<string>* result) {
++  std::back_insert_iterator< std::vector<string> > it(*result);
+   SplitStringToIteratorUsing(full, delim, it);
+ }
+