Francois Marier
|
af9d19f286
|
Bug 1385461 - Upgrade to the latest version of the protobuf library. r=dimi,fitzgen,glandium,mattwoodrow,mossop
The tarball that was imported is the 3.4.1 release:
https://github.com/google/protobuf/releases/tag/v3.4.1
https://github.com/google/protobuf/releases/download/v3.4.1/protobuf-cpp-3.4.1.tar.gz
This drops all of the customizations that are no longer needed,
which includes a few issues that were fixed upstream:
- r512.patch from bug 892856:
https://searchfox.org/mozilla-central/rev/bab9dbe9c4ef71f71fb07e53b701fb2dfde277d9/toolkit/components/protobuf/r512.patch
b04e5cba35/src/google/protobuf/io/zero_copy_stream_impl.cc (L43)
- vs2013.patch, also from bug 892856:
https://searchfox.org/mozilla-central/rev/bab9dbe9c4ef71f71fb07e53b701fb2dfde277d9/toolkit/components/protobuf/vs2013.patch
b04e5cba35/src/google/protobuf/wire_format_lite_inl.h (L39)
- sparc64 fixes in m-c-changes.patch from bug 1275204:
https://hg.mozilla.org/integration/mozilla-inbound/rev/21d692e82582
b04e5cba35/src/google/protobuf/stubs/platform_macros.h (L68)
The LOGLEVEL_ERROR hack in m-c-changes.patch from bug 1024774 and
bug 1320179 was replaced by a NOGDI define in moz.build as suggested
by upstream:
https://github.com/google/protobuf/pull/3745/files#r144915445
The other customizations that were dropped came from bug 1024774.
The patch for OpenBSD/32-bit will likely be fixed upstream in a
future release:
https://github.com/google/protobuf/pull/3747#issuecomment-336581244
Upgrading the protobuf library also required re-generating all
of the existing .pb.h and pb.cc files (they are neither forward
nor backward-compatible) and making adjustments to the build
config to make it compile (and silence warnings).
text_format.cc can now be compiled as part of UNIFIED_SOURCES.
MozReview-Commit-ID: 7F2IqFmwQnN
|
2017-10-18 15:02:05 -07:00 |
|
