[arch-commits] Commit in neovim/repos/community-x86_64 (5 files)
Jan Steffens
heftig at archlinux.org
Wed Nov 21 14:06:25 UTC 2018
Date: Wednesday, November 21, 2018 @ 14:06:24
Author: heftig
Revision: 409274
archrelease: copy trunk to community-x86_64
Added:
neovim/repos/community-x86_64/PKGBUILD
(from rev 409273, neovim/trunk/PKGBUILD)
neovim/repos/community-x86_64/neovim.install
(from rev 409273, neovim/trunk/neovim.install)
Deleted:
neovim/repos/community-x86_64/3a5721e91ba890718319213154ba6964c9dca4d2.patch
neovim/repos/community-x86_64/PKGBUILD
neovim/repos/community-x86_64/neovim.install
------------------------------------------------+
3a5721e91ba890718319213154ba6964c9dca4d2.patch | 41 --------
PKGBUILD | 115 ++++++++++++-----------
neovim.install | 20 ++--
3 files changed, 73 insertions(+), 103 deletions(-)
Deleted: 3a5721e91ba890718319213154ba6964c9dca4d2.patch
===================================================================
--- 3a5721e91ba890718319213154ba6964c9dca4d2.patch 2018-11-21 14:06:07 UTC (rev 409273)
+++ 3a5721e91ba890718319213154ba6964c9dca4d2.patch 2018-11-21 14:06:24 UTC (rev 409274)
@@ -1,41 +0,0 @@
-From 3a5721e91ba890718319213154ba6964c9dca4d2 Mon Sep 17 00:00:00 2001
-From: Chih-Hsuan Yen <yan12125 at gmail.com>
-Date: Mon, 29 Jan 2018 22:47:25 +0800
-Subject: [PATCH] tui: libtermkey: force CSI driver for mouse input #7948
-
-Fixes #7932
-
-Nvim (tui.c) always enables SGR mouse (TUIData.unibi_ext.enable_mouse).
-But if libtermkey sees key_mouse (kmous) in terminfo its terminfo driver
-(driver-ti.c) will be activated, which by accident only supports X10
-protocol. The libtermkey CSI driver (driver-csi.c), in contrast,
-supports SGR.
-
-We can force libtermkey to ignore the terminfo key_mouse entry by
-returning NULL in the tui_tk_ti_getstr hook. That forces the CSI driver.
-
-What is the effect of returning NULL from `tui_tk_ti_getstr()`?
-- libtermkey `driver-ti.c:load_terminfo()` skips the entry.
-- `termkey.c:peekkey()` iterates through all drivers, it finds
- `TERMKEY_RES_NONE` for the ti driver and falls back to the CSI driver.
----
- src/nvim/tui/tui.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/src/nvim/tui/tui.c b/src/nvim/tui/tui.c
-index 2dfe7faa04c..70e19e1d932 100644
---- a/src/nvim/tui/tui.c
-+++ b/src/nvim/tui/tui.c
-@@ -1813,6 +1813,12 @@ static const char *tui_tk_ti_getstr(const char *name, const char *value,
- if (value != NULL && strequal(stty_erase, value)) {
- return stty_erase[0] == DEL ? CTRL_H_STR : DEL_STR;
- }
-+ } else if (strequal(name, "key_mouse")) {
-+ DLOG("libtermkey:kmous=%s", value);
-+ // If key_mouse is found, libtermkey uses its terminfo driver (driver-ti.c)
-+ // for mouse input, which by accident only supports X10 protocol.
-+ // Force libtermkey to fallback to its CSI driver (driver-csi.c). #7948
-+ return NULL;
- }
-
- return value;
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2018-11-21 14:06:07 UTC (rev 409273)
+++ PKGBUILD 2018-11-21 14:06:24 UTC (rev 409274)
@@ -1,52 +0,0 @@
-# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
-# Contributor: Florian Walch <florian+aur at fwalch.com>
-# Contributor: Florian Hahn <flo at fhahn.com>
-
-pkgname=neovim
-pkgver=0.3.1
-pkgrel=1
-pkgdesc='Fork of Vim aiming to improve user experience, plugins, and GUIs'
-arch=('x86_64')
-url='https://neovim.io'
-license=('custom:neovim')
-depends=('jemalloc' 'libtermkey' 'libuv' 'msgpack-c' 'unibilium' 'libvterm' 'luajit')
-makedepends=('cmake' 'lua51-mpack' 'lua51-lpeg' 'gperf')
-optdepends=('python2-neovim: for Python 2 plugin support (see :help python)'
- 'python-neovim: for Python 3 plugin support (see :help python)'
- 'xclip: for clipboard support (or xsel) (see :help clipboard)'
- 'xsel: for clipboard support (or xclip) (see :help clipboard)')
-source=(https://github.com/neovim/neovim/archive/v${pkgver}.tar.gz)
-sha512sums=('42c541608509dc0335203ee1c008045f0eaeebce8e18dffc554ab22a029da700bba9b8c721bd9d68337ddb4a56f8cf034fad2a3eb88d36baf8295e6648fce506')
-install=neovim.install
-
-build() {
- mkdir -p "${srcdir}/build"
- cd "${srcdir}/build"
-
- cmake "../neovim-${pkgver}" \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DENABLE_JEMALLOC=ON
- make
-}
-
-check() {
- cd "${srcdir}/build"
- ./bin/nvim --version
- ./bin/nvim --headless -u NONE -i NONE -c ':quit'
-}
-
-package() {
- cd "${srcdir}/build"
- make DESTDIR="${pkgdir}" install
- cd "${srcdir}/neovim-${pkgver}"
- install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
- install -Dm644 runtime/nvim.desktop "${pkgdir}/usr/share/applications/nvim.desktop"
- install -Dm644 runtime/nvim.png "${pkgdir}/usr/share/pixmaps/nvim.png"
-
- # Make Arch vim packages work
- mkdir -p "${pkgdir}"/usr/share/vim
- echo "set runtimepath+=/usr/share/vim/vimfiles" > "${pkgdir}"/usr/share/nvim/sysinit.vim
-}
-
-# vim:set sw=2 sts=2 et:
Copied: neovim/repos/community-x86_64/PKGBUILD (from rev 409273, neovim/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2018-11-21 14:06:24 UTC (rev 409274)
@@ -0,0 +1,63 @@
+# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
+# Contributor: Florian Walch <florian+aur at fwalch.com>
+# Contributor: Florian Hahn <flo at fhahn.com>
+
+pkgname=neovim
+pkgver=0.3.1
+pkgrel=2
+pkgdesc='Fork of Vim aiming to improve user experience, plugins, and GUIs'
+arch=('x86_64')
+url='https://neovim.io'
+license=('custom:neovim')
+depends=('jemalloc' 'libtermkey' 'libuv' 'msgpack-c' 'unibilium' 'libvterm' 'luajit')
+makedepends=('cmake' 'ninja' 'lua51-mpack' 'lua51-lpeg' 'gperf')
+optdepends=('python2-neovim: for Python 2 plugin support (see :help python)'
+ 'python-neovim: for Python 3 plugin support (see :help python)'
+ 'xclip: for clipboard support (or xsel) (see :help clipboard)'
+ 'xsel: for clipboard support (or xclip) (see :help clipboard)')
+source=(https://github.com/neovim/neovim/archive/v${pkgver}.tar.gz
+ https://github.com/neovim/neovim/pull/8859/commits/4a46ab8de9a9a9aee36546740c45b9e65a9e7dc9.patch)
+sha512sums=('42c541608509dc0335203ee1c008045f0eaeebce8e18dffc554ab22a029da700bba9b8c721bd9d68337ddb4a56f8cf034fad2a3eb88d36baf8295e6648fce506'
+ '2b6bec34006995ed4b682b3fdef260935a6cc0857b41304571adb36d911f2597624c298d4375aa9ac9115733918f61d51c1cbd0de5799680ffff36b0d6219ded')
+install=neovim.install
+
+prepare() {
+ cd "${srcdir}/neovim-${pkgver}"
+
+ # https://github.com/neovim/neovim/issues/6023
+ patch -Np1 -i ../4a46ab8de9a9a9aee36546740c45b9e65a9e7dc9.patch
+}
+
+build() {
+ mkdir -p "${srcdir}/build"
+ cd "${srcdir}/build"
+
+ cmake "../neovim-${pkgver}" \
+ -G Ninja \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DENABLE_JEMALLOC=ON
+ cmake --build .
+}
+
+check() {
+ cd "${srcdir}/build"
+ ./bin/nvim --version
+ ./bin/nvim --headless -u NONE -i NONE -c ':quit'
+}
+
+package() {
+ cd "${srcdir}/build"
+ DESTDIR="${pkgdir}" cmake --build . --target install
+
+ cd "${srcdir}/neovim-${pkgver}"
+ install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+ install -Dm644 runtime/nvim.desktop "${pkgdir}/usr/share/applications/nvim.desktop"
+ install -Dm644 runtime/nvim.png "${pkgdir}/usr/share/pixmaps/nvim.png"
+
+ # Make Arch vim packages work
+ mkdir -p "${pkgdir}"/usr/share/vim
+ echo "set runtimepath+=/usr/share/vim/vimfiles" > "${pkgdir}"/usr/share/nvim/sysinit.vim
+}
+
+# vim:set sw=2 sts=2 et:
Deleted: neovim.install
===================================================================
--- neovim.install 2018-11-21 14:06:07 UTC (rev 409273)
+++ neovim.install 2018-11-21 14:06:24 UTC (rev 409274)
@@ -1,10 +0,0 @@
-# $1: new package version
-post_install() {
- echo ":: The Neovim executable is called 'nvim'."
- echo ":: If you are already familiar with Vim, see ':help nvim-from-vim'"
- echo " to get started."
- echo ":: If you have any questions, check the following page first:"
- echo " https://github.com/neovim/neovim/wiki/FAQ"
-}
-
-# vim:set sw=2 sts=2 et:
Copied: neovim/repos/community-x86_64/neovim.install (from rev 409273, neovim/trunk/neovim.install)
===================================================================
--- neovim.install (rev 0)
+++ neovim.install 2018-11-21 14:06:24 UTC (rev 409274)
@@ -0,0 +1,10 @@
+# $1: new package version
+post_install() {
+ echo ":: The Neovim executable is called 'nvim'."
+ echo ":: If you are already familiar with Vim, see ':help nvim-from-vim'"
+ echo " to get started."
+ echo ":: If you have any questions, check the following page first:"
+ echo " https://github.com/neovim/neovim/wiki/FAQ"
+}
+
+# vim:set sw=2 sts=2 et:
More information about the arch-commits
mailing list