[-- Attachment #1: Type: text/plain, Size: 1225 bytes --] There is a new 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: 989 bytes --] From 28eafceda794ce17786403862afe168010fab7c7 Mon Sep 17 00:00:00 2001 From: Isaac Freund <mail@isaacfreund.com> Date: Wed, 27 Apr 2022 20:51:01 +0200 Subject: [PATCH] foot: update to 1.12.1. --- srcpkgs/foot/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/foot/template b/srcpkgs/foot/template index e1c373c43c24..0d3b9edcaa34 100644 --- a/srcpkgs/foot/template +++ b/srcpkgs/foot/template @@ -1,6 +1,6 @@ # Template file for 'foot' pkgname=foot -version=1.11.0 +version=1.12.1 revision=1 wrksrc=$pkgname build_style=meson @@ -15,7 +15,7 @@ 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 post_install() { rm -f ${DESTDIR}/usr/share/doc/foot/LICENSE
[-- Attachment #1: Type: text/plain, Size: 277 bytes --] New comment by camoz on void-packages repository https://github.com/void-linux/void-packages/pull/36884#issuecomment-1111413368 Comment: The config now lives under `/etc`, but should probably not yet added to `conf_files` due to https://github.com/void-linux/xbps/issues/342
[-- Attachment #1: Type: text/plain, Size: 215 bytes --] New comment by ftrvxmtrx on void-packages repository https://github.com/void-linux/void-packages/pull/36884#issuecomment-1117740640 Comment: Tested on aarch64-musl. Works well. Very much like the new `-E` option.
[-- Attachment #1: Type: text/plain, Size: 403 bytes --] New comment by camoz on void-packages repository https://github.com/void-linux/void-packages/pull/36884#issuecomment-1117888624 Comment: Thinking about it, the new release now installs a config file to `/etc/xdg/foot/foot.ini`, see https://codeberg.org/dnkl/foot/pulls/1015 AFAUI a possible user config file at that location would be overwritten anyway, so why not just add it to `conf_files` now?
[-- Attachment #1: Type: text/plain, Size: 181 bytes --] New comment by ericonr on void-packages repository https://github.com/void-linux/void-packages/pull/36884#issuecomment-1120533186 Comment: @ifreund ping on the `conf_files` idea?
[-- 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: 1027 bytes --] From 57bae7030beae6fcdf05b0350977e93c66dfa990 Mon Sep 17 00:00:00 2001 From: Isaac Freund <mail@isaacfreund.com> Date: Wed, 27 Apr 2022 20:51:01 +0200 Subject: [PATCH] foot: update to 1.12.1. --- srcpkgs/foot/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/foot/template b/srcpkgs/foot/template index e1c373c43c24..d139879a5399 100644 --- a/srcpkgs/foot/template +++ b/srcpkgs/foot/template @@ -1,6 +1,6 @@ # Template file for 'foot' pkgname=foot -version=1.11.0 +version=1.12.1 revision=1 wrksrc=$pkgname build_style=meson @@ -15,7 +15,8 @@ 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
[-- Attachment #1: Type: text/plain, Size: 186 bytes --] New comment by ifreund on void-packages repository https://github.com/void-linux/void-packages/pull/36884#issuecomment-1122249122 Comment: @ericonr Implemented, thanks for the ping :)
[-- 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: 1027 bytes --] From 5bb696985a60d2c6ad22843e4b0304ee27ef48d0 Mon Sep 17 00:00:00 2001 From: Isaac Freund <mail@isaacfreund.com> Date: Wed, 27 Apr 2022 20:51:01 +0200 Subject: [PATCH] foot: update to 1.12.1. --- srcpkgs/foot/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/foot/template b/srcpkgs/foot/template index e1c373c43c24..d139879a5399 100644 --- a/srcpkgs/foot/template +++ b/srcpkgs/foot/template @@ -1,6 +1,6 @@ # Template file for 'foot' pkgname=foot -version=1.11.0 +version=1.12.1 revision=1 wrksrc=$pkgname build_style=meson @@ -15,7 +15,8 @@ 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
[-- Attachment #1: Type: text/plain, Size: 585 bytes --] New comment by camoz on void-packages repository https://github.com/void-linux/void-packages/pull/36884#issuecomment-1122310608 Comment: I just want to highlight that this upgrade (with or without the `conf_files` option) has the potential to delete the user's configuration, because `/etc/xdg/foot/foot.ini` has already been the standard location for a system-wide foot config for some time. What is new in 1.12 is just that a default config is being installed there. So if void really wants to avoid overwriting the user's config, this should not be merged in the current state.
[-- Attachment #1: Type: text/plain, Size: 1637 bytes --] New comment by ifreund on void-packages repository https://github.com/void-linux/void-packages/pull/36884#issuecomment-1122313534 Comment: Looks like an ncurses update was merged to master in the meantime and we now need to resolve the terminfo conflict one way or another. From foot's `INSTALL.md`: > As of ncurses 2021-07-31, ncurses includes a version of foot’s terminfo. The recommendation is to use those, and only install the terminfo definitions from this git repo if the system’s ncurses predates 2021-07-31. > > But, note that the foot terminfo definitions in ncurses’ lack the non-standard capabilities. This mostly affects tmux; without them, terminal-overrides must be configured to enable truecolor support. For this reason, it is possible to install “our” terminfo definitions as well, either in a non-default location, or under a different name. > > Both have their set of issues. When installing to a non-default location, foot will set the environment variable TERMINFO in the child process. However, there are many situations where this simply does not work. See [#695](https://codeberg.org/dnkl/foot/issues/695) for details. > > Installing them under a different name generally works well, but will break applications that check if $TERM == foot. > > Hence the recommendation to simply use ncurses’ terminfo definitions if available. > > If packaging “our” terminfo definitions, I recommend doing that as a separate package, to allow them to be installed on remote systems without having to install foot itself. It seems like the simplest option is to drop `foot-terminfo`, thoughts?
[-- Attachment #1: Type: text/plain, Size: 292 bytes --] New comment by dkwo on void-packages repository https://github.com/void-linux/void-packages/pull/37148#issuecomment-1127295347 Comment: The failure on x86-64 is due to ``` foot-terminfo and ncurses-term conflict for /usr/share/terminfo/f/foot /usr/share/terminfo/f/foot-direct ```
[-- Attachment #1: Type: text/plain, Size: 196 bytes --] New comment by ifreund on void-packages repository https://github.com/void-linux/void-packages/pull/37148#issuecomment-1127398449 Comment: https://github.com/void-linux/void-packages/pull/36884
[-- Attachment #1: Type: text/plain, Size: 160 bytes --] New comment by dkwo on void-packages repository https://github.com/void-linux/void-packages/pull/37148#issuecomment-1127405298 Comment: Sorry, I missed that.
[-- 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: 2382 bytes --] From afa279eba74a31b9701c09241090a8a106c28c5d Mon Sep 17 00:00:00 2001 From: Isaac Freund <mail@isaacfreund.com> Date: Wed, 27 Apr 2022 20:51:01 +0200 Subject: [PATCH] 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/template | 16 ++++++---------- srcpkgs/removed-packages/template | 3 ++- 2 files changed, 8 insertions(+), 11 deletions(-) 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
[-- 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: 2673 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] 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
[-- Attachment #1: Type: text/plain, Size: 153 bytes --] New comment by ifreund on void-packages repository https://github.com/void-linux/void-packages/pull/37148#issuecomment-1127422739 Comment: No worries!
[-- Attachment #1: Type: text/plain, Size: 286 bytes --] New comment by ifreund on void-packages repository https://github.com/void-linux/void-packages/pull/36884#issuecomment-1127435444 Comment: I dropped `foot-terminfo` in the latest commit, following upstream's recommendation. This should be ready for merge now as far as I'm concerned.
[-- Attachment #1: Type: text/plain, Size: 365 bytes --] New comment by r-ricci on void-packages repository https://github.com/void-linux/void-packages/pull/36884#issuecomment-1127466299 Comment: You should add foot terminfo files to `srcpkgs/ncurses/files/base-files` in order for them to be included in `ncurses-base`. Currently they are in `ncurses-term`, which is not installed by default and it's not a dependency.
[-- 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"
[-- Attachment #1: Type: text/plain, Size: 168 bytes --] New comment by ifreund on void-packages repository https://github.com/void-linux/void-packages/pull/36884#issuecomment-1127491832 Comment: Good catch @r-ricci, done.
[-- 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: 4884 bytes --] From 9f88d53e56aa7a62195c0a3e5bfb877e5925577f Mon Sep 17 00:00:00 2001 From: Isaac Freund <mail@isaacfreund.com> Date: Tue, 17 May 2022 17:34:07 +0200 Subject: [PATCH 1/2] foot: update to 1.12.1. --- srcpkgs/foot/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/foot/template b/srcpkgs/foot/template index e1c373c43c24..d139879a5399 100644 --- a/srcpkgs/foot/template +++ b/srcpkgs/foot/template @@ -1,6 +1,6 @@ # Template file for 'foot' pkgname=foot -version=1.11.0 +version=1.12.1 revision=1 wrksrc=$pkgname build_style=meson @@ -15,7 +15,8 @@ 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 From 998da5a975a4b215b561530319375bbe313dfe2f 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: patch out foot terminfo We instead provide the upstream foot terminfo definitions in the foot-terminfo package. The upstream definitions have a few non-standard capabilities not present in the ncurses versions. --- srcpkgs/ncurses/patches/remove-foot.patch | 64 +++++++++++++++++++++++ srcpkgs/ncurses/template | 2 +- 2 files changed, 65 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/ncurses/patches/remove-foot.patch diff --git a/srcpkgs/ncurses/patches/remove-foot.patch b/srcpkgs/ncurses/patches/remove-foot.patch new file mode 100644 index 000000000000..0328c5c4dad8 --- /dev/null +++ b/srcpkgs/ncurses/patches/remove-foot.patch @@ -0,0 +1,64 @@ +diff -ruN ncurses-6.3_orig/misc/terminfo.src ncurses-6.3/misc/terminfo.src +--- ncurses-6.3_orig/misc/terminfo.src 2022-05-17 17:22:53.886017351 +0200 ++++ ncurses-6.3/misc/terminfo.src 2022-05-17 17:23:31.941720306 +0200 +@@ -7627,60 +7627,6 @@ + + ######## WAYLAND CLIENTS + +-#### Foot +-# https://codeberg.org/dnkl/foot/ +-# Version 1.8.2 +-# +-# This identifies as a VT220 with 4=sixel and 22=color, however: +-# tack: +-# bell does not work +-# status-line does not work because foot does not set the window title +-# sends escape when meta key is used, whether or not smm/rmm enabled +-# vttest: +-# wrap-test fails +-# no application-mode for numeric keypad (unless private mode 1035 is set) +-# no NRCS +-# no VT52 +-# no SRM +-# protected areas do not work +-# SU/SD work, SL/SR do not +-# DECRPM responds, but not the corresponding ANSI reports. +-# otherwise few reports, except cursor-position and mouse and some dtterm +-# VT520 cursor-movement works, except for left/right margins +-# supports xterm/DECSCUSR, though default case in vttest does not blink +-# Send: <27> [ 0 <32> q +-# Text: The cursor should be a blinking rectangle +-# partial support for xterm mouse any-event mode and button-event mode: +-# + does not report focus-in/focus-out +-# + does not report buttons 6/7 +-# alternate-screen works +-foot|foot terminal emulator, +- oc=\E]104\E\\, use=xterm+256color2, use=foot+base, +- +-foot-direct|foot with direct color indexing, +- use=xterm+direct, use=foot+base, +- +-foot+base|foot base fragment, +- am, bce, bw, hs, mir, msgr, npc, xenl, AX, XT, +- cols#80, it#8, lines#24, +- acsc=``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, +- bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[H\E[2J, cr=\r, +- cub1=^H, cud1=\n, dim=\E[2m, ech=\E[%p1%dX, ed=\E[J, el=\E[K, +- el1=\E[1K, flash=\E]555\E\\, ind=\n, invis=\E[8m, +- is2=\E[!p\E[?3;4l\E[4l\E>, kbs=^?, kcbt=\E[Z, +- oc=\E]104\E\\, op=\E[39;49m, rev=\E[7m, ri=\EM, rmacs=\E(B, +- rmam=\E[?7l, rmkx=\E[?1l\E>, rmso=\E[27m, rmul=\E[24m, +- rs1=\Ec, rs2=\E[!p\E[?3;4l\E[4l\E>, +- sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p5%t;2%;%?%p2%t;4%; +- %?%p1%p3%|%t;7%;%?%p4%t;5%;%?%p7%t;8%;m, +- sgr0=\E(B\E[m, smacs=\E(0, smam=\E[?7h, smkx=\E[?1h\E=, +- smso=\E[7m, smul=\E[4m, E3=\E[3J, use=att610+cvis, +- use=ansi+csr, use=ansi+cup, use=ansi+enq, use=ansi+local, +- use=ansi+idc, use=ansi+idl, use=ansi+rca2, use=ansi+rep, +- use=ansi+tabs, use=ecma+index, use=ecma+italics, +- use=ecma+strikeout, use=xterm+alt+title, +- use=xterm+pcfkeys, use=xterm+sm+1006, use=xterm+tmux2, +- + ######## WEB CLIENTS + + #### DomTerm 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"
[-- 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: 6164 bytes --] From 9f88d53e56aa7a62195c0a3e5bfb877e5925577f Mon Sep 17 00:00:00 2001 From: Isaac Freund <mail@isaacfreund.com> Date: Tue, 17 May 2022 17:34:07 +0200 Subject: [PATCH 1/3] foot: update to 1.12.1. --- srcpkgs/foot/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/foot/template b/srcpkgs/foot/template index e1c373c43c24..d139879a5399 100644 --- a/srcpkgs/foot/template +++ b/srcpkgs/foot/template @@ -1,6 +1,6 @@ # Template file for 'foot' pkgname=foot -version=1.11.0 +version=1.12.1 revision=1 wrksrc=$pkgname build_style=meson @@ -15,7 +15,8 @@ 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 From 998da5a975a4b215b561530319375bbe313dfe2f 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/3] ncurses: patch out foot terminfo We instead provide the upstream foot terminfo definitions in the foot-terminfo package. The upstream definitions have a few non-standard capabilities not present in the ncurses versions. --- srcpkgs/ncurses/patches/remove-foot.patch | 64 +++++++++++++++++++++++ srcpkgs/ncurses/template | 2 +- 2 files changed, 65 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/ncurses/patches/remove-foot.patch diff --git a/srcpkgs/ncurses/patches/remove-foot.patch b/srcpkgs/ncurses/patches/remove-foot.patch new file mode 100644 index 000000000000..0328c5c4dad8 --- /dev/null +++ b/srcpkgs/ncurses/patches/remove-foot.patch @@ -0,0 +1,64 @@ +diff -ruN ncurses-6.3_orig/misc/terminfo.src ncurses-6.3/misc/terminfo.src +--- ncurses-6.3_orig/misc/terminfo.src 2022-05-17 17:22:53.886017351 +0200 ++++ ncurses-6.3/misc/terminfo.src 2022-05-17 17:23:31.941720306 +0200 +@@ -7627,60 +7627,6 @@ + + ######## WAYLAND CLIENTS + +-#### Foot +-# https://codeberg.org/dnkl/foot/ +-# Version 1.8.2 +-# +-# This identifies as a VT220 with 4=sixel and 22=color, however: +-# tack: +-# bell does not work +-# status-line does not work because foot does not set the window title +-# sends escape when meta key is used, whether or not smm/rmm enabled +-# vttest: +-# wrap-test fails +-# no application-mode for numeric keypad (unless private mode 1035 is set) +-# no NRCS +-# no VT52 +-# no SRM +-# protected areas do not work +-# SU/SD work, SL/SR do not +-# DECRPM responds, but not the corresponding ANSI reports. +-# otherwise few reports, except cursor-position and mouse and some dtterm +-# VT520 cursor-movement works, except for left/right margins +-# supports xterm/DECSCUSR, though default case in vttest does not blink +-# Send: <27> [ 0 <32> q +-# Text: The cursor should be a blinking rectangle +-# partial support for xterm mouse any-event mode and button-event mode: +-# + does not report focus-in/focus-out +-# + does not report buttons 6/7 +-# alternate-screen works +-foot|foot terminal emulator, +- oc=\E]104\E\\, use=xterm+256color2, use=foot+base, +- +-foot-direct|foot with direct color indexing, +- use=xterm+direct, use=foot+base, +- +-foot+base|foot base fragment, +- am, bce, bw, hs, mir, msgr, npc, xenl, AX, XT, +- cols#80, it#8, lines#24, +- acsc=``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, +- bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[H\E[2J, cr=\r, +- cub1=^H, cud1=\n, dim=\E[2m, ech=\E[%p1%dX, ed=\E[J, el=\E[K, +- el1=\E[1K, flash=\E]555\E\\, ind=\n, invis=\E[8m, +- is2=\E[!p\E[?3;4l\E[4l\E>, kbs=^?, kcbt=\E[Z, +- oc=\E]104\E\\, op=\E[39;49m, rev=\E[7m, ri=\EM, rmacs=\E(B, +- rmam=\E[?7l, rmkx=\E[?1l\E>, rmso=\E[27m, rmul=\E[24m, +- rs1=\Ec, rs2=\E[!p\E[?3;4l\E[4l\E>, +- sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p5%t;2%;%?%p2%t;4%; +- %?%p1%p3%|%t;7%;%?%p4%t;5%;%?%p7%t;8%;m, +- sgr0=\E(B\E[m, smacs=\E(0, smam=\E[?7h, smkx=\E[?1h\E=, +- smso=\E[7m, smul=\E[4m, E3=\E[3J, use=att610+cvis, +- use=ansi+csr, use=ansi+cup, use=ansi+enq, use=ansi+local, +- use=ansi+idc, use=ansi+idl, use=ansi+rca2, use=ansi+rep, +- use=ansi+tabs, use=ecma+index, use=ecma+italics, +- use=ecma+strikeout, use=xterm+alt+title, +- use=xterm+pcfkeys, use=xterm+sm+1006, use=xterm+tmux2, +- + ######## WEB CLIENTS + + #### DomTerm 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" From 04110fcafd60443d20f090ca83142b1ab3291efd Mon Sep 17 00:00:00 2001 From: Isaac Freund <mail@isaacfreund.com> Date: Tue, 17 May 2022 18:02:36 +0200 Subject: [PATCH 3/3] fbterm: use terminfo from ncurses-term ncurses now provides this terminfo, which causes a file conflict. --- srcpkgs/fbterm/template | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/srcpkgs/fbterm/template b/srcpkgs/fbterm/template index f97ecc509dc7..9a413d3d71e6 100644 --- a/srcpkgs/fbterm/template +++ b/srcpkgs/fbterm/template @@ -1,20 +1,16 @@ # Template file for 'fbterm' pkgname=fbterm version=1.7.0 -revision=6 +revision=7 wrksrc="${pkgname}-${version%.*}" build_style=gnu-configure configure_args="--enable-gpm" hostmakedepends="pkg-config" makedepends="fontconfig-devel gpm-devel" +depends="ncurses-term" short_desc="Fast frame buffer based terminal emulator" maintainer="Leah Neukirchen <leah@vuxu.org>" license="GPL-2.0-or-later" homepage="https://github.com/izmntuk/fbterm" distfiles="https://github.com/izmntuk/${pkgname}/archive/v${version%.*}.tar.gz" checksum=68e9742b23d6f143d809a5930f5f22c7e55d7c14a4ab2c8a842e0b5c27b1f863 - -post_configure() { - sed -i "s,tic,& -o $DESTDIR/usr/share/terminfo," terminfo/Makefile - vmkdir usr/share/terminfo -}
[-- Attachment #1: Type: text/plain, Size: 309 bytes --] New comment by ifreund on void-packages repository https://github.com/void-linux/void-packages/pull/36884#issuecomment-1131836929 Comment: After some discussion on IRC, I decided to instead resolve the conflict by patching foot's terminfo out of ncurses as this will be the least disruptive for foot users.
[-- Attachment #1: Type: text/plain, Size: 1077 bytes --] There's a merged pull request on the void-packages repository foot: update to 1.12.1. https://github.com/void-linux/void-packages/pull/36884 Description: <!-- 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 -->