package/protobuf-c: bump 1.3.2
PATCH 1/1 package/protobuf-c: bump 1.3.2
Signed-off-by Matthew Weber <[email protected]>
--- .../0001-Add-std-to-some-types.patch | 110 ------------ .../0002-Fix-build-with-protobuf-3.6.x.patch | 160 ------------------ package/protobuf-c/protobuf-c.hash | 3 +- package/protobuf-c/protobuf-c.mk | 2 +- 4 files changed, 3 insertions(+), 272 deletions(-) delete mode 100644 package/protobuf-c/0001-Add-std-to-some-types.patch delete mode 100644 package/protobuf-c/0002-Fix-build-with-protobuf-3.6.x.patch
package/protobuf-c/0001-Add-std-to-some-types.patch deleted +0 -110
@@ -1,110 +0,0 @@ -From 034e603d2a5e629c1c3fbac405638f8afb3ead51 Mon Sep 17 00:00:00 2001 -From: Fredrik Gustafsson <[email protected]> -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 <[email protected]> -[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); - } -
package/protobuf-c/0002-Fix-build-with-protobuf-3.6.x.patch deleted +0 -160
160 lines not on this page · raw message
package/protobuf-c/protobuf-c.hash +2 -1
@@ -1,2 +1,3 @@ # Locally calculated -sha256 fd8f6f5d6927330cf2b8b4ec8332de8b1ee2b8f2480b52ee3f221aad6de2082c protobuf-c-1.3.0.tar.gz +sha256 5205312e561b75b9d2db671b22f28d67afb5c7d1fef94a6f2d29d775ca4e0519 protobuf-c-1.3.2.tar.gz +sha256 20e800cad4550f4b19bb37fc9577dac21de13333ae66497c4c45ae489c35c34a LICENSE
package/protobuf-c/protobuf-c.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -PROTOBUF_C_VERSION = 1.3.0 +PROTOBUF_C_VERSION = 1.3.2 PROTOBUF_C_SITE = $(call github,protobuf-c,protobuf-c,v$(PROTOBUF_C_VERSION)) PROTOBUF_C_DEPENDENCIES = host-protobuf-c HOST_PROTOBUF_C_DEPENDENCIES = host-protobuf host-pkgconf
Signature · 1 line
2.17.1
PATCH 1/1 package/protobuf-c: bump 1.3.2
Hello Matt,
Quoted 9 lines · On Mon, 9 Sep 2019 11:31:40 -0500 Matt Weber…
Signed-off-by Matthew Weber <[email protected]>--- .../0001-Add-std-to-some-types.patch | 110 ------------ .../0002-Fix-build-with-protobuf-3.6.x.patch | 160 ------------------ package/protobuf-c/protobuf-c.hash | 3 +- package/protobuf-c/protobuf-c.mk | 2 +- 4 files changed, 3 insertions(+), 272 deletions(-) delete mode 100644 package/protobuf-c/0001-Add-std-to-some-types.patch delete mode 100644 package/protobuf-c/0002-Fix-build-with-protobuf-3.6.x.patch
I've applied to master, but the commit log could be a bit more verbose:
why are the patches being removed, the license file hash being added. Also, the commit title is typically "bump to version XYZ", not just "bump XYZ".
Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com