From f6672d8e480ccdecddfad3fd1b838ba369ffe6cd Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Fri, 5 Jun 2026 11:21:40 +0200 Subject: [PATCH] [libiconv] Update to 1.19 (#52172) --- ports/libiconv/portfile.cmake | 8 +++----- ports/libiconv/vcpkg.json | 7 +++++-- versions/baseline.json | 4 ++-- versions/l-/libiconv.json | 5 +++++ 4 files changed, 15 insertions(+), 9 deletions(-) diff --git a/ports/libiconv/portfile.cmake b/ports/libiconv/portfile.cmake index 665344b74f..90475a7e21 100644 --- a/ports/libiconv/portfile.cmake +++ b/ports/libiconv/portfile.cmake @@ -24,7 +24,7 @@ vcpkg_download_distfile(ARCHIVE "https://ftp.gnu.org/gnu/libiconv/libiconv-${VERSION}.tar.gz" "https://www.mirrorservice.org/sites/ftp.gnu.org/gnu/libiconv/libiconv-${VERSION}.tar.gz" FILENAME "libiconv-${VERSION}.tar.gz" - SHA512 a55eb3b7b785a78ab8918db8af541c9e11deb5ff4f89d54483287711ed797d87848ce0eafffa7ce26d9a7adb4b5a9891cb484f94bd4f51d3ce97a6a47b4c719a + SHA512 1e8150f9bca907579330cd9c44ebbee46a260271fbe8f50d5ee24a39ef29c8d254505e85c3409324f7440596da711a8bd49e89f848a6be0cb3238a58c24aaecd ) vcpkg_extract_source_archive(SOURCE_PATH ARCHIVE "${ARCHIVE}" @@ -40,17 +40,15 @@ if (NOT VCPKG_TARGET_IS_ANDROID) vcpkg_list(APPEND OPTIONS --enable-relocatable) endif() -vcpkg_configure_make( +vcpkg_make_configure( SOURCE_PATH "${SOURCE_PATH}" - DETERMINE_BUILD_TRIPLET - USE_WRAPPERS OPTIONS --enable-extra-encodings --without-libiconv-prefix --without-libintl-prefix ${OPTIONS} ) -vcpkg_install_make() +vcpkg_make_install() vcpkg_copy_pdbs() vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin") diff --git a/ports/libiconv/vcpkg.json b/ports/libiconv/vcpkg.json index 761257b8a7..700d3cda01 100644 --- a/ports/libiconv/vcpkg.json +++ b/ports/libiconv/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libiconv", - "version": "1.18", - "port-version": 4, + "version": "1.19", "description": [ "iconv() text conversion.", "This port installs GNU libiconv if the system C runtime doesn't provide a suitable iconv() implementation." @@ -13,6 +12,10 @@ "name": "vcpkg-cmake-get-vars", "host": true, "platform": "android" + }, + { + "name": "vcpkg-make", + "host": true } ] } diff --git a/versions/baseline.json b/versions/baseline.json index 6e494ce583..1a64e02b64 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5133,8 +5133,8 @@ "port-version": 2 }, "libiconv": { - "baseline": "1.18", - "port-version": 4 + "baseline": "1.19", + "port-version": 0 }, "libics": { "baseline": "1.7.0", diff --git a/versions/l-/libiconv.json b/versions/l-/libiconv.json index 15f9effca3..aee8506e1c 100644 --- a/versions/l-/libiconv.json +++ b/versions/l-/libiconv.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "eb4c96e3d66cfba5f75a09bc1c34fa628a822ca4", + "version": "1.19", + "port-version": 0 + }, { "git-tree": "dca28e93ad5a661156d8ea85aa4d26328dc309ed", "version": "1.18",