mirror of
https://github.com/microsoft/vcpkg.git
synced 2025-06-07 18:32:47 +08:00
[libiconv] Update to 1.17 (#25184)
* [libiconv] Update to 1.17 * [libiconv] License processing * Update versions * Adapt gettext uwp patch for libiconv * Update versions
This commit is contained in:
parent
86aed649b3
commit
60993b8ec5
@ -11,4 +11,17 @@ index 6dc011b..158ccdd 100644
|
|||||||
# ifdef mbstate_t
|
# ifdef mbstate_t
|
||||||
# define mbrtowc(pwc, s, n, ps) (mbrtowc)(pwc, s, n, 0)
|
# define mbrtowc(pwc, s, n, ps) (mbrtowc)(pwc, s, n, 0)
|
||||||
# define mbsinit(ps) 1
|
# define mbsinit(ps) 1
|
||||||
|
diff --git a/srclib/fcntl.c b/srclib/fcntl.c
|
||||||
|
index f9753c4..02fc8be 100644
|
||||||
|
--- a/srclib/fcntl.c
|
||||||
|
+++ b/srclib/fcntl.c
|
||||||
|
@@ -37,6 +37,9 @@
|
||||||
|
/* Get declarations of the native Windows API functions. */
|
||||||
|
# define WIN32_LEAN_AND_MEAN
|
||||||
|
# include <windows.h>
|
||||||
|
+#if defined(WINAPI_FAMILY) && (WINAPI_FAMILY == WINAPI_FAMILY_APP)
|
||||||
|
+#define HANDLE_FLAG_INHERIT 0
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
/* Get _get_osfhandle. */
|
||||||
|
# if GNULIB_MSVC_NOTHROW
|
||||||
|
@ -5,17 +5,17 @@ if(NOT VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_ANDROID)
|
|||||||
return()
|
return()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
set(LIBICONV_VERSION 1.16)
|
set(LIBICONV_VERSION 1.17)
|
||||||
|
|
||||||
vcpkg_download_distfile(ARCHIVE
|
vcpkg_download_distfile(ARCHIVE
|
||||||
URLS "https://ftp.gnu.org/gnu/libiconv/libiconv-${LIBICONV_VERSION}.tar.gz" "https://www.mirrorservice.org/sites/ftp.gnu.org/gnu/libiconv/libiconv-${LIBICONV_VERSION}.tar.gz"
|
URLS "https://ftp.gnu.org/gnu/libiconv/libiconv-${LIBICONV_VERSION}.tar.gz" "https://www.mirrorservice.org/sites/ftp.gnu.org/gnu/libiconv/libiconv-${LIBICONV_VERSION}.tar.gz"
|
||||||
FILENAME "libiconv-${LIBICONV_VERSION}.tar.gz"
|
FILENAME "libiconv-${LIBICONV_VERSION}.tar.gz"
|
||||||
SHA512 365dac0b34b4255a0066e8033a8b3db4bdb94b9b57a9dca17ebf2d779139fe935caf51a465d17fd8ae229ec4b926f3f7025264f37243432075e5583925bb77b7
|
SHA512 18a09de2d026da4f2d8b858517b0f26d853b21179cf4fa9a41070b2d140030ad9525637dc4f34fc7f27abca8acdc84c6751dfb1d426e78bf92af4040603ced86
|
||||||
)
|
)
|
||||||
vcpkg_extract_source_archive_ex(
|
vcpkg_extract_source_archive_ex(
|
||||||
OUT_SOURCE_PATH SOURCE_PATH
|
OUT_SOURCE_PATH SOURCE_PATH
|
||||||
ARCHIVE ${ARCHIVE}
|
ARCHIVE "${ARCHIVE}"
|
||||||
REF ${LIBICONV_VERSION}
|
REF "${LIBICONV_VERSION}"
|
||||||
PATCHES
|
PATCHES
|
||||||
0002-Config-for-MSVC.patch
|
0002-Config-for-MSVC.patch
|
||||||
0003-Add-export.patch
|
0003-Add-export.patch
|
||||||
@ -50,4 +50,19 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/${PORT}") # share contains un
|
|||||||
|
|
||||||
# Please keep, the default usage is broken
|
# Please keep, the default usage is broken
|
||||||
file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
|
file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
|
||||||
file(INSTALL "${SOURCE_PATH}/COPYING.LIB" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
file(READ "${SOURCE_PATH}/COPYING.LIB" copying_lib)
|
||||||
|
file(READ "${SOURCE_PATH}/COPYING" copying_tool)
|
||||||
|
file(WRITE "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" "
|
||||||
|
The libiconv and libcharset libraries and their header files are under LGPL,
|
||||||
|
see COPYING.LIB below.
|
||||||
|
|
||||||
|
The iconv program and the documentation are under GPL, see COPYING below.
|
||||||
|
|
||||||
|
# COPYING.LIB
|
||||||
|
|
||||||
|
${copying_lib}
|
||||||
|
|
||||||
|
# COPYING
|
||||||
|
|
||||||
|
${copying_tool}
|
||||||
|
")
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "libiconv",
|
"name": "libiconv",
|
||||||
"version": "1.16",
|
"version": "1.17",
|
||||||
"port-version": 13,
|
|
||||||
"description": "GNU Unicode text conversion",
|
"description": "GNU Unicode text conversion",
|
||||||
"homepage": "https://www.gnu.org/software/libiconv/"
|
"homepage": "https://www.gnu.org/software/libiconv/",
|
||||||
|
"license": null
|
||||||
}
|
}
|
||||||
|
@ -3689,8 +3689,8 @@
|
|||||||
"port-version": 1
|
"port-version": 1
|
||||||
},
|
},
|
||||||
"libiconv": {
|
"libiconv": {
|
||||||
"baseline": "1.16",
|
"baseline": "1.17",
|
||||||
"port-version": 13
|
"port-version": 0
|
||||||
},
|
},
|
||||||
"libics": {
|
"libics": {
|
||||||
"baseline": "1.6.5",
|
"baseline": "1.6.5",
|
||||||
|
@ -1,5 +1,10 @@
|
|||||||
{
|
{
|
||||||
"versions": [
|
"versions": [
|
||||||
|
{
|
||||||
|
"git-tree": "1f92b7d29ce3243d3d51e07686869eca63ece88a",
|
||||||
|
"version": "1.17",
|
||||||
|
"port-version": 0
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"git-tree": "cc4f1edf5a444934d4a757420a6cd3fed596e1d5",
|
"git-tree": "cc4f1edf5a444934d4a757420a6cd3fed596e1d5",
|
||||||
"version": "1.16",
|
"version": "1.16",
|
||||||
|
Loading…
Reference in New Issue
Block a user