From 06ee65415e0bcd776b67063447b962ba8079ec97 Mon Sep 17 00:00:00 2001 From: Christian Clason Date: Sun, 30 Aug 2026 11:06:54 +0200 Subject: [PATCH] build(deps): bump libiconv to v1.18 --- MAINTAIN.md | 1 + cmake.deps/cmake/LibiconvCMakeLists.txt | 5 +++++ cmake.deps/deps.txt | 4 ++-- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/MAINTAIN.md b/MAINTAIN.md index 146090c8f9..504af83b65 100644 --- a/MAINTAIN.md +++ b/MAINTAIN.md @@ -134,6 +134,7 @@ Some can be auto-bumped by `scripts/bump_deps.lua`. - [our bundled documentation](https://github.com/neovim/neovim/blob/master/runtime/doc/luvref.txt) with [the upstream documentation](https://github.com/luvit/luv/blob/master/docs/docs.md). * [gettext](https://ftp.gnu.org/pub/gnu/gettext/) * [libiconv](https://ftp.gnu.org/pub/gnu/libiconv) + * Requires a PR to update the [Zig package](https://github.com/allyourcodebase/libiconv) first. * [lua-compat](https://github.com/keplerproject/lua-compat-5.3) * [tree-sitter](https://github.com/tree-sitter/tree-sitter) * [treesitter parsers](https://github.com/neovim/neovim/blob/7e97c773e3ba78fcddbb2a0b9b0d572c8210c83e/cmake.deps/deps.txt#L47-L62) diff --git a/cmake.deps/cmake/LibiconvCMakeLists.txt b/cmake.deps/cmake/LibiconvCMakeLists.txt index 9181314883..a67686d18d 100644 --- a/cmake.deps/cmake/LibiconvCMakeLists.txt +++ b/cmake.deps/cmake/LibiconvCMakeLists.txt @@ -21,10 +21,15 @@ string(REPLACE "#undef HAVE_WORKING_O_NOFOLLOW" "#define HAVE_WORKING_O_NOFOLLOW string(REPLACE "#undef ICONV_CONST" "#define ICONV_CONST const" CONFIG_CONTENT "${CONFIG_CONTENT}") string(REPLACE "#undef WORDS_LITTLEENDIAN" "#define WORDS_LITTLEENDIAN 1" CONFIG_CONTENT "${CONFIG_CONTENT}") string(REPLACE "#undef HAVE_DECL_STRERROR_R" "#define HAVE_DECL_STRERROR_R 0" CONFIG_CONTENT "${CONFIG_CONTENT}") +string(REPLACE "#undef HAVE_STDBOOL_H" "#define HAVE_STDBOOL_H 1" CONFIG_CONTENT "${CONFIG_CONTENT}") string(REPLACE "#undef mode_t" "#define mode_t int" CONFIG_CONTENT "${CONFIG_CONTENT}") string(REPLACE "#undef ssize_t" "#include \n#define ssize_t SSIZE_T" CONFIG_CONTENT "${CONFIG_CONTENT}") file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/config.h" "${CONFIG_CONTENT}") +# Gnulib replacement headers require config.h first, but lib/iconv.c includes +# system headers before it. +add_compile_options("/FI${CMAKE_CURRENT_BINARY_DIR}/config.h") + set(BROKEN_WCHAR_H 0) set(HAVE_VISIBILITY 0) set(HAVE_WCHAR_T 1) diff --git a/cmake.deps/deps.txt b/cmake.deps/deps.txt index c39f39588b..3747ebb75e 100644 --- a/cmake.deps/deps.txt +++ b/cmake.deps/deps.txt @@ -23,8 +23,8 @@ WIN32YANK_X86_64_SHA256 247c9a05b94387a884b49d3db13f806b1677dfc38020f955f719be69 GETTEXT_URL https://ftp.gnu.org/pub/gnu/gettext/gettext-0.20.1.tar.gz GETTEXT_SHA256 66415634c6e8c3fa8b71362879ec7575e27da43da562c798a8a2f223e6e47f5c -LIBICONV_URL https://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.17.tar.gz -LIBICONV_SHA256 8f74213b56238c85a50a5329f77e06198771e70dd9a739779f4c02f65d971313 +LIBICONV_URL https://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.18.tar.gz +LIBICONV_SHA256 3b08f5f4f9b4eb82f151a7040bfd6fe6c6fb922efe4b1659c66ea933276965e8 # NOTE: Also update the find_package() call if bumping the minimum. UTF8PROC_URL https://github.com/juliastrings/utf8proc/archive/v2.11.3.tar.gz