[grpc][openssl][upb] Fix install on uwp

6 files changed, 34 insertions, 4 deletions

diff --git a/ports/grpc/portfile.cmake b/ports/grpc/portfile.cmake
index efebdb0fa..96d56097a 100644
--- a/ports/grpc/portfile.cmake
+++ b/ports/grpc/portfile.cmake
@@ -15,6 +15,7 @@ vcpkg_from_github(
         00004-link-gdi32-on-windows.patch
         00005-fix-uwp-error.patch
         00009-use-system-upb.patch
+        snprintf.patch
 )
 
 if(VCPKG_TARGET_IS_UWP OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")
diff --git a/ports/grpc/snprintf.patch b/ports/grpc/snprintf.patch
new file mode 100644
index 000000000..f658f9c4f
--- /dev/null
+++ b/ports/grpc/snprintf.patch
@@ -0,0 +1,12 @@
+diff --git a/src/core/tsi/alts/crypt/aes_gcm.cc b/src/core/tsi/alts/crypt/aes_gcm.cc

+index c638ce7..3dc3b2e 100644

+--- a/src/core/tsi/alts/crypt/aes_gcm.cc

++++ b/src/core/tsi/alts/crypt/aes_gcm.cc

+@@ -28,6 +28,7 @@

+ #include <openssl/evp.h>

+ #include <openssl/hmac.h>

+ #include <string.h>

++#include <cstdio>

+ 

+ #include <grpc/support/alloc.h>

+ 

diff --git a/ports/openssl/CONTROL b/ports/openssl/CONTROL
index ec827f4da..7c62094b6 100644
--- a/ports/openssl/CONTROL
+++ b/ports/openssl/CONTROL
@@ -2,4 +2,4 @@ Source: openssl
 Version: 1.1.1d
 Homepage: https://www.openssl.org
 Description: OpenSSL is an open source project that provides a robust, commercial-grade, and full-featured toolkit for the Transport Layer Security (TLS) and Secure Sockets Layer (SSL) protocols. It is also a general-purpose cryptography library.
-Build-Depends: openssl-windows (windows), openssl-uwp (uwp), openssl-unix (!uwp&!windows)
\ No newline at end of file
+Build-Depends: openssl-windows (!uwp&windows), openssl-uwp (uwp), openssl-unix (!uwp&!windows)
\ No newline at end of file
diff --git a/ports/upb/CONTROL b/ports/upb/CONTROL
index cb9b6041d..4ca52fa03 100644
--- a/ports/upb/CONTROL
+++ b/ports/upb/CONTROL
@@ -1,4 +1,4 @@
 Source: upb
-Version: 2019-10-21-1
+Version: 2019-10-21-2
 Homepage: https://github.com/protocolbuffers/upb/
 Description: μpb (often written 'upb') is a small protobuf implementation written in C.
diff --git a/ports/upb/fix-uwp.patch b/ports/upb/fix-uwp.patch
new file mode 100644
index 000000000..b9fc02db7
--- /dev/null
+++ b/ports/upb/fix-uwp.patch
@@ -0,0 +1,15 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt

+index 6eb8bb5..1506a64 100644

+--- a/CMakeLists.txt

++++ b/CMakeLists.txt

+@@ -13,6 +13,10 @@ cmake_policy(SET CMP0048 NEW)

+ 

+ project(upb)

+ 

++add_definitions(-D_CRT_SECURE_NO_WARNINGS)

++if(MSVC)

++  add_compile_options(/wd4146)

++endif()

+ 

+ # Prevent CMake from setting -rdynamic on Linux (!!).

+ SET(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "")

diff --git a/ports/upb/portfile.cmake b/ports/upb/portfile.cmake
index b5a46253c..6d8e8dd1f 100644
--- a/ports/upb/portfile.cmake
+++ b/ports/upb/portfile.cmake
@@ -3,10 +3,12 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO protocolbuffers/upb
-    REF  9effcbcb27f0a665f9f345030188c0b291e32482
+    REF 9effcbcb27f0a665f9f345030188c0b291e32482
     SHA512 416ff26ec21181d53be23e94203205072152ab3a8e4b3b28d16263a601995fd2d2f8afe5d8cfbecdac8543249482287b9fe6129314f7c9a7880660f5508bb85e
     HEAD_REF master
-    PATCHES add-cmake-install.patch
+    PATCHES
+        add-cmake-install.patch
+        fix-uwp.patch
 )
 
 vcpkg_configure_cmake(