mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-26 17:41:09 +08:00
[gettext*] Update 0.22.5, fix Intl wrapper (#37356)
This commit is contained in:
parent
9d92a718ee
commit
1fb47d326d
@ -16,7 +16,7 @@ vcpkg_download_distfile(ARCHIVE
|
||||
URLS "https://ftp.gnu.org/pub/gnu/gettext/gettext-${VERSION}.tar.gz"
|
||||
"https://www.mirrorservice.org/sites/ftp.gnu.org/gnu/gettext/gettext-${VERSION}.tar.gz"
|
||||
FILENAME "gettext-${VERSION}.tar.gz"
|
||||
SHA512 ad2fa2f69be996a637e9b51e8941a39e10050060245dcec1fe75c15b68d0ff973043c87b77e4e2830e407e3bdd040b578f8e24fd05bba43adb94eaee34001aa5
|
||||
SHA512 d8b22d7fba10052a2045f477f0a5b684d932513bdb3b295c22fbd9dfc2a9d8fccd9aefd90692136c62897149aa2f7d1145ce6618aa1f0be787cb88eba5bc09be
|
||||
)
|
||||
|
||||
vcpkg_extract_source_archive(SOURCE_PATH
|
||||
|
@ -10,5 +10,8 @@ if(Intl_FOUND AND Intl_LIBRARIES)
|
||||
find_package(Iconv) # Since CMake 3.11
|
||||
if(Iconv_FOUND AND NOT Iconv_IS_BUILT_IN)
|
||||
list(APPEND Intl_LIBRARIES ${Iconv_LIBRARIES})
|
||||
if(TARGET Intl::Intl) # Since CMake 3.20
|
||||
set_property(TARGET Intl::Intl APPEND PROPERTY INTERFACE_LINK_LIBRARIES $<LINK_ONLY:Iconv::Iconv>)
|
||||
endif()
|
||||
endif()
|
||||
endif()
|
||||
|
@ -1,7 +1,6 @@
|
||||
{
|
||||
"name": "gettext-libintl",
|
||||
"version": "0.22.4",
|
||||
"port-version": 1,
|
||||
"version": "0.22.5",
|
||||
"description": "The libintl C library from GNU gettext-runtime.",
|
||||
"homepage": "https://www.gnu.org/software/gettext/",
|
||||
"license": "LGPL-2.1-or-later",
|
||||
|
@ -26,7 +26,7 @@ function(install_autopoint)
|
||||
configure_file("${SOURCE_PATH}/gettext-tools/misc/autopoint.in" "${WORKING_DIR}/autopoint" @ONLY)
|
||||
|
||||
# data tarball
|
||||
if(WIN32)
|
||||
if(CMAKE_HOST_WIN32)
|
||||
vcpkg_acquire_msys(MSYS_ROOT PACKAGES gzip)
|
||||
vcpkg_add_to_path("${MSYS_ROOT}/usr/bin")
|
||||
endif()
|
||||
|
@ -16,7 +16,7 @@ vcpkg_download_distfile(ARCHIVE
|
||||
URLS "https://ftp.gnu.org/pub/gnu/gettext/gettext-${VERSION}.tar.gz"
|
||||
"https://www.mirrorservice.org/sites/ftp.gnu.org/gnu/gettext/gettext-${VERSION}.tar.gz"
|
||||
FILENAME "gettext-${VERSION}.tar.gz"
|
||||
SHA512 ad2fa2f69be996a637e9b51e8941a39e10050060245dcec1fe75c15b68d0ff973043c87b77e4e2830e407e3bdd040b578f8e24fd05bba43adb94eaee34001aa5
|
||||
SHA512 d8b22d7fba10052a2045f477f0a5b684d932513bdb3b295c22fbd9dfc2a9d8fccd9aefd90692136c62897149aa2f7d1145ce6618aa1f0be787cb88eba5bc09be
|
||||
)
|
||||
|
||||
vcpkg_extract_source_archive(SOURCE_PATH
|
||||
|
@ -38,10 +38,10 @@ index ec75427..9e063e4 100644
|
||||
# elif defined WINDOWS_NATIVE
|
||||
|
||||
char buf[2 + 10 + 1];
|
||||
diff --git a/gettext-runtime/gnulib-lib/localename.c b/gettext-runtime/gnulib-lib/localename.c
|
||||
diff --git a/gettext-runtime/gnulib-lib/localename-unsafe.c b/gettext-runtime/gnulib-lib/localename-unsafe.c
|
||||
index d77bb81..3c6e055 100644
|
||||
--- a/gettext-runtime/gnulib-lib/localename.c
|
||||
+++ b/gettext-runtime/gnulib-lib/localename.c
|
||||
--- a/gettext-runtime/gnulib-lib/localename-unsafe.c
|
||||
+++ b/gettext-runtime/gnulib-lib/localename-unsafe.c
|
||||
@@ -69,6 +69,11 @@ extern char * getlocalename_l(int, locale_t);
|
||||
|
||||
#if defined _WIN32 && !defined __CYGWIN__
|
||||
|
@ -1,7 +1,6 @@
|
||||
{
|
||||
"name": "gettext",
|
||||
"version": "0.22.4",
|
||||
"port-version": 2,
|
||||
"version": "0.22.5",
|
||||
"description": "A GNU framework to help produce multi-lingual messages.",
|
||||
"homepage": "https://www.gnu.org/software/gettext/",
|
||||
"license": "GPL-3.0-only",
|
||||
|
@ -2973,12 +2973,12 @@
|
||||
"port-version": 0
|
||||
},
|
||||
"gettext": {
|
||||
"baseline": "0.22.4",
|
||||
"port-version": 2
|
||||
"baseline": "0.22.5",
|
||||
"port-version": 0
|
||||
},
|
||||
"gettext-libintl": {
|
||||
"baseline": "0.22.4",
|
||||
"port-version": 1
|
||||
"baseline": "0.22.5",
|
||||
"port-version": 0
|
||||
},
|
||||
"gettimeofday": {
|
||||
"baseline": "2017-10-14",
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "8a3f80e31783a834e0fdc9d231136651cb2f08b4",
|
||||
"version": "0.22.5",
|
||||
"port-version": 0
|
||||
},
|
||||
{
|
||||
"git-tree": "b81c3757a4f5b2eb78c45e29d51803e5a3418fdb",
|
||||
"version": "0.22.4",
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "a9e016b098d97663485848b70db782306ecde601",
|
||||
"version": "0.22.5",
|
||||
"port-version": 0
|
||||
},
|
||||
{
|
||||
"git-tree": "d9cc9b8256d9653fe2d484ecf268f7368666d942",
|
||||
"version": "0.22.4",
|
||||
|
Loading…
x
Reference in New Issue
Block a user