From af3aacaebc00cbc322b7e2c613129d46104a4d89 Mon Sep 17 00:00:00 2001 From: Ella Stanforth Date: Sun, 13 Mar 2022 12:03:56 +0000 Subject: [PATCH] foot: fix terminfo --- gui/foot/build.sh | 14 ++++++++++---- gui/foot/netbsd-tic.patch | 23 +++++++++++++++++++++++ 2 files changed, 33 insertions(+), 4 deletions(-) create mode 100644 gui/foot/netbsd-tic.patch diff --git a/gui/foot/build.sh b/gui/foot/build.sh index 25029a0..c14bb09 100644 --- a/gui/foot/build.sh +++ b/gui/foot/build.sh @@ -2,10 +2,16 @@ pkgname=foot pkgver=1.10.3 fetch() { - curl -L "https://codeberg.org/dnkl/foot/archive/$pkgver.tar.gz" -o $pkgname-$pkgver.tar.xz - tar -xf $pkgname-$pkgver.tar.xz + curl -L "https://codeberg.org/dnkl/foot/archive/$pkgver.tar.gz" -o $pkgname-$pkgver.tar.gz + curl -L "https://codeberg.org/dnkl/fcft/archive/2.4.5.tar.gz" -o fcft.tar.gz + curl -L "https://codeberg.org/dnkl/tllist/archive/1.0.5.tar.gz" -o tllist.tar.gz + tar -xf $pkgname-$pkgver.tar.gz mv $pkgname $pkgname-$pkgver mkdir $pkgname-$pkgver/build + tar -xf fcft.tar.gz -C $pkgname-$pkgver/subprojects + tar -xf tllist.tar.gz -C $pkgname-$pkgver/subprojects + cd $pkgname-$pkgver + patch -p1 < ../../netbsd-tic.patch } build() { @@ -15,8 +21,8 @@ build() { --buildtype=release \ --prefix=/usr \ --libexecdir=lib \ - -Dterminfo=disabled \ - -Ddefault-terminfo=xterm + -Dterminfo=enabled \ + -Ddefault-terminfo=foot samu } diff --git a/gui/foot/netbsd-tic.patch b/gui/foot/netbsd-tic.patch new file mode 100644 index 0000000..de8672e --- /dev/null +++ b/gui/foot/netbsd-tic.patch @@ -0,0 +1,23 @@ +--- a/meson.build ++++ b/meson.build +@@ -43,7 +43,7 @@ + join_paths(get_option('prefix'), terminfo_install_location))], + language: 'c') + else +- terminfo_install_location = join_paths(get_option('datadir'), 'terminfo') ++ terminfo_install_location = get_option('datadir') + endif + + # Compute the relative path used by compiler invocations. +@@ -262,9 +262,9 @@ + ) + custom_target( + 'terminfo', +- output: get_option('default-terminfo')[0], ++ output: 'terminfo.cdb', + input: preprocessed, +- command: [tic, '-x', '-o', '@OUTDIR@', '-e', '@0@,@0@-direct'.format(get_option('default-terminfo')), '@INPUT@'], ++ command: [tic, '-x', '-o', '@OUTPUT@', '@INPUT@'], + install: true, + install_dir: terminfo_install_location + )