From c094d3133c0b7776c74e1463d64cc079c9960068 Mon Sep 17 00:00:00 2001 From: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> Date: Mon, 17 Dec 2018 16:44:08 -0800 Subject: [PATCH] Update release version or commit to latest for below ports (#4957) * [botan][caf][celero][docopt][glbinding][nanodbc][sfgui]Update release version or commit to latest * [sfml] Add find_dependency(Freetype) --- ports/botan/CONTROL | 2 +- ports/botan/portfile.cmake | 6 +- ports/caf/CONTROL | 2 +- ports/caf/openssl-version-override.patch | 12 +- ports/caf/portfile.cmake | 11 +- ports/celero/CONTROL | 2 +- ports/celero/portfile.cmake | 4 +- ports/docopt/CONTROL | 2 +- ports/docopt/portfile.cmake | 4 +- ports/glbinding/CONTROL | 2 +- ports/glbinding/portfile.cmake | 4 +- ports/nanodbc/0001_cmake.patch | 23 -- ports/nanodbc/0002_msvc14_codecvt.patch | 34 -- ports/nanodbc/0003_export_def.patch | 417 ----------------------- ports/nanodbc/0004_unicode.patch | 33 -- ports/nanodbc/CONTROL | 2 +- ports/nanodbc/portfile.cmake | 25 +- ports/sfgui/CONTROL | 2 +- ports/sfgui/portfile.cmake | 7 +- ports/sfml/CONTROL | 2 +- ports/sfml/portfile.cmake | 4 +- 21 files changed, 35 insertions(+), 565 deletions(-) delete mode 100644 ports/nanodbc/0001_cmake.patch delete mode 100644 ports/nanodbc/0002_msvc14_codecvt.patch delete mode 100644 ports/nanodbc/0003_export_def.patch delete mode 100644 ports/nanodbc/0004_unicode.patch diff --git a/ports/botan/CONTROL b/ports/botan/CONTROL index 5582c3a7a..3961c2ccb 100644 --- a/ports/botan/CONTROL +++ b/ports/botan/CONTROL @@ -1,3 +1,3 @@ Source: botan -Version: 2.8.0 +Version: 2.9.0 Description: A cryptography library written in C++11 diff --git a/ports/botan/portfile.cmake b/ports/botan/portfile.cmake index 200d00f9f..f405b8f45 100644 --- a/ports/botan/portfile.cmake +++ b/ports/botan/portfile.cmake @@ -1,12 +1,12 @@ include(vcpkg_common_functions) -set(BOTAN_VERSION 2.8.0) +set(BOTAN_VERSION 2.9.0) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO randombit/botan - REF cb14e9ce95bcaae2ada7ffe96ef0cce6a2b38593 - SHA512 3d8fbf1c65e2b0259f225db46ffa4a7eb989a518b230574e94f82dc13afd7dc32cfe6a8a0127e7dd0dea30e06f3946db78db50e107937382eff8ed823e996dc3 + REF 0129d3172ec419beb90a2b3487f6385a35da0742 + SHA512 a8328df5ad2693a96935d1d2202ddd6678a5ba9c63a8159acbe56f1c884fa5faaa71339e8f56284cfd00574a9b4f91bdb1fb22c36c8e899d9b4cbe881f4867d3 HEAD_REF master ) diff --git a/ports/caf/CONTROL b/ports/caf/CONTROL index e9b8cd0bf..6f39010be 100644 --- a/ports/caf/CONTROL +++ b/ports/caf/CONTROL @@ -1,4 +1,4 @@ Source: caf -Version: 0.15.7 +Version: 0.16.2 Build-Depends: openssl Description: an open source C++11 actor model implementation featuring lightweight & fast actor implementations, pattern matching for messages, network transparent messaging, and more. diff --git a/ports/caf/openssl-version-override.patch b/ports/caf/openssl-version-override.patch index bccbd6ca4..5a0337134 100644 --- a/ports/caf/openssl-version-override.patch +++ b/ports/caf/openssl-version-override.patch @@ -1,14 +1,14 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index a7b75f7..794af1d 100644 +index 2d908e8..d270297 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -545,6 +545,9 @@ if(NOT CAF_NO_OPENSSL) +@@ -495,6 +495,9 @@ if(NOT CAF_NO_OPENSSL) message(STATUS "Disable OpenSSL. Required >= 1.0.1 due to TLSv1.2 support.") set(CAF_NO_OPENSSL yes) + elseif(CAF_OPENSSL_VERSION_OVERRIDE) -+ include_directories(BEFORE ${OPENSSL_INCLUDE_DIR}) -+ add_optional_caf_lib(openssl) ++ include_directories(BEFORE ${OPENSSL_INCLUDE_DIR}) ++ add_optional_caf_lib(openssl) else() - # Check if openssl headers and library versions match - set(CMAKE_REQUIRED_LIBRARIES ${OPENSSL_LIBRARIES}) + if(NOT CMAKE_CROSSCOMPILING) + # Check if openssl headers and library versions match diff --git a/ports/caf/portfile.cmake b/ports/caf/portfile.cmake index aecd84116..ae5e24c1b 100644 --- a/ports/caf/portfile.cmake +++ b/ports/caf/portfile.cmake @@ -8,14 +8,11 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO actor-framework/actor-framework - REF 0.15.7 - SHA512 ff0fa205ad71677b84fa09a2e6ce6bb6d1bc9b790bbbc3ac51505467402ff61a218528004212efa2063c798cc512972d318a2c9423067ee51cef719de2b6b186 + REF 2cc4377715afc3d3c35848f9d59b9e6876afd875 + SHA512 7e7962bf5a30122bde8be63f6de0058f865bd890e2d10f4d90f4885b7953467fb6532f69c1a77a35802de7c531f6aac192a2993b53a8dc0b05f503c3f4083a31 HEAD_REF master -) - -vcpkg_apply_patches( - SOURCE_PATH ${SOURCE_PATH} - PATCHES ${CMAKE_CURRENT_LIST_DIR}/openssl-version-override.patch + PATCHES + openssl-version-override.patch ) vcpkg_configure_cmake( diff --git a/ports/celero/CONTROL b/ports/celero/CONTROL index 2afd57484..aa90dad66 100644 --- a/ports/celero/CONTROL +++ b/ports/celero/CONTROL @@ -1,3 +1,3 @@ Source: celero -Version: 2.4.0 +Version: 2.4.0-1 Description: Celero is a modern cross-platform (Windows, Linux, MacOS) Microbenchmarking library for C++. diff --git a/ports/celero/portfile.cmake b/ports/celero/portfile.cmake index f9288fb8e..61dbec10e 100644 --- a/ports/celero/portfile.cmake +++ b/ports/celero/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO DigitalInBlue/Celero - REF v2.4.0 - SHA512 4ba9f26bcda85bea00de27a6e8166f874f2c3852f74c54c089373caf71e1c066ac771fda73799d84c4c7a20986a71fd7a3b101b7b8972b9797ab3e8ed7918c30 + REF 9f41c21e35b04d7d65dcb0aff4c962f6e5f2cbc3 + SHA512 62a4803e61cf9e876c09cc68be07d4bfa31f291d3ced23e092347bf43b48086b3ba7862fc454082f42263d9ec0c260e8ba58da5c0c461ebff9c871209784e2a7 HEAD_REF master ) diff --git a/ports/docopt/CONTROL b/ports/docopt/CONTROL index 0fc6d09c8..b6599438c 100644 --- a/ports/docopt/CONTROL +++ b/ports/docopt/CONTROL @@ -1,3 +1,3 @@ Source: docopt -Version: 2018-04-16-2 +Version: 2018-11-01 Description: Command line arguments parser that will make you smile (C++11 port). diff --git a/ports/docopt/portfile.cmake b/ports/docopt/portfile.cmake index 5076bf742..ec3a764d6 100644 --- a/ports/docopt/portfile.cmake +++ b/ports/docopt/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO docopt/docopt.cpp - REF 4f491249e6def236937dbfac7602852e7d99aff8 - SHA512 d3a61f8d8a8c11723064f3405f03eb838a2ac9aa574f86771b1db89a2dd81996b639215fe5d4465343b893bf71502da178c7af8d883c112c1e45f43c17d473b7 + REF 7476f8e56b4650aaeafb4e1cda2e5d8f01fddd97 + SHA512 6765e8a3a834ad75bd87effee5ac7e174482039d26015346b95d7d64e4e0097cc3f1f2e6fd9e3e5970bf4c5719095c0a3e5edfac18217913dc88fbe569d37ae8 HEAD_REF master PATCHES 001-fix-unresolved-symbol.patch diff --git a/ports/glbinding/CONTROL b/ports/glbinding/CONTROL index d225e60c8..9671eda4b 100644 --- a/ports/glbinding/CONTROL +++ b/ports/glbinding/CONTROL @@ -1,3 +1,3 @@ Source: glbinding -Version: 3.0.2-3 +Version: 3.0.2-4 Description: glbinding is an MIT licensed, cross-platform C++ binding for the OpenGL API diff --git a/ports/glbinding/portfile.cmake b/ports/glbinding/portfile.cmake index 64063bc73..d7a896723 100644 --- a/ports/glbinding/portfile.cmake +++ b/ports/glbinding/portfile.cmake @@ -2,8 +2,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO cginternals/glbinding - REF v3.0.2 - SHA512 524ad20a11af7d8ee1764f53326b43efb3b3dbd6c64d1539f4d9fa2bcb7b58a6bd6caf460d6944aed4fd7439b82536d8f28a0f0f51c14c62c2f0c73baab9afcb + REF d7a1873ad741fb13a9c6dcbae93d0cda45a11933 + SHA512 70848d8ddad3e2ddfc54549ed3cdde569991858135140b30b50fa6e92c5aec6e3dd235418e091456f9b68da2fad09fbef117dedac7b48c26bcab62b6f0fa791f HEAD_REF master PATCHES force-system-install.patch ) diff --git a/ports/nanodbc/0001_cmake.patch b/ports/nanodbc/0001_cmake.patch deleted file mode 100644 index 36d57be0e..000000000 --- a/ports/nanodbc/0001_cmake.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9f4aa71..94edd95 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -201,9 +201,16 @@ endif() - if(NANODBC_INSTALL) - install(FILES src/nanodbc.h DESTINATION include) - if(NANODBC_STATIC) -- install(TARGETS nanodbc ARCHIVE DESTINATION lib) -+ install( -+ TARGETS nanodbc -+ ARCHIVE DESTINATION lib -+ LIBRARY DESTINATION lib) - else() -- install(TARGETS nanodbc LIBRARY DESTINATION lib) -+ install( -+ TARGETS nanodbc -+ ARCHIVE DESTINATION lib -+ LIBRARY DESTINATION lib -+ RUNTIME DESTINATION bin) - endif() - message(STATUS "Target install: Turned on") - else() diff --git a/ports/nanodbc/0002_msvc14_codecvt.patch b/ports/nanodbc/0002_msvc14_codecvt.patch deleted file mode 100644 index ae499bcf9..000000000 --- a/ports/nanodbc/0002_msvc14_codecvt.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff --git a/src/nanodbc.cpp b/src/nanodbc.cpp -index 8e02d4a..2e42b91 100644 ---- a/src/nanodbc.cpp -+++ b/src/nanodbc.cpp -@@ -209,10 +209,11 @@ namespace - out = utf_to_utf(in.c_str(), in.c_str() + in.size()); - #else - #if defined(_MSC_VER) && (_MSC_VER == 1900) -- // Workaround for confirmed bug in VS2015. -- // See: https://social.msdn.microsoft.com/Forums/en-US/8f40dcd8-c67f-4eba-9134-a19b9178e481/vs-2015-rc-linker-stdcodecvt-error -- auto p = reinterpret_cast(in.data()); -- out = std::wstring_convert, wide_char_t>().to_bytes(p, p + in.size()); -+ // Workaround for confirmed bug in VS2015. See: -+ // https://connect.microsoft.com/VisualStudio/Feedback/Details/1403302 -+ // https://social.msdn.microsoft.com/Forums/en-US/8f40dcd8-c67f-4eba-9134-a19b9178e481/vs-2015-rc-linker-stdcodecvt-error -+ auto p = reinterpret_cast(in.data()); -+ out = std::wstring_convert, unsigned short>().to_bytes(p, p + in.size()); - #else - out = std::wstring_convert, wide_char_t>().to_bytes(in); - #endif -@@ -226,9 +227,10 @@ namespace - using boost::locale::conv::utf_to_utf; - out = utf_to_utf(in.c_str(), in.c_str() + in.size()); - #elif defined(_MSC_VER) && (_MSC_VER == 1900) -- // Workaround for confirmed bug in VS2015. -- // See: https://social.msdn.microsoft.com/Forums/en-US/8f40dcd8-c67f-4eba-9134-a19b9178e481/vs-2015-rc-linker-stdcodecvt-error -- auto s = std::wstring_convert, wide_char_t>().from_bytes(in); -+ // Workaround for confirmed bug in VS2015. See: -+ // https://connect.microsoft.com/VisualStudio/Feedback/Details/1403302 -+ // https://social.msdn.microsoft.com/Forums/en-US/8f40dcd8-c67f-4eba-9134-a19b9178e481/vs-2015-rc-linker-stdcodecvt-error -+ auto s = std::wstring_convert, unsigned short>().from_bytes(in); - auto p = reinterpret_cast(s.data()); - out.assign(p, p + s.size()); - #else diff --git a/ports/nanodbc/0003_export_def.patch b/ports/nanodbc/0003_export_def.patch deleted file mode 100644 index 3dd3649ae..000000000 --- a/ports/nanodbc/0003_export_def.patch +++ /dev/null @@ -1,417 +0,0 @@ -diff --git a/src/nanodbc.cpp b/src/nanodbc.cpp -index 8e02d4a..0483660 100644 ---- a/src/nanodbc.cpp -+++ b/src/nanodbc.cpp -@@ -3253,10 +3253,10 @@ unsigned long statement::parameter_size(short param) const - - // We need to instantiate each form of bind() for each of our supported data types. - #define NANODBC_INSTANTIATE_BINDS(type) \ -- template void statement::bind(short, const type*, param_direction); /* 1-ary */ \ -- template void statement::bind(short, const type*, std::size_t, param_direction); /* n-ary */ \ -- template void statement::bind(short, const type*, std::size_t, const type*, param_direction); /* n-ary, sentry */ \ -- template void statement::bind(short, const type*, std::size_t, const bool*, param_direction) /* n-ary, flags */ \ -+ template NANODBC_API void statement::bind(short, const type*, param_direction); /* 1-ary */ \ -+ template NANODBC_API void statement::bind(short, const type*, std::size_t, param_direction); /* n-ary */ \ -+ template NANODBC_API void statement::bind(short, const type*, std::size_t, const type*, param_direction); /* n-ary, sentry */ \ -+ template NANODBC_API void statement::bind(short, const type*, std::size_t, const bool*, param_direction) /* n-ary, flags */ \ - /**/ - - // The following are the only supported instantiations of statement::bind(). -@@ -3875,112 +3875,112 @@ result::operator bool() const - } - - // The following are the only supported instantiations of result::get_ref(). --template void result::get_ref(short, string_type::value_type&) const; --template void result::get_ref(short, short&) const; --template void result::get_ref(short, unsigned short&) const; --template void result::get_ref(short, int32_t&) const; --template void result::get_ref(short, uint32_t&) const; --template void result::get_ref(short, int64_t&) const; --template void result::get_ref(short, uint64_t&) const; --template void result::get_ref(short, float&) const; --template void result::get_ref(short, double&) const; --template void result::get_ref(short, string_type&) const; --template void result::get_ref(short, date&) const; --template void result::get_ref(short, timestamp&) const; -- --template void result::get_ref(const string_type&, string_type::value_type&) const; --template void result::get_ref(const string_type&, short&) const; --template void result::get_ref(const string_type&, unsigned short&) const; --template void result::get_ref(const string_type&, int32_t&) const; --template void result::get_ref(const string_type&, uint32_t&) const; --template void result::get_ref(const string_type&, int64_t&) const; --template void result::get_ref(const string_type&, uint64_t&) const; --template void result::get_ref(const string_type&, float&) const; --template void result::get_ref(const string_type&, double&) const; --template void result::get_ref(const string_type&, string_type&) const; --template void result::get_ref(const string_type&, date&) const; --template void result::get_ref(const string_type&, timestamp&) const; -+template NANODBC_API void result::get_ref(short, string_type::value_type&) const; -+template NANODBC_API void result::get_ref(short, short&) const; -+template NANODBC_API void result::get_ref(short, unsigned short&) const; -+template NANODBC_API void result::get_ref(short, int32_t&) const; -+template NANODBC_API void result::get_ref(short, uint32_t&) const; -+template NANODBC_API void result::get_ref(short, int64_t&) const; -+template NANODBC_API void result::get_ref(short, uint64_t&) const; -+template NANODBC_API void result::get_ref(short, float&) const; -+template NANODBC_API void result::get_ref(short, double&) const; -+template NANODBC_API void result::get_ref(short, string_type&) const; -+template NANODBC_API void result::get_ref(short, date&) const; -+template NANODBC_API void result::get_ref(short, timestamp&) const; -+ -+template NANODBC_API void result::get_ref(const string_type&, string_type::value_type&) const; -+template NANODBC_API void result::get_ref(const string_type&, short&) const; -+template NANODBC_API void result::get_ref(const string_type&, unsigned short&) const; -+template NANODBC_API void result::get_ref(const string_type&, int32_t&) const; -+template NANODBC_API void result::get_ref(const string_type&, uint32_t&) const; -+template NANODBC_API void result::get_ref(const string_type&, int64_t&) const; -+template NANODBC_API void result::get_ref(const string_type&, uint64_t&) const; -+template NANODBC_API void result::get_ref(const string_type&, float&) const; -+template NANODBC_API void result::get_ref(const string_type&, double&) const; -+template NANODBC_API void result::get_ref(const string_type&, string_type&) const; -+template NANODBC_API void result::get_ref(const string_type&, date&) const; -+template NANODBC_API void result::get_ref(const string_type&, timestamp&) const; - - // The following are the only supported instantiations of result::get_ref() with fallback. --template void result::get_ref(short, const string_type::value_type&, string_type::value_type&) const; --template void result::get_ref(short, const short&, short&) const; --template void result::get_ref(short, const unsigned short&, unsigned short&) const; --template void result::get_ref(short, const int32_t&, int32_t&) const; --template void result::get_ref(short, const uint32_t&, uint32_t&) const; --template void result::get_ref(short, const int64_t&, int64_t&) const; --template void result::get_ref(short, const uint64_t&, uint64_t&) const; --template void result::get_ref(short, const float&, float&) const; --template void result::get_ref(short, const double&, double&) const; --template void result::get_ref(short, const string_type&, string_type&) const; --template void result::get_ref(short, const date&, date&) const; --template void result::get_ref(short, const timestamp&, timestamp&) const; -- --template void result::get_ref(const string_type&, const string_type::value_type&, string_type::value_type&) const; --template void result::get_ref(const string_type&, const short&, short&) const; --template void result::get_ref(const string_type&, const unsigned short&, unsigned short&) const; --template void result::get_ref(const string_type&, const int32_t&, int32_t&) const; --template void result::get_ref(const string_type&, const uint32_t&, uint32_t&) const; --template void result::get_ref(const string_type&, const int64_t&, int64_t&) const; --template void result::get_ref(const string_type&, const uint64_t&, uint64_t&) const; --template void result::get_ref(const string_type&, const float&, float&) const; --template void result::get_ref(const string_type&, const double&, double&) const; --template void result::get_ref(const string_type&, const string_type&, string_type&) const; --template void result::get_ref(const string_type&, const date&, date&) const; --template void result::get_ref(const string_type&, const timestamp&, timestamp&) const; -+template NANODBC_API void result::get_ref(short, const string_type::value_type&, string_type::value_type&) const; -+template NANODBC_API void result::get_ref(short, const short&, short&) const; -+template NANODBC_API void result::get_ref(short, const unsigned short&, unsigned short&) const; -+template NANODBC_API void result::get_ref(short, const int32_t&, int32_t&) const; -+template NANODBC_API void result::get_ref(short, const uint32_t&, uint32_t&) const; -+template NANODBC_API void result::get_ref(short, const int64_t&, int64_t&) const; -+template NANODBC_API void result::get_ref(short, const uint64_t&, uint64_t&) const; -+template NANODBC_API void result::get_ref(short, const float&, float&) const; -+template NANODBC_API void result::get_ref(short, const double&, double&) const; -+template NANODBC_API void result::get_ref(short, const string_type&, string_type&) const; -+template NANODBC_API void result::get_ref(short, const date&, date&) const; -+template NANODBC_API void result::get_ref(short, const timestamp&, timestamp&) const; -+ -+template NANODBC_API void result::get_ref(const string_type&, const string_type::value_type&, string_type::value_type&) const; -+template NANODBC_API void result::get_ref(const string_type&, const short&, short&) const; -+template NANODBC_API void result::get_ref(const string_type&, const unsigned short&, unsigned short&) const; -+template NANODBC_API void result::get_ref(const string_type&, const int32_t&, int32_t&) const; -+template NANODBC_API void result::get_ref(const string_type&, const uint32_t&, uint32_t&) const; -+template NANODBC_API void result::get_ref(const string_type&, const int64_t&, int64_t&) const; -+template NANODBC_API void result::get_ref(const string_type&, const uint64_t&, uint64_t&) const; -+template NANODBC_API void result::get_ref(const string_type&, const float&, float&) const; -+template NANODBC_API void result::get_ref(const string_type&, const double&, double&) const; -+template NANODBC_API void result::get_ref(const string_type&, const string_type&, string_type&) const; -+template NANODBC_API void result::get_ref(const string_type&, const date&, date&) const; -+template NANODBC_API void result::get_ref(const string_type&, const timestamp&, timestamp&) const; - - // The following are the only supported instantiations of result::get(). --template string_type::value_type result::get(short) const; --template short result::get(short) const; --template unsigned short result::get(short) const; --template int32_t result::get(short) const; --template uint32_t result::get(short) const; --template int64_t result::get(short) const; --template uint64_t result::get(short) const; --template float result::get(short) const; --template double result::get(short) const; --template string_type result::get(short) const; --template date result::get(short) const; --template timestamp result::get(short) const; -- --template string_type::value_type result::get(const string_type&) const; --template short result::get(const string_type&) const; --template unsigned short result::get(const string_type&) const; --template int32_t result::get(const string_type&) const; --template uint32_t result::get(const string_type&) const; --template int64_t result::get(const string_type&) const; --template uint64_t result::get(const string_type&) const; --template float result::get(const string_type&) const; --template double result::get(const string_type&) const; --template string_type result::get(const string_type&) const; --template date result::get(const string_type&) const; --template timestamp result::get(const string_type&) const; -+template NANODBC_API string_type::value_type result::get(short) const; -+template NANODBC_API short result::get(short) const; -+template NANODBC_API unsigned short result::get(short) const; -+template NANODBC_API int32_t result::get(short) const; -+template NANODBC_API uint32_t result::get(short) const; -+template NANODBC_API int64_t result::get(short) const; -+template NANODBC_API uint64_t result::get(short) const; -+template NANODBC_API float result::get(short) const; -+template NANODBC_API double result::get(short) const; -+template NANODBC_API string_type result::get(short) const; -+template NANODBC_API date result::get(short) const; -+template NANODBC_API timestamp result::get(short) const; -+ -+template NANODBC_API string_type::value_type result::get(const string_type&) const; -+template NANODBC_API short result::get(const string_type&) const; -+template NANODBC_API unsigned short result::get(const string_type&) const; -+template NANODBC_API int32_t result::get(const string_type&) const; -+template NANODBC_API uint32_t result::get(const string_type&) const; -+template NANODBC_API int64_t result::get(const string_type&) const; -+template NANODBC_API uint64_t result::get(const string_type&) const; -+template NANODBC_API float result::get(const string_type&) const; -+template NANODBC_API double result::get(const string_type&) const; -+template NANODBC_API string_type result::get(const string_type&) const; -+template NANODBC_API date result::get(const string_type&) const; -+template NANODBC_API timestamp result::get(const string_type&) const; - - // The following are the only supported instantiations of result::get() with fallback. --template string_type::value_type result::get(short, const string_type::value_type&) const; --template short result::get(short, const short&) const; --template unsigned short result::get(short, const unsigned short&) const; --template int32_t result::get(short, const int32_t&) const; --template uint32_t result::get(short, const uint32_t&) const; --template int64_t result::get(short, const int64_t&) const; --template uint64_t result::get(short, const uint64_t&) const; --template float result::get(short, const float&) const; --template double result::get(short, const double&) const; --template string_type result::get(short, const string_type&) const; --template date result::get(short, const date&) const; --template timestamp result::get(short, const timestamp&) const; -- --template string_type::value_type result::get(const string_type&, const string_type::value_type&) const; --template short result::get(const string_type&, const short&) const; --template unsigned short result::get(const string_type&, const unsigned short&) const; --template int32_t result::get(const string_type&, const int32_t&) const; --template uint32_t result::get(const string_type&, const uint32_t&) const; --template int64_t result::get(const string_type&, const int64_t&) const; --template uint64_t result::get(const string_type&, const uint64_t&) const; --template float result::get(const string_type&, const float&) const; --template double result::get(const string_type&, const double&) const; --template string_type result::get(const string_type&, const string_type&) const; --template date result::get(const string_type&, const date&) const; --template timestamp result::get(const string_type&, const timestamp&) const; -+template NANODBC_API string_type::value_type result::get(short, const string_type::value_type&) const; -+template NANODBC_API short result::get(short, const short&) const; -+template NANODBC_API unsigned short result::get(short, const unsigned short&) const; -+template NANODBC_API int32_t result::get(short, const int32_t&) const; -+template NANODBC_API uint32_t result::get(short, const uint32_t&) const; -+template NANODBC_API int64_t result::get(short, const int64_t&) const; -+template NANODBC_API uint64_t result::get(short, const uint64_t&) const; -+template NANODBC_API float result::get(short, const float&) const; -+template NANODBC_API double result::get(short, const double&) const; -+template NANODBC_API string_type result::get(short, const string_type&) const; -+template NANODBC_API date result::get(short, const date&) const; -+template NANODBC_API timestamp result::get(short, const timestamp&) const; -+ -+template NANODBC_API string_type::value_type result::get(const string_type&, const string_type::value_type&) const; -+template NANODBC_API short result::get(const string_type&, const short&) const; -+template NANODBC_API unsigned short result::get(const string_type&, const unsigned short&) const; -+template NANODBC_API int32_t result::get(const string_type&, const int32_t&) const; -+template NANODBC_API uint32_t result::get(const string_type&, const uint32_t&) const; -+template NANODBC_API int64_t result::get(const string_type&, const int64_t&) const; -+template NANODBC_API uint64_t result::get(const string_type&, const uint64_t&) const; -+template NANODBC_API float result::get(const string_type&, const float&) const; -+template NANODBC_API double result::get(const string_type&, const double&) const; -+template NANODBC_API string_type result::get(const string_type&, const string_type&) const; -+template NANODBC_API date result::get(const string_type&, const date&) const; -+template NANODBC_API timestamp result::get(const string_type&, const timestamp&) const; - - } // namespace nanodbc - -diff --git a/src/nanodbc.h b/src/nanodbc.h -index f4e7b3d..2bfc6a8 100644 ---- a/src/nanodbc.h -+++ b/src/nanodbc.h -@@ -164,6 +164,16 @@ namespace nanodbc - #define NANODBC_NOEXCEPT noexcept - #endif - -+#pragma warning(disable: 4275) -+#pragma warning(disable: 4251) -+#ifdef nanodbc_EXPORTS -+ /* We are building this library */ -+ #define NANODBC_API __declspec(dllexport) -+#else -+ /* We are using this library */ -+ #define NANODBC_API __declspec(dllimport) -+#endif -+ - // 8888888888 888 888 888 888 d8b - // 888 888 888 888 888 Y8P - // 888 888 888 888 888 -@@ -188,16 +198,17 @@ namespace nanodbc - - //! \brief Type incompatible. - //! \see exceptions --class type_incompatible_error : public std::runtime_error -+class NANODBC_API type_incompatible_error : public std::runtime_error - { - public: - type_incompatible_error(); - const char* what() const NANODBC_NOEXCEPT; - }; - -+ - //! \brief Accessed null data. - //! \see exceptions --class null_access_error : public std::runtime_error -+class NANODBC_API null_access_error : public std::runtime_error - { - public: - null_access_error(); -@@ -206,7 +217,7 @@ public: - - //! \brief Index out of range. - //! \see exceptions --class index_range_error : public std::runtime_error -+class NANODBC_API index_range_error : public std::runtime_error - { - public: - index_range_error(); -@@ -215,7 +226,7 @@ public: - - //! \brief Programming logic error. - //! \see exceptions --class programming_error : public std::runtime_error -+class NANODBC_API programming_error : public std::runtime_error - { - public: - explicit programming_error(const std::string& info); -@@ -224,7 +235,7 @@ public: - - //! \brief General database error. - //! \see exceptions --class database_error : public std::runtime_error -+class NANODBC_API database_error : public std::runtime_error - { - public: - //! \brief Creates a runtime_error with a message describing the last ODBC error generated for the given handle and handle_type. -@@ -298,7 +309,7 @@ struct timestamp - //! \brief A resource for managing transaction commits and rollbacks. - //! - //! \attention You will want to use transactions if you are doing batch operations because it will prevent auto commits from occurring after each individual operation is executed. --class transaction -+class NANODBC_API transaction - { - public: - //! \brief Begin a transaction on the given connection object. -@@ -361,7 +372,7 @@ private: - // MARK: Statement - - - //! \brief Represents a statement on the database. --class statement -+class NANODBC_API statement - { - public: - //! \brief Provides support for retrieving output/return parameters. -@@ -734,7 +745,7 @@ private: - // MARK: Connection - - - //! \brief Manages and encapsulates ODBC resources such as the connection and environment handles. --class connection -+class NANODBC_API connection - { - public: - //! \brief Create new connection object, initially not connected. -@@ -903,7 +914,7 @@ class catalog; - //! - //! \see statement::execute(), statement::execute_direct() - //! \note result objects may be copied, however all copies will refer to the same underlying ODBC result set. --class result -+class NANODBC_API result - { - public: - //! Empty result set. -@@ -1023,7 +1034,7 @@ public: - //! \param column position. - //! \throws database_error, index_range_error, type_incompatible_error, null_access_error - template -- T get(short column) const; -+ T get(short column) const; - - //! \brief Gets data from the given column of the current rowset. - //! If the data is null, fallback is returned instead. -@@ -1139,7 +1150,7 @@ private: - // "Y88P" - // MARK: Catalog - - --class catalog -+class NANODBC_API catalog - { - public: - -@@ -1319,7 +1330,7 @@ private: - //! \return A result set object. - //! \attention You will want to use transactions if you are doing batch operations because it will prevent auto commits from occurring after each individual operation is executed. - //! \see open(), prepare(), execute(), result, transaction --result execute( -+result NANODBC_API execute( - connection& conn - , const string_type& query - , long batch_operations = 1 -@@ -1333,7 +1344,7 @@ result execute( - //! \return A result set object. - //! \attention You will want to use transactions if you are doing batch operations because it will prevent auto commits from occurring after each individual operation is executed. - //! \see open(), prepare(), execute(), result, transaction --void just_execute( -+void NANODBC_API just_execute( - connection& conn - , const string_type& query - , long batch_operations = 1 -@@ -1346,7 +1357,7 @@ void just_execute( - //! \return A result set object. - //! \attention You will want to use transactions if you are doing batch operations because it will prevent auto commits from occurring after each individual operation is executed. - //! \see open(), prepare(), execute(), result --result execute(statement& stmt, long batch_operations = 1); -+result NANODBC_API execute(statement& stmt, long batch_operations = 1); - - //! \brief Execute the previously prepared query now and without creating result object. - //! \param stmt The prepared statement that will be executed. -@@ -1355,7 +1366,7 @@ result execute(statement& stmt, long batch_operations = 1); - //! \return A result set object. - //! \attention You will want to use transactions if you are doing batch operations because it will prevent auto commits from occurring after each individual operation is executed. - //! \see open(), prepare(), execute(), result --void just_execute(statement& stmt, long batch_operations = 1); -+void NANODBC_API just_execute(statement& stmt, long batch_operations = 1); - - //! \brief Execute the previously prepared query now. - //! Executes within the context of a transaction object and commits the transaction directly after execution. -@@ -1364,7 +1375,7 @@ void just_execute(statement& stmt, long batch_operations = 1); - //! \throws database_error - //! \return A result set object. - //! \see open(), prepare(), execute(), result, transaction --result transact(statement& stmt, long batch_operations); -+result NANODBC_API transact(statement& stmt, long batch_operations); - - //! \brief Execute the previously prepared query now and without creating result object. - //! Executes within the context of a transaction object and commits the transaction directly after execution. -@@ -1373,7 +1384,7 @@ result transact(statement& stmt, long batch_operations); - //! \throws database_error - //! \return A result set object. - //! \see open(), prepare(), execute(), result, transaction --void just_transact(statement& stmt, long batch_operations); -+void NANODBC_API just_transact(statement& stmt, long batch_operations); - - //! \brief Prepares the given statement to execute on it associated connection. - //! If the statement is not open throws programming_error. -@@ -1382,7 +1393,7 @@ void just_transact(statement& stmt, long batch_operations); - //! \param timeout The number in seconds before query timeout. Default is 0 indicating no timeout. - //! \see open() - //! \throws database_error, programming_error --void prepare(statement& stmt, const string_type& query, long timeout = 0); -+void NANODBC_API prepare(statement& stmt, const string_type& query, long timeout = 0); - - //! @} - diff --git a/ports/nanodbc/0004_unicode.patch b/ports/nanodbc/0004_unicode.patch deleted file mode 100644 index a4def235c..000000000 --- a/ports/nanodbc/0004_unicode.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/src/nanodbc.cpp b/src/nanodbc.cpp -index 8e02d4a..c408af7 100644 ---- a/src/nanodbc.cpp -+++ b/src/nanodbc.cpp -@@ -90,7 +90,7 @@ - typedef std::u32string wide_string_type; - #define NANODBC_CODECVT_TYPE std::codecvt_utf8 - #else -- typedef std::u16string wide_string_type; -+ typedef std::wstring wide_string_type; - #define NANODBC_CODECVT_TYPE std::codecvt_utf8_utf16 - #endif - typedef wide_string_type::value_type wide_char_t; -diff --git a/src/nanodbc.h b/src/nanodbc.h -index f4e7b3d..bb7bacd 100644 ---- a/src/nanodbc.h -+++ b/src/nanodbc.h -@@ -127,13 +127,13 @@ namespace nanodbc - - //! @} - --// You must explicitly request Unicode support by defining NANODBC_USE_UNICODE at compile time. -+#define NANODBC_USE_UNICODE 1 - #ifndef DOXYGEN - #ifdef NANODBC_USE_UNICODE - #ifdef NANODBC_USE_IODBC_WIDE_STRINGS - typedef std::u32string string_type; - #else -- typedef std::u16string string_type; -+ typedef std::wstring string_type; - #endif - #else - typedef std::string string_type; diff --git a/ports/nanodbc/CONTROL b/ports/nanodbc/CONTROL index ef676937e..075bd4d82 100644 --- a/ports/nanodbc/CONTROL +++ b/ports/nanodbc/CONTROL @@ -1,3 +1,3 @@ Source: nanodbc -Version: 2.12.4-2 +Version: 2.12.4-3 Description: A small C++ wrapper for the native C ODBC API. diff --git a/ports/nanodbc/portfile.cmake b/ports/nanodbc/portfile.cmake index ff90b4b19..7014c7eac 100644 --- a/ports/nanodbc/portfile.cmake +++ b/ports/nanodbc/portfile.cmake @@ -2,33 +2,16 @@ include(vcpkg_common_functions) # Only static libraries are supported. # See https://github.com/nanodbc/nanodbc/issues/13 -if(VCPKG_USE_HEAD_VERSION) # v2.13 - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) -else() # v2.12.4 - vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) -endif() - +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO nanodbc/nanodbc - REF v2.12.4 - SHA512 b9a924516b2a777e5f1497774997672320548722ed53413b0a7ad5d503e2f8ca1099f5059a912b7aae410928f4c4edcdfd02e4cfbf415976cd222697b354b4e6 + REF fe1d590991da30dc9cb71676c4d80cb2d9acb49e + SHA512 9c7e638b15b3c7ce418374c22a76be4f3f5901e7736938a8b0549b312bb7fa80bc8d34b2a52242a5b94196bb0994481a36e043a4f71cdc1d9af778915d017ac2 HEAD_REF master ) -# Legacy, remove at release of v2.13 -if(NOT VCPKG_USE_HEAD_VERSION) -vcpkg_apply_patches( - SOURCE_PATH ${SOURCE_PATH} - PATCHES - ${CMAKE_CURRENT_LIST_DIR}/0001_cmake.patch - ${CMAKE_CURRENT_LIST_DIR}/0002_msvc14_codecvt.patch - ${CMAKE_CURRENT_LIST_DIR}/0003_export_def.patch - ${CMAKE_CURRENT_LIST_DIR}/0004_unicode.patch -) -endif() -# /Legacy - vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} OPTIONS diff --git a/ports/sfgui/CONTROL b/ports/sfgui/CONTROL index 59a7cdab3..da3ee41a9 100644 --- a/ports/sfgui/CONTROL +++ b/ports/sfgui/CONTROL @@ -1,4 +1,4 @@ Source: sfgui -Version: 0.3.2-2 +Version: 0.4.0 Description: simple and fast graphical user interface library Build-Depends: sfml diff --git a/ports/sfgui/portfile.cmake b/ports/sfgui/portfile.cmake index 66ce7d830..16eeb5618 100644 --- a/ports/sfgui/portfile.cmake +++ b/ports/sfgui/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO TankOs/SFGUI - REF 0.3.2 - SHA512 cd97e421695f6189995c1b7a4180e3738bf785abae37d3eb51ac6d687a88a26a1f088863b37e065edaff6ba43eea379e423b31118324c4daa65dba0b3e904869 + REF 0.4.0 + SHA512 15456c6080b7095bcdcec08489b2b91b5cfc36cdf3c0b645b305072e7e835837eb4f95b59371ff176630b2b7ae51da475d8ea0bde5ff7fc0ba74c463bf5f54cf HEAD_REF master PATCHES "${CMAKE_CURRENT_LIST_DIR}/use-sfml-targets.patch" ) @@ -27,9 +27,6 @@ vcpkg_copy_pdbs() file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/sfgui RENAME copyright) -file(RENAME ${CURRENT_PACKAGES_DIR}/cmake/Modules/FindSFGUI.cmake ${CURRENT_PACKAGES_DIR}/share/sfgui/FindSFGUI.cmake) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/cmake/Modules) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/cmake) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/cmake) diff --git a/ports/sfml/CONTROL b/ports/sfml/CONTROL index 371300221..8fcda5bc1 100644 --- a/ports/sfml/CONTROL +++ b/ports/sfml/CONTROL @@ -1,4 +1,4 @@ Source: sfml -Version: 2.5.1 +Version: 2.5.1-1 Description: Simple and fast multimedia library Build-Depends: freetype, libflac, libogg, libvorbis, openal-soft, stb diff --git a/ports/sfml/portfile.cmake b/ports/sfml/portfile.cmake index 22ab3b8a3..a25c5628b 100644 --- a/ports/sfml/portfile.cmake +++ b/ports/sfml/portfile.cmake @@ -32,9 +32,9 @@ vcpkg_install_cmake() vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/SFML) vcpkg_copy_pdbs() -if(VCPKG_LIBRARY_LINKAGE STREQUAL static) +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") FILE(READ ${CURRENT_PACKAGES_DIR}/share/sfml/SFMLConfig.cmake SFML_CONFIG) - FILE(WRITE ${CURRENT_PACKAGES_DIR}/share/sfml/SFMLConfig.cmake "set(SFML_STATIC_LIBRARIES true)\n${SFML_CONFIG}") + FILE(WRITE ${CURRENT_PACKAGES_DIR}/share/sfml/SFMLConfig.cmake "set(SFML_STATIC_LIBRARIES true)\ninclude(CMakeFindDependencyMacro)\nfind_dependency(Freetype)\n${SFML_CONFIG}") endif() # move sfml-main to manual link dir