Levente Polyak pushed to branch main at Arch Linux / Packaging / Packages /
readline
Commits:
6172945a by Levente Polyak at 2026-02-26T23:55:37+01:00
chore: use msg2 so the indention is below the prepare() message
- - - - -
bbeced93 by Levente Polyak at 2026-02-26T23:55:46+01:00
nvchecker: use a combiner source that works for new major releases
The current regex doesn't work with new major releases and would break.
Fix this with a combiner source transformation that appends the optional
patch level in case the subject contains f.e.. "patch 3" with a dot.
- - - - -
495e54c5 by Levente Polyak at 2026-02-26T23:56:03+01:00
chore: make pkgver the dominant variable
This allows for nvchecker integration work, and `pkgctl version upgrade`
to fully manage the package upgrade.
Extract patchlevel and _basever accordingly, taking major releases
without a patch version into account.
- - - - -
562fc3dc by Levente Polyak at 2026-02-26T23:56:11+01:00
fix: use x86_64 CARCH compare with a wildcard to support optimized arch
This would otherwise break expectations on x86_64-v3 etc.
- - - - -
3 changed files:
- .SRCINFO
- .nvchecker.toml
- PKGBUILD
Changes:
=====================================
.SRCINFO
=====================================
@@ -14,8 +14,6 @@ pkgbase = readline
backup = etc/inputrc
source = https://ftp.gnu.org/gnu/readline/readline-8.3.tar.gz
source = https://ftp.gnu.org/gnu/readline/readline-8.3.tar.gz.sig
- source =
https://ftp.gnu.org/gnu/readline/readline-8.3-patches/readline83-001
- source =
https://ftp.gnu.org/gnu/readline/readline-8.3-patches/readline83-001.sig
source = inputrc
source =
https://ftp.gnu.org/gnu/readline/readline-8.3-patches/readline83-001
source =
https://ftp.gnu.org/gnu/readline/readline-8.3-patches/readline83-001.sig
@@ -26,8 +24,6 @@ pkgbase = readline
validpgpkeys = 7C0135FB088AAF6C66C650B9BB5869F064EA74AB
b2sums =
45d6fe7e34c56d309102a94aa776a7f5284201e844450e14ff818df9fa84a72154bdca70f11828c94954b080cbbe4666fa0b00ffa8460118ec8f3ea551b73dad
b2sums = SKIP
- b2sums =
b0953458a18b8b06b0086567abd3c9ca3efceb5e4c38271e62137e126c106b938945d956394de0e955ecea5d48f8b261a4f2f3db2ee1d2cbc3b4cfdcf213ca46
- b2sums = SKIP
b2sums =
50db43bff430f282175aba4c4259e0b2222bc7e342fbe47b9dcce0172458472e72aebb9852eeafa4d10d4e89f2e1e8bb83b6b5dfc68eeababe699d4b5eae80f7
b2sums =
b0953458a18b8b06b0086567abd3c9ca3efceb5e4c38271e62137e126c106b938945d956394de0e955ecea5d48f8b261a4f2f3db2ee1d2cbc3b4cfdcf213ca46
b2sums = SKIP
=====================================
.nvchecker.toml
=====================================
@@ -1,6 +1,13 @@
-[readline]
+["readline:base"]
source = "htmlparser"
url = "https://cgit.git.savannah.gnu.org/cgit/readline.git/commit/";
xpath = "//div[@class='commit-subject']"
-from_pattern = '[rR]eadline-([\d.]+)(?:\s+patch\s+(\d+))?.*'
-to_pattern = '\1.\2'
+from_pattern = '[rR]eadline-([\d.]+)(\s+patch\s+(\d+))?.*'
+to_pattern = '\1\2'
+
+[readline]
+source = "combiner"
+from = ["readline:base"]
+format = "$1"
+from_pattern = " patch "
+to_pattern = "."
=====================================
PKGBUILD
=====================================
@@ -5,9 +5,10 @@
# Contributor: judd <[email protected]>
pkgname=readline
-_basever=8.3
-_patchlevel=003
-pkgver=${_basever}.${_patchlevel}
+pkgver=8.3.3
+_patchlevel=${pkgver#*.*.}
+[[ $_patchlevel == "$pkgver" ]] && _patchlevel=0
+_basever=${pkgver%"${_patchlevel:+.$_patchlevel}"}
pkgrel=1
pkgdesc='GNU readline library'
arch=('x86_64')
@@ -26,12 +27,10 @@ provides=(
options=('!emptydirs')
source=(
https://ftp.gnu.org/gnu/readline/readline-$_basever.tar.gz{,.sig}
- https://ftp.gnu.org/gnu/readline/readline-8.3-patches/readline83-001{,.sig}
+ # INFO: point patches are extended automatically into the source array
inputrc
)
b2sums=('45d6fe7e34c56d309102a94aa776a7f5284201e844450e14ff818df9fa84a72154bdca70f11828c94954b080cbbe4666fa0b00ffa8460118ec8f3ea551b73dad'
- 'SKIP'
-
'b0953458a18b8b06b0086567abd3c9ca3efceb5e4c38271e62137e126c106b938945d956394de0e955ecea5d48f8b261a4f2f3db2ee1d2cbc3b4cfdcf213ca46'
'SKIP'
'50db43bff430f282175aba4c4259e0b2222bc7e342fbe47b9dcce0172458472e72aebb9852eeafa4d10d4e89f2e1e8bb83b6b5dfc68eeababe699d4b5eae80f7'
'b0953458a18b8b06b0086567abd3c9ca3efceb5e4c38271e62137e126c106b938945d956394de0e955ecea5d48f8b261a4f2f3db2ee1d2cbc3b4cfdcf213ca46'
@@ -42,7 +41,8 @@
b2sums=('45d6fe7e34c56d309102a94aa776a7f5284201e844450e14ff818df9fa84a72154bdca7
'SKIP')
validpgpkeys=('7C0135FB088AAF6C66C650B9BB5869F064EA74AB') # Chet Ramey
-if [ $_patchlevel -gt 0 ]; then
+# extend patches to source array
+if (( _patchlevel > 0 )); then
for (( _p=1; _p <= $((10#${_patchlevel})); _p++ )); do
source=(${source[@]}
https://ftp.gnu.org/gnu/readline/readline-$_basever-patches/readline${_basever//.}-$(printf
"%03d" $_p){,.sig})
done
@@ -51,7 +51,7 @@ fi
prepare() {
cd $pkgname-$_basever
for (( _p=1; _p <= $((10#${_patchlevel})); _p++ )); do
- msg "applying patch readline${_basever//.}-$(printf "%03d" $_p)"
+ msg2 "applying patch readline${_basever//.}-$(printf "%03d" $_p)"
patch -p0 -i ../readline${_basever//.}-$(printf "%03d" $_p)
done
@@ -63,7 +63,7 @@ build() {
cd $pkgname-$_basever
# build with -fPIC for x86_64 (FS#15634)
- [[ $CARCH == "x86_64" ]] && CFLAGS="$CFLAGS -fPIC"
+ [[ $CARCH == x86_64* ]] && CFLAGS="$CFLAGS -fPIC"
./configure --prefix=/usr
make SHLIB_LIBS=-lncurses
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/readline/-/compare/8aea5cd77fd27eb270c8782449450c6818f5bc76...562fc3dc105d29b06ad9bfae84e27387d1d50b6a
--
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/readline/-/compare/8aea5cd77fd27eb270c8782449450c6818f5bc76...562fc3dc105d29b06ad9bfae84e27387d1d50b6a
You're receiving this email because of your account on gitlab.archlinux.org.
