From 761e44dfa7aa26eb4608e0fa6a0fc2e459e18ca7 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Mon, 7 Jul 2025 20:03:06 +0200 Subject: [PATCH] [readline-unix] Update to 8.3 (#46303) --- ports/readline-unix/8.2p1.diff | 24 ------------------------ ports/readline-unix/portfile.cmake | 15 +++++---------- ports/readline-unix/vcpkg.json | 9 ++++++--- versions/baseline.json | 4 ++-- versions/r-/readline-unix.json | 5 +++++ 5 files changed, 18 insertions(+), 39 deletions(-) delete mode 100644 ports/readline-unix/8.2p1.diff diff --git a/ports/readline-unix/8.2p1.diff b/ports/readline-unix/8.2p1.diff deleted file mode 100644 index 0cb8c9c5d9..0000000000 --- a/ports/readline-unix/8.2p1.diff +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/nls.c b/nls.c -index 5c6a13b..8c027d6 100644 ---- a/nls.c -+++ b/nls.c -@@ -141,6 +141,10 @@ _rl_init_locale (void) - if (lspec == 0) - lspec = ""; - ret = setlocale (LC_CTYPE, lspec); /* ok, since it does not change locale */ -+ if (ret == 0 || *ret == 0) -+ ret = setlocale (LC_CTYPE, (char *)NULL); -+ if (ret == 0 || *ret == 0) -+ ret = RL_DEFAULT_LOCALE; - #else - ret = (lspec == 0 || *lspec == 0) ? RL_DEFAULT_LOCALE : lspec; - #endif -diff --git a/patchlevel b/patchlevel -index d8c9df7..fdf4740 100644 ---- a/patchlevel -+++ b/patchlevel -@@ -1,3 +1,3 @@ - # Do not edit -- exists only for use by patch - --0 -+1 diff --git a/ports/readline-unix/portfile.cmake b/ports/readline-unix/portfile.cmake index aca06be6ac..d3de025fc4 100644 --- a/ports/readline-unix/portfile.cmake +++ b/ports/readline-unix/portfile.cmake @@ -5,30 +5,25 @@ vcpkg_download_distfile( "https://ftpmirror.gnu.org/gnu/readline/${filename}" "https://ftp.gnu.org/gnu/readline/${filename}" FILENAME "${filename}" - SHA512 0a451d459146bfdeecc9cdd94bda6a6416d3e93abd80885a40b334312f16eb890f8618a27ca26868cebbddf1224983e631b1cbc002c1a4d1cd0d65fba9fea49a + SHA512 513002753dcf5db9213dbbb61d51217245f6a40d33b1dd45238e8062dfa8eef0c890b87a5548e11db959e842724fb572c4d3d7fb433773762a63c30efe808344 ) vcpkg_extract_source_archive(SOURCE_PATH ARCHIVE "${ARCHIVE}" - PATCHES - 8.2p1.diff ) -vcpkg_configure_make( +vcpkg_make_configure( SOURCE_PATH "${SOURCE_PATH}" - DETERMINE_BUILD_TRIPLET OPTIONS --with-curses=yes --disable-install-examples ) - -vcpkg_install_make() +vcpkg_make_install() +vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share" "${CURRENT_PACKAGES_DIR}/tools" ) -vcpkg_fixup_pkgconfig() - -file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") diff --git a/ports/readline-unix/vcpkg.json b/ports/readline-unix/vcpkg.json index ffdc931d87..1d31cec95c 100644 --- a/ports/readline-unix/vcpkg.json +++ b/ports/readline-unix/vcpkg.json @@ -1,12 +1,15 @@ { "name": "readline-unix", - "version": "8.2", - "port-version": 1, + "version": "8.3", "description": "The GNU Readline library provides a set of functions for use by applications that allow users to edit command lines as they are typed in.", "homepage": "https://tiswww.case.edu/php/chet/readline/rltop.html", "license": "GPL-3.0-or-later", "supports": "!windows", "dependencies": [ - "ncurses" + "ncurses", + { + "name": "vcpkg-make", + "host": true + } ] } diff --git a/versions/baseline.json b/versions/baseline.json index f529292ebd..1ccc9f46cb 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8209,8 +8209,8 @@ "port-version": 5 }, "readline-unix": { - "baseline": "8.2", - "port-version": 1 + "baseline": "8.3", + "port-version": 0 }, "readline-win32": { "baseline": "5.0", diff --git a/versions/r-/readline-unix.json b/versions/r-/readline-unix.json index 5c2834dce9..a5722a9473 100644 --- a/versions/r-/readline-unix.json +++ b/versions/r-/readline-unix.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "89a451cc17912d991349b6fb5efdaa3be65e8c08", + "version": "8.3", + "port-version": 0 + }, { "git-tree": "4ad0f063e0bf86f7bfbf455e7a1f7f16883528f0", "version": "8.2",