Tobias Powalowski pushed to branch main at Arch Linux / Packaging / Packages / readline
Commits: d6b91655 by Tobias Powalowski at 2025-06-02T17:27:26+02:00 upgpkg: 8.2.013-2: fix https://github.com/bluez/bluez/issues/1240 - - - - - 3 changed files: - .SRCINFO - PKGBUILD - + readline-8.2-c23.patch Changes: ===================================== .SRCINFO ===================================== @@ -1,19 +1,20 @@ pkgbase = readline pkgdesc = GNU readline library pkgver = 8.2.013 - pkgrel = 1 + pkgrel = 2 url = https://tiswww.case.edu/php/chet/readline/rltop.html arch = x86_64 license = GPL-3.0-or-later depends = glibc - depends = ncurses depends = libncursesw.so + depends = ncurses provides = libhistory.so provides = libreadline.so options = !emptydirs backup = etc/inputrc source = https://ftp.gnu.org/gnu/readline/readline-8.2.tar.gz source = https://ftp.gnu.org/gnu/readline/readline-8.2.tar.gz.sig + source = readline-8.2-c23.patch source = inputrc source = https://ftp.gnu.org/gnu/readline/readline-8.2-patches/readline82-001 source = https://ftp.gnu.org/gnu/readline/readline-8.2-patches/readline82-001.sig @@ -44,6 +45,7 @@ pkgbase = readline validpgpkeys = 7C0135FB088AAF6C66C650B9BB5869F064EA74AB b2sums = 7974322b9c092a756a79e537df08e8532f8e0fcb598f77732e28287c33ebec9e9837ed88b43334c310892d56a871b423903f0f564def2fbe700a1004f2ae7b18 b2sums = SKIP + b2sums = f7053bf7bb1453ae48c7dede08aef016432b0233fcd4380f41ad16851971b5874c65d04be17197978988e785da2559eba8e10a8388ab01e33cb8a53fad126e4c b2sums = 50db43bff430f282175aba4c4259e0b2222bc7e342fbe47b9dcce0172458472e72aebb9852eeafa4d10d4e89f2e1e8bb83b6b5dfc68eeababe699d4b5eae80f7 b2sums = 2e8f3d2aa14c4c4c4f9621f80f4ffae9bbd6f46c3561e87aaf684c759ffd82e3c46843cf4c4224533b28a847d83f7b8b254813f8a306d438e9f7cb457516c4e0 b2sums = SKIP ===================================== PKGBUILD ===================================== @@ -7,19 +7,30 @@ pkgname=readline _basever=8.2 _patchlevel=013 pkgver=${_basever}.${_patchlevel} -pkgrel=1 +pkgrel=2 pkgdesc='GNU readline library' arch=('x86_64') url='https://tiswww.case.edu/php/chet/readline/rltop.html' license=('GPL-3.0-or-later') backup=('etc/inputrc') -depends=('glibc' 'ncurses' 'libncursesw.so') -provides=('libhistory.so' 'libreadline.so') +depends=( + glibc + libncursesw.so + ncurses +) +provides=( + libhistory.so + libreadline.so +) options=('!emptydirs') -source=(https://ftp.gnu.org/gnu/readline/readline-$_basever.tar.gz{,.sig} - inputrc) +source=( + https://ftp.gnu.org/gnu/readline/readline-$_basever.tar.gz{,.sig} + readline-8.2-c23.patch + inputrc + ) b2sums=('7974322b9c092a756a79e537df08e8532f8e0fcb598f77732e28287c33ebec9e9837ed88b43334c310892d56a871b423903f0f564def2fbe700a1004f2ae7b18' 'SKIP' + 'f7053bf7bb1453ae48c7dede08aef016432b0233fcd4380f41ad16851971b5874c65d04be17197978988e785da2559eba8e10a8388ab01e33cb8a53fad126e4c' '50db43bff430f282175aba4c4259e0b2222bc7e342fbe47b9dcce0172458472e72aebb9852eeafa4d10d4e89f2e1e8bb83b6b5dfc68eeababe699d4b5eae80f7' '2e8f3d2aa14c4c4c4f9621f80f4ffae9bbd6f46c3561e87aaf684c759ffd82e3c46843cf4c4224533b28a847d83f7b8b254813f8a306d438e9f7cb457516c4e0' 'SKIP' @@ -64,6 +75,12 @@ prepare() { # remove RPATH from shared objects (FS#14366) sed -i 's|-Wl,-rpath,$(libdir) ||g' support/shobj-conf + + # patch from gentoo.org: + # https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b9a8501590c4b1fa99ff64229a50618ec060db1 + # HAVE_STDARG_H isn't defined for readline consumers externally so we always + # end up using the ancient non-prototypes. + patch -Np1 -i ../readline-8.2-c23.patch } build() { ===================================== readline-8.2-c23.patch ===================================== @@ -0,0 +1,20 @@ +HAVE_STDARG_H isn't defined for readline consumers externally so we always +end up using the ancient non-prototypes. Fix that as all compilers we care +about since forever in Gentoo will support this path. + +This in particular shows up with rl_message in consumers: +https://bugs.gentoo.org/943820 +https://bugs.gentoo.org/944059 +https://bugs.gentoo.org/944300 +https://bugs.gentoo.org/944344 +--- a/rlstdc.h ++++ b/rlstdc.h +@@ -44,7 +44,7 @@ + + /* Moved from config.h.in because readline.h:rl_message depends on these + defines. */ +-#if defined (__STDC__) && defined (HAVE_STDARG_H) ++#if defined (__STDC__) + # define PREFER_STDARG + # define USE_VARARGS + #else View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/readline/-/commit/d6b9165527c6c53feef7d754a75ddc2eb47385f4 -- View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/readline/-/commit/d6b9165527c6c53feef7d754a75ddc2eb47385f4 You're receiving this email because of your account on gitlab.archlinux.org.
