helium-3rd-party/meta-openembedded
1
0
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-05-22 02:59:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

protobuf: upgrade 3.8.0 -> 3.9.0

Browse Source 
-Upgrade from protobuf_3.8.0.bb to protobuf_3.9.0.bb.

-protobuf/0001-Added-stubs-map_util.h-to-list-of-installed-headers.patch
 Removed since this is included in 3.9.0.

Signed-off-by: Zang Ruochen <zangrc.fnst@cn.fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Zang Ruochen 2019-07-15 13:54:13 +08:00 committed by Khem Raj
parent c930c6fab4
commit a6784c888b
2 changed files with 2 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
meta-oe/recipes-devtools/protobuf/protobuf/0001-Added-stubs-map_util.h-to-list-of-installed-headers.patch
View File

@ -1,52 +0,0 @@
From ea6e776e50971c89ad2293046b6ae2a6a9753c56 Mon Sep 17 00:00:00 2001
From: Adam Cozzette <acozzette@google.com>
Date: Thu, 6 Jun 2019 10:29:58 -0700
Subject: [PATCH] Added stubs/map_util.h to list of installed headers
This should fix issue #6186. I also had to remove a couple unnecessary
const keywords in map_util.h because the no_warning_test was showing
errors about those.
Upstream-Status: Submitted [https://github.com/protocolbuffers/protobuf/pull/6223]
---
src/Makefile.am | 1 +
src/google/protobuf/stubs/map_util.h | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/Makefile.am b/src/Makefile.am
index be18ba76..1689e221 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -72,6 +72,7 @@ nobase_include_HEADERS = \
google/protobuf/stubs/hash.h \
google/protobuf/stubs/logging.h \
google/protobuf/stubs/macros.h \
+ google/protobuf/stubs/map_util.h \
google/protobuf/stubs/mutex.h \
google/protobuf/stubs/once.h \
google/protobuf/stubs/platform_macros.h \
diff --git a/src/google/protobuf/stubs/map_util.h b/src/google/protobuf/stubs/map_util.h
index 2313e1f5..b04d9d46 100644
--- a/src/google/protobuf/stubs/map_util.h
+++ b/src/google/protobuf/stubs/map_util.h
@@ -620,7 +620,7 @@ bool UpdateReturnCopy(Collection* const collection,
// twice. Unlike UpdateReturnCopy this also does not come with the issue of an
// undefined previous* in case new data was inserted.
template <class Collection>
-typename Collection::value_type::second_type* const
+typename Collection::value_type::second_type*
InsertOrReturnExisting(Collection* const collection,
const typename Collection::value_type& vt) {
std::pair<typename Collection::iterator, bool> ret = collection->insert(vt);
@@ -633,7 +633,7 @@ InsertOrReturnExisting(Collection* const collection,
// Same as above, except for explicit key and data.
template <class Collection>
-typename Collection::value_type::second_type* const
+typename Collection::value_type::second_type*
InsertOrReturnExisting(
Collection* const collection,
const typename Collection::value_type::first_type& key,
--
2.11.0

5
meta-oe/recipes-devtools/protobuf/protobuf_3.8.0.bb → meta-oe/recipes-devtools/protobuf/protobuf_3.9.0.bb
View File

@ -10,12 +10,11 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=37b5762e07f0af8c74ce80a8bda4266b"
DEPENDS = "zlib"
DEPENDS_append_class-target = " protobuf-native"
SRCREV = "09745575a923640154bcf307fba8aedff47f240a"
SRCREV = "6a59a2ad1f61d9696092f79b6d74368b4d7970a3"
SRC_URI = "git://github.com/google/protobuf.git;branch=3.8.x \
SRC_URI = "git://github.com/google/protobuf.git;branch=3.9.x \
file://run-ptest \
file://0001-protobuf-fix-configure-error.patch \
file://0001-Added-stubs-map_util.h-to-list-of-installed-headers.patch \
file://0001-Makefile.am-include-descriptor.cc-when-building-libp.patch \
file://0001-examples-Makefile-respect-CXX-LDFLAGS-variables-fix-.patch \
"