community/foot: fix terminfo override v1 REJECTED

Stacy Harper: 1
 community/foot: fix terminfo override

 2 files changed, 6 insertions(+), 3 deletions(-)

[PATCH] community/foot: fix terminfo override Export this patch

ncurses-terminfo now got foot terminfo files.

ERROR: foot-1.8.2-r3: trying to overwrite usr/share/terminfo/f/foot owned by ncurses-terminfo-6.2_p20210814-r1.
ERROR: foot-1.8.2-r3: trying to overwrite usr/share/terminfo/f/foot-direct owned by ncurses-terminfo-6.2_p20210814-r1.

As other terminals packages do, we strip those terminfo from foot itself
foot and rely on ncurses-terminfo-base

Signed-off-by: Stacy Harper <contact@stacyharper.net>
---
 community/foot/APKBUILD | 5 ++++-
 main/ncurses/APKBUILD   | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/community/foot/APKBUILD b/community/foot/APKBUILD
index 1d30b9c18c..03c4692ad6 100644
--- a/community/foot/APKBUILD
+++ b/community/foot/APKBUILD
@@ -1,11 +1,12 @@
 # Maintainer: Alex McGrath <amk@amk.ie>
 pkgname=foot
 pkgver=1.8.2
-pkgrel=1
+pkgrel=2
 pkgdesc="A fast, lightweight and minimalistic Wayland terminal emulator"
 url="https://codeberg.org/dnkl/foot.git"
 arch="all !ppc64le" # ppc64le build fails
 license="MIT"
+depends="ncurses-terminfo-base"
 makedepends="
 	meson
 	scdoc
@@ -40,6 +41,8 @@ package() {
 	DESTDIR="$pkgdir" meson install --no-rebuild -C output
 	install -Dm644 foot.ini "$pkgdir"/usr/share/foot/foot.ini
 	mv "$pkgdir"/usr/share/fish/vendor_completions.d "$pkgdir"/usr/share/fish/completions
+	rm "$pkgdir"/usr/share/terminfo/f/foot
+	rm "$pkgdir"/usr/share/terminfo/f/foot-direct
 }
 
 sha512sums="
diff --git a/main/ncurses/APKBUILD b/main/ncurses/APKBUILD
index 6285f9b70e..e6d42c79bd 100644
--- a/main/ncurses/APKBUILD
+++ b/main/ncurses/APKBUILD
@@ -2,7 +2,7 @@
 pkgname=ncurses
 pkgver=6.2_p20210814
 _ver=${pkgver/_p/-}
-pkgrel=0
+pkgrel=1
 pkgdesc="Console display library"
 url="https://invisible-island.net/ncurses/"
 arch="all"
@@ -50,7 +50,7 @@ package() {
 			alacritty tmux tmux-256color terminator 'terminology*' \
 			vte vte-256color gnome gnome-256color kitty konsole konsole-256color \
 			konsole-linux putty putty-256color rxvt-256color 'st-*' \
-			screen-256color; do
+			screen-256color foot; do
 		local termfiles=$(find "$pkgdir"/usr/share/terminfo/ -name "$i" 2>/dev/null) || true
 
 		[ -z "$termfiles" ] && continue
-- 
2.33.0

Kevin Daudt <no-reply@dispatch.alpinelinux.org>

2 years ago

Superseeded by !24357

-- 
via https://gitlab.alpinelinux.org/alpine/aports/-/merge_requests/24355#note_175674