From 9f88d53e56aa7a62195c0a3e5bfb877e5925577f Mon Sep 17 00:00:00 2001 From: Isaac Freund 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 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"