diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2019-08-24 13:43:57 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-24 13:43:57 -0700 |
| commit | 1550b9e71b6ef8530b39db281903edcab73c2e14 (patch) | |
| tree | 91ee3999b75a66f109b72e5da9a647041b9f7f3d /ports/grpc | |
| parent | 18a07faca5c8440fb77eb9ec1d76f14841686011 (diff) | |
| download | vcpkg-1550b9e71b6ef8530b39db281903edcab73c2e14.tar.gz vcpkg-1550b9e71b6ef8530b39db281903edcab73c2e14.zip | |
[many ports] Updates 2019.07.09 (#7217)
* [many ports] Upgrades 2019.07.11
* Re-generate patches and fix build errors.
* [manyport]Fix build errors.
* Fix avro-c and console-bridge failures, revert curl and tesseract
* fix botan failure
* Fix build errors and undo some ports upgrades.
* [aws-c-common,chipmunk,cxxopts,grpc]Fix build errors
* Fix build errors.
* [angle]Undo upgrade changes.
* [directxtk]Fix UWP build error (#7233)
* Revert leptonica since it cause tesseract failed
* Revert jsonnet
* [google-cloud-cpp] Disable parallel configure due to source directory writes
* [many ports] Undo undesired changes
* [bitsery] Fix indentation
* [avro-c][aws-c-common][graphite2] Convert line endings to minimize PR diff
* fix console-bridge and remove usockets unused patch
* update ogre patch
* [many ports] Revert unneeded changes w.r.t. master. Add missing write to console-bridge.
* [console-bridge] Fix export macro
* [avro-c] Revert upgrade; split to #7875
* [avro-c] Complete previous revert
Diffstat (limited to 'ports/grpc')
| -rw-r--r-- | ports/grpc/00005-fix-uwp-error.patch | 12 | ||||
| -rw-r--r-- | ports/grpc/CONTROL | 2 | ||||
| -rw-r--r-- | ports/grpc/portfile.cmake | 5 |
3 files changed, 16 insertions, 3 deletions
diff --git a/ports/grpc/00005-fix-uwp-error.patch b/ports/grpc/00005-fix-uwp-error.patch new file mode 100644 index 000000000..d23036367 --- /dev/null +++ b/ports/grpc/00005-fix-uwp-error.patch @@ -0,0 +1,12 @@ +diff --git a/src/core/lib/slice/slice.cc b/src/core/lib/slice/slice.cc
+index eebf66b..6c6ee50 100644
+--- a/src/core/lib/slice/slice.cc
++++ b/src/core/lib/slice/slice.cc
+@@ -220,6 +220,7 @@ grpc_slice grpc_slice_from_moved_buffer(grpc_core::UniquePtr<char> p,
+ size_t len) {
+ uint8_t* ptr = reinterpret_cast<uint8_t*>(p.get());
+ grpc_slice slice;
++ memset(&slice, 0, sizeof(grpc_slice));
+ if (len <= sizeof(slice.data.inlined.bytes)) {
+ slice.refcount = nullptr;
+ slice.data.inlined.length = len;
diff --git a/ports/grpc/CONTROL b/ports/grpc/CONTROL index 079fd91f6..549138deb 100644 --- a/ports/grpc/CONTROL +++ b/ports/grpc/CONTROL @@ -1,5 +1,5 @@ Source: grpc -Version: 1.21.1-1 +Version: 1.22.0 Build-Depends: zlib, openssl, protobuf, c-ares (!uwp) Homepage: https://github.com/grpc/grpc Description: An RPC library and framework diff --git a/ports/grpc/portfile.cmake b/ports/grpc/portfile.cmake index 2dca1c34c..c23da09fd 100644 --- a/ports/grpc/portfile.cmake +++ b/ports/grpc/portfile.cmake @@ -13,14 +13,15 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO grpc/grpc - REF 75475f090875e737ad6909a6057c59577f0c79b1 - SHA512 db9ff82dee38cb0f4ba10874d10bf6cb20c8a4d49e7dd24bcd9f71388c54c782ee12fda6f1bfedd79ad988b0275d3f96df4686217465acfafcfb5e4c30093a5b + REF 08fd59f039c7cf62614ab7741b3f34527af103c7 + SHA512 a1200e0df981f69f9831425a5187dcc843d9eadee1663150cd3aa10d388ae0693ac6aa57760d7047ce1e6c55a15339d1db2f1b6e25f84c76ad97e0b48706e2c4 HEAD_REF master PATCHES 00001-fix-uwp.patch 00002-static-linking-in-linux.patch 00003-undef-base64-macro.patch 00004-link-gdi32-on-windows.patch + 00005-fix-uwp-error.patch ) if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") |