[arch-commits] Commit in neovim/repos/community-x86_64 (4 files)
Sven-Hendrik Haase
svenstaro at gemini.archlinux.org
Mon Jun 27 02:23:13 UTC 2022
Date: Monday, June 27, 2022 @ 02:23:13
Author: svenstaro
Revision: 1239605
archrelease: copy trunk to community-x86_64
Added:
neovim/repos/community-x86_64/0001-patch_terminfo_bugs-Extend-smglr-ignores-to-smglp-an.patch
(from rev 1239604, neovim/trunk/0001-patch_terminfo_bugs-Extend-smglr-ignores-to-smglp-an.patch)
neovim/repos/community-x86_64/PKGBUILD
(from rev 1239604, neovim/trunk/PKGBUILD)
Deleted:
neovim/repos/community-x86_64/0001-patch_terminfo_bugs-Extend-smglr-ignores-to-smglp-an.patch
neovim/repos/community-x86_64/PKGBUILD
-----------------------------------------------------------------+
0001-patch_terminfo_bugs-Extend-smglr-ignores-to-smglp-an.patch | 128 +++++-----
PKGBUILD | 128 +++++-----
2 files changed, 128 insertions(+), 128 deletions(-)
Deleted: 0001-patch_terminfo_bugs-Extend-smglr-ignores-to-smglp-an.patch
===================================================================
--- 0001-patch_terminfo_bugs-Extend-smglr-ignores-to-smglp-an.patch 2022-06-27 02:23:07 UTC (rev 1239604)
+++ 0001-patch_terminfo_bugs-Extend-smglr-ignores-to-smglp-an.patch 2022-06-27 02:23:13 UTC (rev 1239605)
@@ -1,64 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <jan.steffens at 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-x86_64/0001-patch_terminfo_bugs-Extend-smglr-ignores-to-smglp-an.patch (from rev 1239604, neovim/trunk/0001-patch_terminfo_bugs-Extend-smglr-ignores-to-smglp-an.patch)
===================================================================
--- 0001-patch_terminfo_bugs-Extend-smglr-ignores-to-smglp-an.patch (rev 0)
+++ 0001-patch_terminfo_bugs-Extend-smglr-ignores-to-smglp-an.patch 2022-06-27 02:23:13 UTC (rev 1239605)
@@ -0,0 +1,64 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens at 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\\");
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2022-06-27 02:23:07 UTC (rev 1239604)
+++ PKGBUILD 2022-06-27 02:23:13 UTC (rev 1239605)
@@ -1,64 +0,0 @@
-# Maintainer: Sven-Hendrik Haase <svenstaro at archlinux.org>
-# Maintainer: Caleb Maclennan <caleb at alerque.com>
-# Contributor: Florian Walch <florian+aur at fwalch.com>
-# Contributor: Florian Hahn <flo at fhahn.com>
-
-pkgname=neovim
-pkgver=0.7.1
-pkgrel=1
-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' 'patchelf')
-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=('ebb76b722b77218234fe99a6ede0414eebd4a371dc792288b3a26ff1c5afbc9d8bce314d7c4f637b59c05ca12159680dafe7ac2c35532187cde56d7dd2801eba')
-
-build() {
- export PKG_CONFIG_PATH="/usr/lib/libvterm01/pkgconfig:$PKG_CONFIG_PATH"
- cmake \
- -Bbuild \
- -GNinja \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DUSE_BUNDLED=OFF \
- -W no-dev \
- -S neovim-$pkgver
- cmake --build build --verbose
-}
-
-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
-
- # NOTE: this is very ugly and needs to be removed as soon as neovim supports libvterm >= 0.2.0
- # (both libvterm01 and libvterm provide libvterm.so.0)
- patchelf --add-rpath '/usr/lib/libvterm01' "$pkgdir/usr/bin/nvim"
-}
-
-# vim:set ft=sh sw=2 sts=2 et:
Copied: neovim/repos/community-x86_64/PKGBUILD (from rev 1239604, neovim/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2022-06-27 02:23:13 UTC (rev 1239605)
@@ -0,0 +1,64 @@
+# Maintainer: Sven-Hendrik Haase <svenstaro at archlinux.org>
+# Maintainer: Caleb Maclennan <caleb at alerque.com>
+# Contributor: Florian Walch <florian+aur at fwalch.com>
+# Contributor: Florian Hahn <flo at fhahn.com>
+
+pkgname=neovim
+pkgver=0.7.2
+pkgrel=1
+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' 'patchelf')
+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=('04d0fa5b23018531b70b53271821bf6944cde1bcec2210b99f5888e1339cd38f57feaa8e40874a3a504930e6614980947f31852185cbcd2ce106a0867896dd79')
+
+build() {
+ export PKG_CONFIG_PATH="/usr/lib/libvterm01/pkgconfig:$PKG_CONFIG_PATH"
+ cmake \
+ -Bbuild \
+ -GNinja \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DUSE_BUNDLED=OFF \
+ -W no-dev \
+ -S neovim-$pkgver
+ cmake --build build --verbose
+}
+
+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
+
+ # NOTE: this is very ugly and needs to be removed as soon as neovim supports libvterm >= 0.2.0
+ # (both libvterm01 and libvterm provide libvterm.so.0)
+ patchelf --add-rpath '/usr/lib/libvterm01' "$pkgdir/usr/bin/nvim"
+}
+
+# vim:set ft=sh sw=2 sts=2 et:
More information about the arch-commits
mailing list