Re: [PR PATCH] [Updated] foot: update to 1.12.1.

[ifreund <ifreund@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 1230 bytes --]

There is an updated pull request by ifreund against master on the void-packages repository

https://github.com/ifreund/void-packages foot
https://github.com/void-linux/void-packages/pull/36884

foot: update to 1.12.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/36884.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-foot-36884.patch --]
[-- Type: text/x-diff, Size: 3910 bytes --]

From d9a58abcc5b45b568dd9657b1cda4ffdc6450497 Mon Sep 17 00:00:00 2001
From: Isaac Freund <mail@isaacfreund.com>
Date: Wed, 27 Apr 2022 20:51:01 +0200
Subject: [PATCH 1/2] foot: update to 1.12.1.

This removes the foot-terminfo package as it is now provided by ncurses
and upstream recommends using the ncurses version.
---
 srcpkgs/foot-terminfo             |  1 -
 srcpkgs/foot/template             | 16 ++++++----------
 srcpkgs/removed-packages/template |  3 ++-
 3 files changed, 8 insertions(+), 12 deletions(-)
 delete mode 120000 srcpkgs/foot-terminfo

diff --git a/srcpkgs/foot-terminfo b/srcpkgs/foot-terminfo
deleted file mode 120000
index 5618e4826377..000000000000
--- a/srcpkgs/foot-terminfo
+++ /dev/null
@@ -1 +0,0 @@
-foot
\ No newline at end of file
diff --git a/srcpkgs/foot/template b/srcpkgs/foot/template
index e1c373c43c24..4c6129919be4 100644
--- a/srcpkgs/foot/template
+++ b/srcpkgs/foot/template
@@ -1,10 +1,12 @@
 # Template file for 'foot'
 pkgname=foot
-version=1.11.0
+version=1.12.1
 revision=1
 wrksrc=$pkgname
 build_style=meson
-configure_args="-Dwerror=false"
+# ncurses now provides foot terminfo. Follow the upstream recommendation in
+# foot's INSTALL.md and use that.
+configure_args="-Dwerror=false -Dterminfo=disabled"
 hostmakedepends="pkg-config scdoc wayland-devel"
 makedepends="fcft-devel libutf8proc-devel libxkbcommon-devel ncurses-devel tllist
  wayland-devel wayland-protocols"
@@ -15,16 +17,10 @@ license="MIT"
 homepage="https://codeberg.org/dnkl/foot"
 changelog="https://codeberg.org/dnkl/foot/src/branch/master/CHANGELOG.md"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=2b4f737eb4d266224e5dd0126168c6d770b0139d4b572078baf158d2f7166e4e
+checksum=14e307ac89454b682bb9f1bc644043779f4462df656034fcc4c1e72b18fbffdd
+conf_files="/etc/xdg/foot/foot.ini"
 
 post_install() {
 	rm -f ${DESTDIR}/usr/share/doc/foot/LICENSE
 	vlicense LICENSE
 }
-
-foot-terminfo_package() {
-	short_desc+=" - terminfo data"
-	pkg_install() {
-		vmove usr/share/terminfo
-	}
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 0923c53cfc05..292a2ae72476 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,7 +1,7 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
 version=0.1
-revision=69
+revision=70
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -79,6 +79,7 @@ replaces="
  flickcurl-doc<=1.26_4
  flickcurl<=1.26_4
  fontmatrix<=0.6.0.20171228_2
+ foot-terminfo<=1.12.1_1
  freshplayerplugin<=0.3.9_9
  fuse-usmb<=20130204_7
  gconf-editor<=3.0.1_3

From 077800458737d6e9c05c3f6bdd92963fa46b1baf Mon Sep 17 00:00:00 2001
From: Isaac Freund <mail@isaacfreund.com>
Date: Mon, 16 May 2022 12:20:37 +0200
Subject: [PATCH 2/2] ncurses: add foot terminfo to ncurses-base

---
 srcpkgs/ncurses/files/base-files | 3 +++
 srcpkgs/ncurses/template         | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/ncurses/files/base-files b/srcpkgs/ncurses/files/base-files
index 995639ab95e8..5381f9eb254e 100644
--- a/srcpkgs/ncurses/files/base-files
+++ b/srcpkgs/ncurses/files/base-files
@@ -9,6 +9,9 @@
 /usr/share/terminfo/c/cons25
 /usr/share/terminfo/c/cygwin
 /usr/share/terminfo/d/dumb
+/usr/share/terminfo/f/foot
+/usr/share/terminfo/f/foot+base
+/usr/share/terminfo/f/foot-direct
 /usr/share/terminfo/g/gnome
 /usr/share/terminfo/g/gnome-2007
 /usr/share/terminfo/g/gnome-256color
diff --git a/srcpkgs/ncurses/template b/srcpkgs/ncurses/template
index 5366c77a6a06..8386760db22f 100644
--- a/srcpkgs/ncurses/template
+++ b/srcpkgs/ncurses/template
@@ -1,7 +1,7 @@
 # Template file for 'ncurses'
 pkgname=ncurses
 version=6.3
-revision=1
+revision=2
 bootstrap=yes
 configure_args="--enable-big-core"
 short_desc="System V Release 4.0 curses emulation library"