Index: third_party/protobuf/README.chromium |
diff --git a/third_party/protobuf/README.chromium b/third_party/protobuf/README.chromium |
index 0af6f79293d752e9d1bba1ce4224e80313803892..53aac51ecc74625724ff70a00fe8a7a31d6110a2 100644 |
--- a/third_party/protobuf/README.chromium |
+++ b/third_party/protobuf/README.chromium |
@@ -3,14 +3,13 @@ Short Name: protobuf |
URL: https://github.com/google/protobuf |
License: BSD |
License File: LICENSE |
-Version: 3.0.0-beta-2 |
-Revision: d5fb408ddc281ffcadeb08699e65bb694656d0bd |
+Version: 3.0.0-beta-3 |
+Revision: 3470b6895aa659b7559ed678e029a5338e535f14 |
Security Critical: yes |
Steps used to create the current version: |
1. Pull the release from https://github.com/google/protobuf/releases |
-2. Use the cleanup_release.sh script to remove unnecessary files. |
-3. Add build files (BUILD.gn, proto_library.gni, protobuf.gyp, |
+2. Add build files (BUILD.gn, proto_library.gni, protobuf.gyp, |
protobuf_lite.gypi, protobuf_nacl.gyp). |
Be sure to update the list of source files, as additional .cc files and |
@@ -19,9 +18,9 @@ Steps used to create the current version: |
Other things to care about are defines required by protobuf on various |
platforms, warnings generated by compilers, and new dependencies introduced. |
-4. Get open-source library six.py from https://pypi.python.org/pypi/six/ and add |
+3. Get open-source library six.py from https://pypi.python.org/pypi/six/ and add |
it to protobuf/third_party/six/six.py. |
-5. Apply patches in patches/ (see the description below): |
+4. Apply patches in patches/ (see the description below): |
$ for patch in patches/*; do patch -s -p1 < $patch; done |
@@ -68,17 +67,12 @@ Description of the patches: |
protobuf symbols in Linux .so libraries, so that protobuf can be built as a |
component (see http://crrev.com/179806). |
-- 0005-fix-no-threadlocal-on-mac.patch |
+- 0005-fix-include-js-generator.protobuf |
- Apple's Clang doesn't support thread-local variables on Mac. |
+ During merge with internal branch, the <> in one of the #includes were |
+ accidentally replaced with "", which results in a failure in checkdeps. |
-- 0006-fix-clang-type-errors.patch |
- |
- New versions of Clang have type checking semantics that check the conformance |
- with the C++ standard more thorougly, which makes them a bit more |
- restrictive. This cherry-picks upstream commits |
- 3cc35adb6dca9057a790d253b9f5e2b9b000a106 and |
- 58f07644eab25f68973ecab4bdc43fc318c26131. |
+ Fixed in https://github.com/google/protobuf/pull/1547. |
- 0007-uninline_googleonce.patch |
- 0008-uninline_get_empty_string.patch |
@@ -87,12 +81,10 @@ Description of the patches: |
These patches uninline some functions, resulting in a significant reduction |
(somewhere between 500 KB and 1 MB) of binary size. |
-- 0011-use-offsetof-for-clang.patch |
- This patch replaces a few invalid reinterpret_casts with __builtin_offsetof, |
- if compiled with Clang. This is a temporary patch, it should be deletd, when |
- the official github repo is updates with this changes already submitted to |
- the internal Google repo. |
+- 0011-libprotobuf_export.patch |
+ |
+ During merge with internal branch, the dll export attribute was accidentally |
+ removed in C++11 mode. |
- See also: https://crbug.com/607751 and |
- https://github.com/google/protobuf/issues/1450 |
+ Fixed in https://github.com/google/protobuf/pull/1549 |