diff options
| author | Victor Romero <romerosanchezv@gmail.com> | 2019-01-11 11:57:43 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-11 11:57:43 -0800 |
| commit | 1134de5eacf2052a936a943acea7f08ba06462d7 (patch) | |
| tree | 7835b4bd10498dc4f601770bebfd079d8cd62cff | |
| parent | 85c863ed252a43c59c21a7b3ef65d53c0ac3529e (diff) | |
| parent | bd547e5e39c775a0c3332559e015441d62ff2aa4 (diff) | |
| download | vcpkg-1134de5eacf2052a936a943acea7f08ba06462d7.tar.gz vcpkg-1134de5eacf2052a936a943acea7f08ba06462d7.zip | |
Merge pull request #5058 from lazyhamster/libidn2-update
[libidn2 ] Update to version 2.0.5.
| -rw-r--r-- | ports/libidn2/CONTROL | 2 | ||||
| -rw-r--r-- | ports/libidn2/config.h | 6 | ||||
| -rw-r--r-- | ports/libidn2/portfile.cmake | 16 |
3 files changed, 14 insertions, 10 deletions
diff --git a/ports/libidn2/CONTROL b/ports/libidn2/CONTROL index 46e81c7bf..2fc289034 100644 --- a/ports/libidn2/CONTROL +++ b/ports/libidn2/CONTROL @@ -1,4 +1,4 @@ Source: libidn2 -Version: 2.0.4 +Version: 2.0.5-1 Build-Depends: libiconv Description: GNU Libidn is an implementation of the Stringprep, Punycode and IDNA 2003 specifications. Libidn's purpose is to encode and decode internationalized domain names. diff --git a/ports/libidn2/config.h b/ports/libidn2/config.h index 9e61bc8f2..5d5e6efcc 100644 --- a/ports/libidn2/config.h +++ b/ports/libidn2/config.h @@ -670,7 +670,7 @@ /* #undef PACKAGE_PACKAGER_VERSION */ /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "libidn2 2.0.4" +#define PACKAGE_STRING "libidn2 @IDN2_VERSION@" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "libidn2" @@ -679,7 +679,7 @@ #define PACKAGE_URL "https://www.gnu.org/software/libidn/#libidn2" /* Define to the version of this package. */ -#define PACKAGE_VERSION "2.0.4" +#define PACKAGE_VERSION "@IDN2_VERSION@" /* Define to l, ll, u, ul, ull, etc., as suitable for constants of type 'ptrdiff_t'. */ @@ -771,7 +771,7 @@ /* Version number of package */ -#define VERSION "2.0.4" +#define VERSION "@IDN2_VERSION@" /* Define to l, ll, u, ul, ull, etc., as suitable for constants of type 'wchar_t'. */ diff --git a/ports/libidn2/portfile.cmake b/ports/libidn2/portfile.cmake index 98892e2c0..85cc9e6ce 100644 --- a/ports/libidn2/portfile.cmake +++ b/ports/libidn2/portfile.cmake @@ -1,21 +1,25 @@ include(vcpkg_common_functions) -set(IDN2_VERSION 2.0.4) +set(IDN2_VERSION 2.0.5) set(IDN2_FILENAME libidn2-${IDN2_VERSION}.tar.gz) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/libidn2-${IDN2_VERSION}) vcpkg_download_distfile(ARCHIVE URLS "http://ftp.gnu.org/gnu/libidn/${IDN2_FILENAME}" FILENAME "${IDN2_FILENAME}" - SHA512 1e51bd4b8f8907531576291f1c2a8865d17429b4105418b4c98754eb982cd1cbb3adbeab4ec0c1c561d2dba11d876c7c09e5dc5b315c55a2c24986d7a2a3b4d2 + SHA512 9d040d60de40316788825d8720d509d5b8a82287415e09e17792c2f32fad99ca77f43e55888b9484db69426eaa0ece59e9671eee9cc46411afbdb0f81af31a79 ) -vcpkg_extract_source_archive(${ARCHIVE}) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + REF ${IDN2_VERSION} +) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/config.h DESTINATION ${SOURCE_PATH}) +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) file(COPY ${CMAKE_CURRENT_LIST_DIR}/string.h DESTINATION ${SOURCE_PATH}/gl) +configure_file(${CMAKE_CURRENT_LIST_DIR}/config.h ${SOURCE_PATH}) + function(simple_copy_template_header FILE_PATH BASE_NAME) if(NOT EXISTS ${FILE_PATH}/${BASE_NAME}.h) if(EXISTS ${FILE_PATH}/${BASE_NAME}.in.h) |