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/botan | |
| 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/botan')
| -rw-r--r-- | ports/botan/CONTROL | 2 | ||||
| -rw-r--r-- | ports/botan/fix-build_error.patch | 25 | ||||
| -rw-r--r-- | ports/botan/portfile.cmake | 8 |
3 files changed, 4 insertions, 31 deletions
diff --git a/ports/botan/CONTROL b/ports/botan/CONTROL index 48ee01549..e96ef2ff5 100644 --- a/ports/botan/CONTROL +++ b/ports/botan/CONTROL @@ -1,4 +1,4 @@ Source: botan -Version: 2.9.0-2 +Version: 2.11.0 Homepage: https://botan.randombit.net Description: A cryptography library written in C++11 diff --git a/ports/botan/fix-build_error.patch b/ports/botan/fix-build_error.patch deleted file mode 100644 index 85cae86b0..000000000 --- a/ports/botan/fix-build_error.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/src/lib/utils/filesystem.cpp b/src/lib/utils/filesystem.cpp -index 053c91e..8e0a271 100644 ---- a/src/lib/utils/filesystem.cpp -+++ b/src/lib/utils/filesystem.cpp -@@ -9,8 +9,10 @@ - #include <botan/internal/filesystem.h> - #include <algorithm> - -+#define _SILENCE_EXPERIMENTAL_FILESYSTEM_DEPRECATION_WARNING -+ - #if defined(BOTAN_TARGET_OS_HAS_STL_FILESYSTEM_MSVC) && defined(BOTAN_BUILD_COMPILER_IS_MSVC) -- #include <filesystem> -+ #include <experimental/filesystem> - #elif defined(BOTAN_HAS_BOOST_FILESYSTEM) - #include <boost/filesystem.hpp> - #elif defined(BOTAN_TARGET_OS_HAS_POSIX1) -@@ -38,7 +40,7 @@ std::vector<std::string> impl_stl_filesystem(const std::string& dir) - #if (_MSVC_LANG >= 201703L) - using namespace std::filesystem; - #else -- using namespace std::tr2::sys; -+ using namespace std::experimental::filesystem; - #endif - - std::vector<std::string> out; diff --git a/ports/botan/portfile.cmake b/ports/botan/portfile.cmake index 6d0c81c8d..170b399ce 100644 --- a/ports/botan/portfile.cmake +++ b/ports/botan/portfile.cmake @@ -1,15 +1,13 @@ include(vcpkg_common_functions) -set(BOTAN_VERSION 2.9.0) +set(BOTAN_VERSION 2.11.0) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO randombit/botan - REF 0129d3172ec419beb90a2b3487f6385a35da0742 - SHA512 a8328df5ad2693a96935d1d2202ddd6678a5ba9c63a8159acbe56f1c884fa5faaa71339e8f56284cfd00574a9b4f91bdb1fb22c36c8e899d9b4cbe881f4867d3 + REF 16a726c3ad10316bd8d37b6118a5cc52894e8e8f + SHA512 3d759fb262d65f7d325a1e888f74cb1c372ef687b0fcc6fc6ba041b83e3dc65c2928b343c65a89e73ea00c09d11cdda3a161ca98dbabe426903c4cbaf030767c HEAD_REF master - PATCHES - fix-build_error.patch ) if(CMAKE_HOST_WIN32) |