diff options
| author | NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> | 2020-09-28 08:41:42 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-27 17:41:42 -0700 |
| commit | dcc7ddcd5c79efc3b2386ac9abdafa83219eb773 (patch) | |
| tree | 849ca2cd124528e8784497fbcee418a4f4daacc2 /ports/nana | |
| parent | 7a05bde0a6872709333cfdff71ff6eedb0f89963 (diff) | |
| download | vcpkg-dcc7ddcd5c79efc3b2386ac9abdafa83219eb773.tar.gz vcpkg-dcc7ddcd5c79efc3b2386ac9abdafa83219eb773.zip | |
[mbedtls/nana] Update to the latest version (#13672)
* [mbedtls/nana] Update to the latest version
* [nana] Remove unused patch and update patch EOF
Diffstat (limited to 'ports/nana')
| -rw-r--r-- | ports/nana/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | ports/nana/CONTROL | 3 | ||||
| -rw-r--r-- | ports/nana/fix-addstdexcept.patch | 12 | ||||
| -rw-r--r-- | ports/nana/fix-build-error.patch | 23 | ||||
| -rw-r--r-- | ports/nana/portfile.cmake | 9 |
5 files changed, 18 insertions, 31 deletions
diff --git a/ports/nana/CMakeLists.txt b/ports/nana/CMakeLists.txt index eca50614d..036d5bc8f 100644 --- a/ports/nana/CMakeLists.txt +++ b/ports/nana/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR) -project(nana VERSION 1.7.2 LANGUAGES CXX) +project(nana VERSION 1.7.4 LANGUAGES CXX) option(NANA_ENABLE_PNG "Enable PNG support" OFF) option(NANA_ENABLE_JPEG "Enable JPEG support" OFF) diff --git a/ports/nana/CONTROL b/ports/nana/CONTROL index d6c949498..65e75a832 100644 --- a/ports/nana/CONTROL +++ b/ports/nana/CONTROL @@ -1,6 +1,5 @@ Source: nana -Version: 1.7.2 -Port-Version: 4 +Version: 1.7.4 Homepage: https://github.com/cnjinhao/nana Description: Cross-platform library for GUI programming in modern C++ style. Build-Depends: libpng, libjpeg-turbo, freetype (!uwp&&!windows), fontconfig (!uwp&&!windows) diff --git a/ports/nana/fix-addstdexcept.patch b/ports/nana/fix-addstdexcept.patch deleted file mode 100644 index 3b8773f5f..000000000 --- a/ports/nana/fix-addstdexcept.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/source/datetime.cpp b/source/datetime.cpp -index e6e8fa5..c3ae852 100644 ---- a/source/datetime.cpp -+++ b/source/datetime.cpp -@@ -15,6 +15,7 @@ - #include <windows.h> - #endif - #include <array> -+#include <stdexcept> - - namespace { - std::tm localtime() diff --git a/ports/nana/fix-build-error.patch b/ports/nana/fix-build-error.patch index 3894f9600..d007143dc 100644 --- a/ports/nana/fix-build-error.patch +++ b/ports/nana/fix-build-error.patch @@ -1,12 +1,13 @@ -diff --git a/include/nana/filesystem/filesystem.hpp b/include/nana/filesystem/filesystem.hpp -index 86b907a..ea8db75 100644 ---- a/include/nana/filesystem/filesystem.hpp -+++ b/include/nana/filesystem/filesystem.hpp -@@ -30,6 +30,7 @@ - #ifndef NANA_FILESYSTEM_HPP - #define NANA_FILESYSTEM_HPP - #include <nana/push_ignore_diagnostic> -+#define _SILENCE_EXPERIMENTAL_FILESYSTEM_DEPRECATION_WARNING +diff --git a/source/system/split_string.cpp b/source/system/split_string.cpp +index 8269db6..c40016b 100644 +--- a/source/system/split_string.cpp ++++ b/source/system/split_string.cpp +@@ -18,7 +18,7 @@ std::vector<split_string_type> split_string (const split_string_type& text, char + sep_pos = text.find(sep, sep_pos); + sep_pos = (text.npos == sep_pos ? text.size() : sep_pos); + const std::size_t end = sep_pos; +- while (sep_pos < text.size() and sep == text[sep_pos]) { ++ while (sep_pos < text.size() && sep == text[sep_pos]) { + ++sep_pos; + } - //Filesystem Selection - #include <nana/config.hpp> diff --git a/ports/nana/portfile.cmake b/ports/nana/portfile.cmake index 7c1693c92..8aa0cbe26 100644 --- a/ports/nana/portfile.cmake +++ b/ports/nana/portfile.cmake @@ -1,18 +1,17 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
-if(VCPKG_CMAKE_SYSTEM_NAME AND NOT VCPKG_TARGET_IS_UWP)
+if(NOT VCPKG_TARGET_IS_WINDOWS)
message(WARNING "You will need to install Xorg dependencies to use nana:\napt install libx11-dev libxft-dev libxcursor-dev\n")
endif()
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO cnjinhao/nana
- REF 38cdf4779456ba697d7da863f7c623e25d30f650 # v1.7.2 - SHA512 0ad15984ce6ef94b4f92b2a87649c0e247850a602a8f48645fd882ed5dddd047a168c319c741b2783218ce467f8d0ac790010717cffc54cb1716b105ec042798
+ REF 554c4fe87fc31b8ee104228e9117d545d34855b5 # v1.7.4 + SHA512 d9db8ea1bd47fe663b8e2443a1a3e279760dbd11ef6bc78d9dc8f6fd12f9736b8c8315dfc84d21325e02ad6b2dc3a429593ac80e7610097ddc7253668c383178
HEAD_REF develop
PATCHES
fix-build-error.patch
- fix-addstdexcept.patch
)
file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
@@ -33,4 +32,4 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-nana TARGET_PATH share/un vcpkg_copy_pdbs()
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
\ No newline at end of file |