Date: Monday, April 18, 2022 @ 12:47:31 Author: dvzrv Revision: 1186980
archrelease: copy trunk to community-staging-x86_64 Added: neovim/repos/community-staging-x86_64/ neovim/repos/community-staging-x86_64/0001-patch_terminfo_bugs-Extend-smglr-ignores-to-smglp-an.patch (from rev 1186979, neovim/trunk/0001-patch_terminfo_bugs-Extend-smglr-ignores-to-smglp-an.patch) neovim/repos/community-staging-x86_64/PKGBUILD (from rev 1186979, neovim/trunk/PKGBUILD) -----------------------------------------------------------------+ 0001-patch_terminfo_bugs-Extend-smglr-ignores-to-smglp-an.patch | 64 ++++++++++ PKGBUILD | 61 +++++++++ 2 files changed, 125 insertions(+) Copied: neovim/repos/community-staging-x86_64/0001-patch_terminfo_bugs-Extend-smglr-ignores-to-smglp-an.patch (from rev 1186979, neovim/trunk/0001-patch_terminfo_bugs-Extend-smglr-ignores-to-smglp-an.patch) =================================================================== --- community-staging-x86_64/0001-patch_terminfo_bugs-Extend-smglr-ignores-to-smglp-an.patch (rev 0) +++ community-staging-x86_64/0001-patch_terminfo_bugs-Extend-smglr-ignores-to-smglp-an.patch 2022-04-18 12:47:31 UTC (rev 1186980) @@ -0,0 +1,64 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: "Jan Alexander Steffens (heftig)" <jan.steff...@gmail.com> +Date: Thu, 4 Nov 2021 22:04:17 +0000 +Subject: [PATCH] patch_terminfo_bugs: Extend smglr ignores to smglp and smgrp + +The latter were added for xterm by ncurses 6.3 and are similarly +affected. + +Fixes https://github.com/neovim/neovim/issues/16238 +--- + src/nvim/tui/tui.c | 16 ++++++++++++++++ + 1 file changed, 16 insertions(+) + +diff --git a/src/nvim/tui/tui.c b/src/nvim/tui/tui.c +index f9c5521bdb63..bb752863692d 100644 +--- a/src/nvim/tui/tui.c ++++ b/src/nvim/tui/tui.c +@@ -1663,30 +1663,46 @@ static void patch_terminfo_bugs(TUIData *data, const char *term, const char *col + ILOG("Disabling smglr with TERM=xterm for non-xterm."); + unibi_set_str(ut, unibi_set_lr_margin, NULL); + } ++ if (unibi_get_str(ut, unibi_set_left_margin_parm)) { ++ ILOG("Disabling smglp with TERM=xterm for non-xterm."); ++ unibi_set_str(ut, unibi_set_left_margin_parm, NULL); ++ } ++ if (unibi_get_str(ut, unibi_set_right_margin_parm)) { ++ ILOG("Disabling smgrp with TERM=xterm for non-xterm."); ++ unibi_set_str(ut, unibi_set_right_margin_parm, NULL); ++ } + } + + #ifdef WIN32 + // XXX: workaround libuv implicit LF => CRLF conversion. #10558 + unibi_set_str(ut, unibi_cursor_down, "\x1b[B"); + #endif + } else if (rxvt) { + // 2017-04 terminfo.src lacks these. Unicode rxvt has them. + unibi_set_if_empty(ut, unibi_enter_italics_mode, "\x1b[3m"); + unibi_set_if_empty(ut, unibi_exit_italics_mode, "\x1b[23m"); + unibi_set_if_empty(ut, unibi_to_status_line, "\x1b]2"); + unibi_set_if_empty(ut, unibi_from_status_line, "\x07"); + // 2017-04 terminfo.src has older control sequences. + unibi_set_str(ut, unibi_enter_ca_mode, "\x1b[?1049h"); + unibi_set_str(ut, unibi_exit_ca_mode, "\x1b[?1049l"); + } else if (screen) { + // per the screen manual; 2017-04 terminfo.src lacks these. + unibi_set_if_empty(ut, unibi_to_status_line, "\x1b_"); + unibi_set_if_empty(ut, unibi_from_status_line, "\x1b\\"); + // Fix an issue where smglr is inherited by TERM=screen.xterm. + if (unibi_get_str(ut, unibi_set_lr_margin)) { + ILOG("Disabling smglr with TERM=screen.xterm for screen."); + unibi_set_str(ut, unibi_set_lr_margin, NULL); + } ++ if (unibi_get_str(ut, unibi_set_left_margin_parm)) { ++ ILOG("Disabling smglp with TERM=screen.xterm for screen."); ++ unibi_set_str(ut, unibi_set_left_margin_parm, NULL); ++ } ++ if (unibi_get_str(ut, unibi_set_right_margin_parm)) { ++ ILOG("Disabling smgrp with TERM=screen.xterm for screen."); ++ unibi_set_str(ut, unibi_set_right_margin_parm, NULL); ++ } + } else if (tmux) { + unibi_set_if_empty(ut, unibi_to_status_line, "\x1b_"); + unibi_set_if_empty(ut, unibi_from_status_line, "\x1b\\"); Copied: neovim/repos/community-staging-x86_64/PKGBUILD (from rev 1186979, neovim/trunk/PKGBUILD) =================================================================== --- community-staging-x86_64/PKGBUILD (rev 0) +++ community-staging-x86_64/PKGBUILD 2022-04-18 12:47:31 UTC (rev 1186980) @@ -0,0 +1,61 @@ +# Maintainer: Sven-Hendrik Haase <svenst...@archlinux.org> +# Maintainer: Caleb Maclennan <ca...@alerque.com> +# Contributor: Florian Walch <florian+...@fwalch.com> +# Contributor: Florian Hahn <f...@fhahn.com> + +pkgname=neovim +pkgver=0.7.0 +pkgrel=2 +pkgdesc='Fork of Vim aiming to improve user experience, plugins, and GUIs' +arch=('x86_64') +url='https://neovim.io' +backup=('etc/xdg/nvim/sysinit.vim') +license=('custom:neovim') +provides=('vim-plugin-runtime') +depends=('libtermkey' 'libuv' 'msgpack-c' 'unibilium' 'libvterm01' 'luajit' 'libluv' 'tree-sitter') +makedepends=('cmake' 'ninja' 'lua51-mpack' 'lua51-lpeg' 'gperf') +optdepends=('python-neovim: for Python 3 plugin support (see :help python)' + 'xclip: for clipboard support on X11 (or xsel) (see :help clipboard)' + 'xsel: for clipboard support on X11 (or xclip) (see :help clipboard)' + 'wl-clipboard: for clipboard support on wayland (see :help clipboard)') +options=(debug) +source=("https://github.com/neovim/neovim/archive/v${pkgver}/${pkgname}-${pkgver}.tar.gz") +sha512sums=('3597c54fb925a4d607bca9ba0fdb37df90ecb816da99f52baf46cc2ec79727a55048ba1d8d22c8e7d61f0e8e35546326b1d0d15c0a91de8bf5bc529c45fb1ce0') + +build() { + cmake \ + -Bbuild \ + -GNinja \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DUSE_BUNDLED=OFF \ + -D LIBVTERM_INCLUDE_DIR=/usr/include/libvterm01 \ + -D LIBVTERM_LIBRARY=/usr/lib/libvterm01/libvterm.so \ + -W no-dev \ + -S neovim-$pkgver + cmake --build build +} + +check() { + ./build/bin/nvim --version + ./build/bin/nvim --headless -u NONE -i NONE -c ':quit' +} + +package() { + DESTDIR="$pkgdir" cmake --install build + + install -Dm644 neovim-$pkgver/LICENSE.txt -t "${pkgdir}/usr/share/licenses/${pkgname}/" + install -Dm644 neovim-$pkgver/runtime/nvim.desktop -t "${pkgdir}/usr/share/applications/" + install -Dm644 neovim-$pkgver/runtime/nvim.appdata.xml -t "${pkgdir}/usr/share/metainfo/" + install -Dm644 neovim-$pkgver/runtime/nvim.png -t "${pkgdir}/usr/share/pixmaps/" + + # Make Arch vim packages work + mkdir -p "${pkgdir}"/etc/xdg/nvim + echo "\" This line makes pacman-installed global Arch Linux vim packages work." > "${pkgdir}"/etc/xdg/nvim/sysinit.vim + echo "source /usr/share/nvim/archlinux.vim" >> "${pkgdir}"/etc/xdg/nvim/sysinit.vim + + mkdir -p "${pkgdir}"/usr/share/vim + echo "set runtimepath+=/usr/share/vim/vimfiles" > "${pkgdir}"/usr/share/nvim/archlinux.vim +} + +# vim:set ft=sh sw=2 sts=2 et: