diff options
| author | Mikhaylov Anton <anion155@gmail.com> | 2020-02-04 13:40:15 +0500 |
|---|---|---|
| committer | Mikhaylov Anton <anion155@gmail.com> | 2020-02-04 13:40:15 +0500 |
| commit | d56ed7ee7613e969a3f304b3377438cc5a9064d4 (patch) | |
| tree | d352eee837443f070bbf5d6c5fdd9a6f22f4f8c2 /ports/fizz | |
| parent | ab5b74c797f5a2bd6b28915908355e2b32876dfa (diff) | |
| parent | 85bf9d9d792e379e973d66c8af9f39d65d1d6d42 (diff) | |
| download | vcpkg-d56ed7ee7613e969a3f304b3377438cc5a9064d4.tar.gz vcpkg-d56ed7ee7613e969a3f304b3377438cc5a9064d4.zip | |
Merge branch 'master' into patch-1
Diffstat (limited to 'ports/fizz')
| -rw-r--r-- | ports/fizz/CONTROL | 6 | ||||
| -rw-r--r-- | ports/fizz/fix-build_error.patch | 26 | ||||
| -rw-r--r-- | ports/fizz/portfile.cmake | 6 |
3 files changed, 19 insertions, 19 deletions
diff --git a/ports/fizz/CONTROL b/ports/fizz/CONTROL index 86dbc6da6..ddce58fbb 100644 --- a/ports/fizz/CONTROL +++ b/ports/fizz/CONTROL @@ -1,4 +1,4 @@ Source: fizz
-Version: 2019.10.28.00 -Build-Depends: folly, openssl, libsodium, zlib
-Description: a TLS 1.3 implementation by Facebook
+Version: 2020.01.20.00 +Build-Depends: folly, openssl, libsodium, zlib, fmt
+Description: a TLS 1.3 implementation by Facebook
\ No newline at end of file diff --git a/ports/fizz/fix-build_error.patch b/ports/fizz/fix-build_error.patch index e85f16c6e..c6bafbb15 100644 --- a/ports/fizz/fix-build_error.patch +++ b/ports/fizz/fix-build_error.patch @@ -1,13 +1,13 @@ -diff --git a/fizz/CMakeLists.txt b/fizz/CMakeLists.txt -index 7f8769a..debac4e 100644 ---- a/fizz/CMakeLists.txt -+++ b/fizz/CMakeLists.txt -@@ -81,7 +81,7 @@ if(TARGET event) - message(STATUS "Found libevent from package config") - list(APPEND FIZZ_SHINY_DEPENDENCIES event) - else() -- find_package(Libevent MODULE REQUIRED) -+ find_package(Libevent CONFIG REQUIRED) - list(APPEND FIZZ_LINK_LIBRARIES ${LIBEVENT_LIB}) - list(APPEND FIZZ_INCLUDE_DIRECTORIES ${LIBEVENT_INCLUDE_DIR}) - endif() +diff --git a/fizz/CMakeLists.txt b/fizz/CMakeLists.txt
+index ccbbbb6..ee10c90 100644
+--- a/fizz/CMakeLists.txt
++++ b/fizz/CMakeLists.txt
+@@ -86,7 +86,7 @@ if(TARGET event)
+ message(STATUS "Found libevent from package config")
+ list(APPEND FIZZ_SHINY_DEPENDENCIES event)
+ else()
+- find_package(Libevent MODULE REQUIRED)
++ find_package(Libevent CONFIG REQUIRED)
+ list(APPEND FIZZ_LINK_LIBRARIES ${LIBEVENT_LIB})
+ list(APPEND FIZZ_INCLUDE_DIRECTORIES ${LIBEVENT_INCLUDE_DIR})
+ endif()
diff --git a/ports/fizz/portfile.cmake b/ports/fizz/portfile.cmake index 1647eb1ef..17a9093bd 100644 --- a/ports/fizz/portfile.cmake +++ b/ports/fizz/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO facebookincubator/fizz
- REF 3e933cff04c27c97d0fb0b899ed0c883b4e02e3b # v2019.10.28.00 - SHA512 522b677f9e6cb0dd7ce2dad226efd831877ce12352efa6a34e743d1ec7a02ba65e7425472a57e88832f68fa4503206d9846580e305da6a0843034455e510b68d
+ REF b5c90de055e58e53b4137e0593f5bdbca172bcb2 # v2020.01.20.00 + SHA512 1fdc8fd1d48671de30e4e67d260b13045dbc4436d2afa571bbb60e446d7d47cb68b9536dfef3621c0dd104abb7ec24647e0e0fad42b0134c5047772b7a9b2384
HEAD_REF master
PATCHES
find-zlib.patch
@@ -44,4 +44,4 @@ file(REMOVE_RECURSE )
# Handle copyright
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/fizz RENAME copyright)
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
\ No newline at end of file |