Received: from out1.migadu.com (out1.migadu.com [91.121.223.63]) by nld3-dev1.alpinelinux.org (Postfix) with ESMTPS id D0FE7782C38 for ; Wed, 18 Aug 2021 11:22:10 +0000 (UTC) X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=stacyharper.net; s=key1; t=1629285728; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=dvGebLQp6GrpP7RuIV1rcwIxDf653yoOwQVQOaf/XA4=; b=QGjxZFNwZN+XqqWXvzejExLIB2IWdVrFhkELBl94dH4GhVKm0oQmuW/kGFiCb2XQf2cDY1 adiN9AVsjhqzKEXEZ/HP3WzQi480eTSmNkDpAqOBHSbnwBlJkIVXrG2rCErTrxzyqYmMJG tchPAC/lMi8ykkigfvC1jCqxTeCf2Kb4tNvNpq5QJRTbnw/OxpNRKknKCPvNmruzFpEm+3 t+mSoh3BcmVXz5oTDgNJKG0nqEZnuD1PLKfOB1DQU5Dy9xLRKzfjhF4kKtRg1Q29axHVAm R4BDlziXJuZ351fr4g8Hq93W62CDDZCuPdf9FDWuO7eVS8sf/XuSwnA/AYAjDw== From: Stacy Harper To: alpine-aports@lists.alpinelinux.org Subject: [PATCH] community/foot: fix terminfo override Date: Wed, 18 Aug 2021 13:21:55 +0200 Message-Id: <20210818112155.27679-1-contact@stacyharper.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: contact@stacyharper.net 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 --- 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 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