package/protobuf: bump to version 3.9.1
PATCH 1/3 package/protobuf: bump to version 3.9.1
Remove patch (already in version)
--- ...ompilation-under-mips-big-endian-wit.patch | 38 ------------------- package/protobuf/protobuf.hash | 2 +- package/protobuf/protobuf.mk | 2 +- package/python-protobuf/python-protobuf.hash | 2 +- 4 files changed, 3 insertions(+), 41 deletions(-) delete mode 100644 package/protobuf/0001-Fix-to-allow-a-compilation-under-mips-big-endian-wit.patch
package/protobuf/0001-Fix-to-allow-a-compilation-under-mips-big-endian-wit.patch deleted +0 -38
@@ -1,38 +0,0 @@ -From d105213bccfa4392eda889a95f808dd9cdf84494 Mon Sep 17 00:00:00 2001 -From: Charles Hardin <[email protected]> -Date: Mon, 21 May 2018 09:19:30 -0700 -Subject: [PATCH] Fix to allow a compilation under mips big endian with gcc - -The __MIPSEL__ is mips little endian specific, but we needed to -compile for a big endian mips target that also happened to be a -mips64. This commit replaces the __MIPSEL__ test with a __mips__ test -which preserves the build on little endian and allows building for a -big endian setup. - - $ echo | mips64-linux-gcc -E -dM - - ... snip snip ... - #define __mips__ 1 - #define __MIPSEB__ 1 - -Signed-off-by: Charles Hardin <[email protected]> -Upstream-status: https://github.com/google/protobuf/pull/4657 ---- - src/google/protobuf/stubs/platform_macros.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/google/protobuf/stubs/platform_macros.h b/src/google/protobuf/stubs/platform_macros.h -index c3a64dd2..f9e2bff6 100644 ---- a/src/google/protobuf/stubs/platform_macros.h -+++ b/src/google/protobuf/stubs/platform_macros.h -@@ -56,7 +56,7 @@ - #elif defined(__aarch64__) - #define GOOGLE_PROTOBUF_ARCH_AARCH64 1 - #define GOOGLE_PROTOBUF_ARCH_64_BIT 1 --#elif defined(__MIPSEL__) -+#elif defined(__mips__) - #if defined(__LP64__) - #define GOOGLE_PROTOBUF_ARCH_MIPS64 1 - #define GOOGLE_PROTOBUF_ARCH_64_BIT 1 --- -2.15.1 (Apple Git-101) -
package/protobuf/protobuf.hash +1 -1
@@ -1,3 +1,3 @@ # Locally calculated -sha256 c3cab055964d554e4fd85067fe3e9eb45c9915cebcf537e97fafaa245376bce1 protobuf-cpp-3.6.0.tar.gz +sha256 29a1db3b9bebcf054c540f13400563120ff29fbdd849b2c7a097ffe9d3d508eb protobuf-cpp-3.9.1.tar.gz sha256 6e5e117324afd944dcf67f36cf329843bc1a92229a8cd9bb573d7a83130fea7d LICENSE
package/protobuf/protobuf.mk +1 -1
@@ -7,7 +7,7 @@ # When bumping this package, make sure to also verify if the # python-protobuf package still works, as they share the same # version/site variables. -PROTOBUF_VERSION = 3.6.0 +PROTOBUF_VERSION = 3.9.1 PROTOBUF_SOURCE = protobuf-cpp-$(PROTOBUF_VERSION).tar.gz PROTOBUF_SITE = https://github.com/google/protobuf/releases/download/v$(PROTOBUF_VERSION) PROTOBUF_LICENSE = BSD-3-Clause
package/python-protobuf/python-protobuf.hash +1 -1
@@ -1,3 +1,3 @@ # Locally calculated -sha256 6b399412cd68c7efe64d31824ad0db44f803aed91d0c6a9ea94272682c3da2df protobuf-python-3.6.0.tar.gz +sha256 d07934c7e78d424e5f0f2182c2f3bed47214481005b9614a7480d6aaac97e7ef protobuf-python-3.9.1.tar.gz sha256 6e5e117324afd944dcf67f36cf329843bc1a92229a8cd9bb573d7a83130fea7d LICENSE
Signature · 1 line
2.20.1
PATCH 2/3 package/grpc: bump to version 1.23.0
--- package/grpc/grpc.hash | 2 +- package/grpc/grpc.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
package/grpc/grpc.hash +1 -1
@@ -1,3 +1,3 @@ # Locally computed -sha256 069a52a166382dd7b99bf8e7e805f6af40d797cfcee5f80e530ca3fc75fd06e2 grpc-1.18.0.tar.gz +sha256 f56ced18740895b943418fa29575a65cc2396ccfa3159fa40d318ef5f59471f9 grpc-1.23.0.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE
package/grpc/grpc.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -GRPC_VERSION = 1.18.0 +GRPC_VERSION = 1.23.0 GRPC_SITE = $(call github,grpc,grpc,v$(GRPC_VERSION)) GRPC_LICENSE = Apache-2.0 GRPC_LICENSE_FILES = LICENSE
Signature · 1 line
2.20.1
Thomas Petazzoni
AppliedPATCH 2/3 package/grpc: bump to version 1.23.0
Quoted 5 lines · On Tue, 20 Aug 2019 20:48:03 +0200 Fabrice Fontaine…
Signed-off-by Fabrice Fontaine <[email protected]>--- package/grpc/grpc.hash | 2 +- package/grpc/grpc.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
Applied to master, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH 3/3 package/protobuf-c: bump to version 1.3.2
In reply to Fabrice Fontaine- Remove both patches (already in version)
- Add hash for license file
--- .../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.20.1
PATCH 3/3 package/protobuf-c: bump to version 1.3.2
Quoted 4 lines · On Tue, 20 Aug 2019 20:48:04 +0200 Fabrice Fontaine…
- Remove both patches (already in version)
- Add hash for license fileSigned-off-by Fabrice Fontaine <[email protected]>
Quoted 8 lines
--- .../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
Same here: another patch was sent later, and this later patch was applied instead of yours. Sorry about that :-/
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH 1/3 package/protobuf: bump to version 3.9.1
In reply to Fabrice FontaineQuoted 10 lines · On Tue, 20 Aug 2019 20:48:02 +0200 Fabrice Fontaine…
Remove patch (already in version)
Signed-off-by Fabrice Fontaine <[email protected]>--- ...ompilation-under-mips-big-endian-wit.patch | 38 ------------------- package/protobuf/protobuf.hash | 2 +- package/protobuf/protobuf.mk | 2 +- package/python-protobuf/python-protobuf.hash | 2 +- 4 files changed, 3 insertions(+), 41 deletions(-) delete mode 100644 package/protobuf/0001-Fix-to-allow-a-compilation-under-mips-big-endian-wit.patch
Matt Weber has sent the same version bump later on, and it was merged instead of your version. Sorry about that :-/ I marked your patch as Not Applicable in patchwork.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com