[readline-unix] Update to 8.3 (#46303)

This commit is contained in:
Kai Pastor 2025-07-07 20:03:06 +02:00 committed by GitHub
parent 8d2ad1ad84
commit 761e44dfa7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 18 additions and 39 deletions

View File

@ -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

View File

@ -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")

View File

@ -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
}
]
}

View File

@ -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",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "89a451cc17912d991349b6fb5efdaa3be65e8c08",
"version": "8.3",
"port-version": 0
},
{
"git-tree": "4ad0f063e0bf86f7bfbf455e7a1f7f16883528f0",
"version": "8.2",