Levente Polyak pushed to branch main at Arch Linux / Packaging / Packages / less


Commits:
a22a2591 by Levente Polyak at 2026-02-05T00:32:48+01:00
upgpkg: 1:691-2: backport patch fixing pager usage

Specific terminals, like kitty, had terminfo sequences that less wasn't
handling and broke searching and other input features in pagers making use of
less. Fix this by backporting the less patch, which is part of version 692
but which is still in beta as it contains lot more changes.

Switch temporarily to `git apply` as it allows to exclude files from the patch
that may conflict but we aren't interested in, f.e. NEWS and version history.
Revert to previous patch blocks when releasing 692.

- - - - -


2 changed files:

- .SRCINFO
- PKGBUILD


Changes:

=====================================
.SRCINFO
=====================================
@@ -1,18 +1,21 @@
 pkgbase = less
        pkgdesc = A terminal based program for viewing text files
        pkgver = 691
-       pkgrel = 1
+       pkgrel = 2
        epoch = 1
        url = https://www.greenwoodsoftware.com/less/
        arch = x86_64
        license = GPL-3.0-or-later OR LicenseRef-Less
+       makedepends = git
        depends = glibc
        depends = ncurses
        depends = pcre2
        source = https://www.greenwoodsoftware.com/less/less-691.tar.gz
        source = 
less-691.tar.gz.sig::https://www.greenwoodsoftware.com/less/less-691.sig
+       source = 
less-Fix-handling-of-empty-terminfo-capabilities.patch::https://github.com/gwsw/less/commit/18db5ae3ae833af302ea0fbfd1e5c633ac73a743.patch
        validpgpkeys = AE27252BD6846E7D6EAE1DD6F153A7C833235259
        b2sums = 
b74fe33259ac5731cc6230e115c8ab21f34c8a3e67efbb5ee554af6377a17f9ee3a92f99e9ee2f9c757804de5f0f061c87582d26da71a2c8a62fb079434abe62
        b2sums = SKIP
+       b2sums = 
0bd88c7ded6bb0ec2e6c773ef9490bf8d8b9a4812ff88c0dbc5b534be03ddc56cf3a9e78220b6940a8ee90a467faf4b51ef8c0b4f58401a332e502eee404ad9c
 
 pkgname = less


=====================================
PKGBUILD
=====================================
@@ -4,7 +4,7 @@
 
 pkgname=less
 pkgver=691
-pkgrel=1
+pkgrel=2
 epoch=1
 pkgdesc='A terminal based program for viewing text files'
 license=('GPL-3.0-or-later OR LicenseRef-Less')
@@ -13,14 +13,20 @@ url='https://www.greenwoodsoftware.com/less/'
 depends=(
   glibc
   ncurses 
-  pcre2)
+  pcre2
+)
+makedepends=(
+  git
+)
 validpgpkeys=('AE27252BD6846E7D6EAE1DD6F153A7C833235259') # Mark Nudelman
 source=(
   https://www.greenwoodsoftware.com/$pkgname/$pkgname-$pkgver.tar.gz
   
$pkgname-$pkgver.tar.gz.sig::https://www.greenwoodsoftware.com/$pkgname/$pkgname-$pkgver.sig
-  )
+  
less-Fix-handling-of-empty-terminfo-capabilities.patch::https://github.com/gwsw/less/commit/18db5ae3ae833af302ea0fbfd1e5c633ac73a743.patch
+)
 
b2sums=('b74fe33259ac5731cc6230e115c8ab21f34c8a3e67efbb5ee554af6377a17f9ee3a92f99e9ee2f9c757804de5f0f061c87582d26da71a2c8a62fb079434abe62'
-        'SKIP')
+        'SKIP'
+        
'0bd88c7ded6bb0ec2e6c773ef9490bf8d8b9a4812ff88c0dbc5b534be03ddc56cf3a9e78220b6940a8ee90a467faf4b51ef8c0b4f58401a332e502eee404ad9c')
 
 prepare() {
   cd $pkgname-$pkgver
@@ -31,7 +37,8 @@ prepare() {
     src="${src##*/}"
     [[ $src = *.patch ]] || continue
     echo "Applying patch $src..."
-    patch -Np1 < "../$src"
+    # TODO: reactivate when dropping the git exclude patch patch -Np1 < 
"../$src"
+    git apply --exclude NEWS --exclude version.c "../$src"
   done
 }
 



View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/less/-/commit/a22a2591601df729442c83327d0dde5cc8c8d225

-- 
View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/less/-/commit/a22a2591601df729442c83327d0dde5cc8c8d225
You're receiving this email because of your account on gitlab.archlinux.org.


Reply via email to