From 8fe412611cfbd756781d698c05e0b837f7cfa364 Mon Sep 17 00:00:00 2001
From: Phoebe <20694052+PhoebeHui@users.noreply.github.com>
Date: Tue, 10 Mar 2020 08:19:31 +0800
Subject: [folly] Fix dependency issue in config file (#10315)

---
 ports/folly/CONTROL        | 2 +-
 ports/folly/portfile.cmake | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/ports/folly/CONTROL b/ports/folly/CONTROL
index 77c75a702..b4c11a45b 100644
--- a/ports/folly/CONTROL
+++ b/ports/folly/CONTROL
@@ -1,5 +1,5 @@
 Source: folly
-Version: 2019.10.21.00
+Version: 2019.10.21.00-1
 Homepage: https://github.com/facebook/folly
 Description: An open-source C++ library developed and used at Facebook. The library is UNSTABLE on Windows
 Build-Depends: openssl, libevent, double-conversion, glog, gflags, boost-chrono, boost-context, boost-conversion, boost-crc, boost-date-time, boost-filesystem, boost-multi-index, boost-program-options, boost-regex, boost-system, boost-thread, boost-smart-ptr
diff --git a/ports/folly/portfile.cmake b/ports/folly/portfile.cmake
index bfe4aa7e6..52645357a 100644
--- a/ports/folly/portfile.cmake
+++ b/ports/folly/portfile.cmake
@@ -87,6 +87,7 @@ FILE(WRITE ${CURRENT_PACKAGES_DIR}/share/folly/folly-config.cmake
 "include(CMakeFindDependencyMacro)
 find_dependency(Threads)
 find_dependency(glog CONFIG)
+find_dependency(gflags CONFIG REQUIRED)
 ${_contents}")
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-- 
cgit v1.2.3


From 7893f7c76c8f61d971b530b120a2261d80b85592 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?=
 <47264268+JackBoosY@users.noreply.github.com>
Date: Wed, 11 Mar 2020 00:31:38 +0800
Subject: [upb] Fix uwp build (#10005)

* [upb] Fix uwp build

* update baseline
---
 ports/upb/CONTROL        |  2 +-
 ports/upb/fix-uwp.patch  | 15 +++++++++++++++
 ports/upb/portfile.cmake |  4 +++-
 scripts/ci.baseline.txt  |  2 --
 4 files changed, 19 insertions(+), 4 deletions(-)
 create mode 100644 ports/upb/fix-uwp.patch

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..91c45b416
--- /dev/null
+++ b/ports/upb/fix-uwp.patch
@@ -0,0 +1,15 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 577000a..759e35b 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -58,6 +58,10 @@ elseif(UNIX)
+   set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--build-id")
+ endif()
+ 
++if (MSVC)
++  add_compile_options(/wd4146 -D_CRT_SECURE_NO_WARNINGS)
++endif()
++
+ enable_testing()
+ add_library(descriptor_upbproto INTERFACE)
+ add_library(upb
diff --git a/ports/upb/portfile.cmake b/ports/upb/portfile.cmake
index b5a46253c..9d475670e 100644
--- a/ports/upb/portfile.cmake
+++ b/ports/upb/portfile.cmake
@@ -6,7 +6,9 @@ vcpkg_from_github(
     REF  9effcbcb27f0a665f9f345030188c0b291e32482
     SHA512 416ff26ec21181d53be23e94203205072152ab3a8e4b3b28d16263a601995fd2d2f8afe5d8cfbecdac8543249482287b9fe6129314f7c9a7880660f5508bb85e
     HEAD_REF master
-    PATCHES add-cmake-install.patch
+    PATCHES
+        add-cmake-install.patch
+        fix-uwp.patch
 )
 
 vcpkg_configure_cmake(
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
index d310daf71..0834ee62a 100644
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@@ -1784,8 +1784,6 @@ unrar:x64-linux=fail
 unrar:x64-osx=fail
 unrar:x64-uwp=fail
 unrar:x64-windows-static=fail
-upb:arm-uwp=fail
-upb:x64-uwp=fail
 urdfdom:x64-windows-static=fail
 usd:x64-linux=ignore
 usd:x86-windows=fail
-- 
cgit v1.2.3