mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Bug 892856 - Protobuf fails to build in VS 2013. r=mmc
This commit is contained in:
parent
611eff9757
commit
2669485799
@ -9,3 +9,8 @@ available at http://code.google.com/p/protobuf.
|
|||||||
This import includes only files in protobuf-lite, a lighter-weight library that
|
This import includes only files in protobuf-lite, a lighter-weight library that
|
||||||
does not support reflection or descriptors. Manual changes include removing all
|
does not support reflection or descriptors. Manual changes include removing all
|
||||||
tests, testdata, config.h, and all files not used in protobuf-lite.
|
tests, testdata, config.h, and all files not used in protobuf-lite.
|
||||||
|
|
||||||
|
Applied Patches
|
||||||
|
===============
|
||||||
|
r512.patch:
|
||||||
|
Support VS2013 (from revision r512)
|
||||||
|
@ -36,6 +36,8 @@
|
|||||||
#include <google/protobuf/stubs/common.h>
|
#include <google/protobuf/stubs/common.h>
|
||||||
#include <google/protobuf/stubs/stl_util-inl.h>
|
#include <google/protobuf/stubs/stl_util-inl.h>
|
||||||
|
|
||||||
|
#include <algorithm>
|
||||||
|
|
||||||
namespace google {
|
namespace google {
|
||||||
namespace protobuf {
|
namespace protobuf {
|
||||||
namespace io {
|
namespace io {
|
||||||
|
13
toolkit/components/protobuf/r512.patch
Normal file
13
toolkit/components/protobuf/r512.patch
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
Index: src/google/protobuf/io/zero_copy_stream_impl_lite.cc
|
||||||
|
===================================================================
|
||||||
|
--- src/google/protobuf/io/zero_copy_stream_impl_lite.cc (revision 511)
|
||||||
|
+++ src/google/protobuf/io/zero_copy_stream_impl_lite.cc (revision 512)
|
||||||
|
@@ -36,6 +36,8 @@
|
||||||
|
#include <google/protobuf/stubs/common.h>
|
||||||
|
#include <google/protobuf/stubs/stl_util.h>
|
||||||
|
|
||||||
|
+#include <algorithm>
|
||||||
|
+
|
||||||
|
namespace google {
|
||||||
|
namespace protobuf {
|
||||||
|
namespace io {
|
2
toolkit/components/protobuf/update.sh
Normal file
2
toolkit/components/protobuf/update.sh
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
patch -p1 < r512.patch
|
Loading…
Reference in New Issue
Block a user