From dc3236d767881e9e0aaeb8663e4012825c9c41a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Sun, 23 Jan 2022 11:50:34 -0300 Subject: [PATCH] bash-completion: complete tar with xbps files Backported from upstream https://github.com/scop/bash-completion/pull/688 Fix checkdepends so tests run, but ci-skip since 26 tests fail atm, with the goal of have check pass for next release 2.12. --- .../patches/complete-xbps.patch | 24 +++++++++++++++++++ srcpkgs/bash-completion/template | 7 +++++- 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/bash-completion/patches/complete-xbps.patch diff --git a/srcpkgs/bash-completion/patches/complete-xbps.patch b/srcpkgs/bash-completion/patches/complete-xbps.patch new file mode 100644 index 000000000000..3e34ef1d78da --- /dev/null +++ b/srcpkgs/bash-completion/patches/complete-xbps.patch @@ -0,0 +1,24 @@ +Complete tar with .xbps files. + +Backported from upstream https://github.com/scop/bash-completion/pull/688 + +--- a/completions/tar ++++ b/completions/tar 2022-01-23 11:42:19.699734913 -0300 +@@ -422,7 +422,7 @@ + + __tar_detect_ext() + { +- local tars='@(@(tar|gem|spkg)?(.@(Z|[bgx]z|bz2|lz?(ma|o)|zst))|t@([abglx]z|b?(z)2|zst))' ++ local tars='@(@(tar|spkg)?(.@(Z|[bgx]z|bz2|lz?(ma|o)|zst))|t@([abglx]z|b?(z)2|zst)|gem|xbps)' + ext="$tars" + + case "$tar_mode_arg" in +@@ -430,7 +430,7 @@ + # Should never happen? + ;; + ?(-)*[cr]*f) +- ext='@(tar|gem|spkg)' ++ ext='@(tar|gem|spkg|xbps)' + case ${words[1]} in + *a*) ext="$tars" ;; + *z*) ext='t?(ar.)gz' ;; diff --git a/srcpkgs/bash-completion/template b/srcpkgs/bash-completion/template index 8f20e4e7acd7..ae3bc7517323 100644 --- a/srcpkgs/bash-completion/template +++ b/srcpkgs/bash-completion/template @@ -1,13 +1,18 @@ # Template file for 'bash-completion' pkgname=bash-completion version=2.11 -revision=2 +revision=3 build_style=gnu-configure make_install_args="profiledir=/etc/bash/bashrc.d" depends="bash" +checkdepends="python3-pytest python3-pexpect" short_desc="Programmable completion for the GNU Bash shell" maintainer="skmpz " license="GPL-2.0-or-later" homepage="https://github.com/scop/bash-completion" distfiles="https://github.com/scop/bash-completion/releases/download/${version}/bash-completion-${version}.tar.xz" checksum=73a8894bad94dee83ab468fa09f628daffd567e8bef1a24277f1e9a0daf911ac + +# Summary of tests: = 26 failed, 1106 passed, 457 skipped, 14 xfailed, 4 xpassed in 1126.01s (0:18:46) = +# Let's try to fix this for 2.12; see #35201 +make_check=ci-skip