[arch-commits] Commit in vim/repos/testing-x86_64 (9 files)
Evangelos Foutras
foutrelis at archlinux.org
Tue May 25 01:55:55 UTC 2021
Date: Tuesday, May 25, 2021 @ 01:55:55
Author: foutrelis
Revision: 416439
archrelease: copy trunk to testing-x86_64
Added:
vim/repos/testing-x86_64/PKGBUILD
(from rev 416438, vim/trunk/PKGBUILD)
vim/repos/testing-x86_64/archlinux.vim
(from rev 416438, vim/trunk/archlinux.vim)
vim/repos/testing-x86_64/vimdoc.hook
(from rev 416438, vim/trunk/vimdoc.hook)
vim/repos/testing-x86_64/vimrc
(from rev 416438, vim/trunk/vimrc)
Deleted:
vim/repos/testing-x86_64/PKGBUILD
vim/repos/testing-x86_64/archlinux.vim
vim/repos/testing-x86_64/use-perls-inline-functions.patch
vim/repos/testing-x86_64/vimdoc.hook
vim/repos/testing-x86_64/vimrc
----------------------------------+
PKGBUILD | 431 ++++++++++++++++++-------------------
archlinux.vim | 92 +++----
use-perls-inline-functions.patch | 84 -------
vimdoc.hook | 22 -
vimrc | 36 +--
5 files changed, 289 insertions(+), 376 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2021-05-25 01:55:47 UTC (rev 416438)
+++ PKGBUILD 2021-05-25 01:55:55 UTC (rev 416439)
@@ -1,217 +0,0 @@
-# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
-# Contributor: Anatol Pomozov <anatol.pomozov at gmail.com>
-# Contributor: Thomas Dziedzic <gostrc at gmail.com>
-# Contributor: Jan "heftig" Steffens <jan.steffens at gmail.com>
-# Contributor: tobias [ tobias at archlinux org ]
-# Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
-# Contributor: Christian Hesse <mail at eworm.de>
-# Contributor: Eli Schwartz <eschwartz at archlinux.org>
-
-pkgbase=vim
-pkgname=('vim' 'gvim' 'vim-runtime')
-pkgver=8.2.2885
-_versiondir=82
-pkgrel=1
-pkgdesc='Vi Improved, a highly configurable, improved version of the vi text editor'
-url='https://www.vim.org'
-arch=('x86_64')
-license=('custom:vim')
-makedepends=('glibc' 'libgcrypt' 'gpm' 'python2' 'python' 'ruby' 'libxt' 'gtk3' 'lua'
- 'gawk' 'tcl' 'pcre' 'zlib' 'libcanberra')
-source=(https://github.com/vim/vim/archive/v${pkgver}/${pkgbase}-${pkgver}.tar.gz
- use-perls-inline-functions.patch
- vimrc
- archlinux.vim
- vimdoc.hook)
-sha256sums=('029f2785403e9677a33100c959de4bde1c1f920f0b10b6f3870f92e8bb24045c'
- '709bd36ef796b5e71df08b4a76675ee86a7afdac5627f2dc05c320b8f012a385'
- 'b16e85e457397ab2043a7ee0a3c84307c6b4eac157fd0b721694761f25b3ed5b'
- 'cc3d931129854c298eb22e993ec14c2ad86cc1e70a08a64496f5e06559289972'
- '8e9656934d9d7793063230d15a689e10455e6db9b9fe73afa0f294792795d8ae')
-sha512sums=('daee8c437336b90ae50a2404c317ba39d62c70d18dd9e4bc20289e1ae3a614255d27b0da97e2ea363c4fb9b813d8a653111176ac1a2109745fb4e2c4be96b599'
- 'd09f21d139d1105276486e416a662baf611fd6e5c6574a3ccc469b06d90a83cb92ebf0b550c535b9d90d1378ca013f373b62f0d484a3a6918c9c0454028745a5'
- '4b5bed0813f22af9e158ea9aa56a4a9862dd786ba2d201f20159ccf652da6190164aaed0b6b7217d578f7b25c33a8adcc307bfcf3caa8d173a7ff29e2a00fee7'
- 'fe091d289d876f45319c898f6021ef86d6a238b540c225a279c46efc5c36fa7d868cd0cee73a111811c4be90df160f85340bb251be3a437727dbe5c699950363'
- 'a02ad0d66f300160911aeb81d8886c6c558436ac4ee3fcd161dd65c6b1e5d1f41b9005a7f5bb5ba68d57027fc1c8e43daabf055bd6207fb5a216a67f758df8d1')
-
-prepare() {
- (cd vim-${pkgver}/src
- # define the place for the global (g)vimrc file (set to /etc/vimrc)
- sed -E 's|^.*(#define SYS_.*VIMRC_FILE.*").*$|\1|g' -i feature.h
- sed -E 's|^.*(#define VIMRC_FILE.*").*$|\1|g' -i feature.h
- autoconf
- )
-
- # https://github.com/vim/vim/issues/8250
- patch -d vim-${pkgver} -Np1 <use-perls-inline-functions.patch
-
- cp -a vim-${pkgver} gvim-${pkgver}
-}
-
-build() {
- echo "Building vim..."
- (cd vim-${pkgver}
- ./configure \
- --prefix=/usr \
- --localstatedir=/var/lib/vim \
- --with-features=huge \
- --with-compiledby='Arch Linux' \
- --enable-gpm \
- --enable-acl \
- --with-x=no \
- --disable-gui \
- --enable-multibyte \
- --enable-cscope \
- --enable-netbeans \
- --enable-perlinterp=dynamic \
- --enable-pythoninterp=dynamic \
- --enable-python3interp=dynamic \
- --enable-rubyinterp=dynamic \
- --enable-luainterp=dynamic \
- --enable-tclinterp=dynamic \
- --disable-canberra
- make
- )
-
- echo "Building gvim..."
- (cd gvim-${pkgver}
- ./configure \
- --prefix=/usr \
- --localstatedir=/var/lib/vim \
- --with-features=huge \
- --with-compiledby='Arch Linux' \
- --enable-gpm \
- --enable-acl \
- --with-x=yes \
- --enable-gui=gtk3 \
- --enable-multibyte \
- --enable-cscope \
- --enable-netbeans \
- --enable-perlinterp=dynamic \
- --enable-pythoninterp=dynamic \
- --enable-python3interp=dynamic \
- --enable-rubyinterp=dynamic \
- --enable-luainterp=dynamic \
- --enable-tclinterp=dynamic \
- --enable-canberra
- make
- )
-}
-
-check() {
- cd vim-${pkgver}
- TERM=xterm make -j1 test
-}
-
-package_vim-runtime() {
- pkgdesc+=' (shared runtime)'
- optdepends=('sh: support for some tools and macros'
- 'python: demoserver example tool'
- 'gawk: mve tools upport')
- backup=('etc/vimrc')
-
- cd vim-${pkgver}
-
- make -j1 VIMRCLOC=/etc DESTDIR="${pkgdir}" install
- # man and bin files belong to 'vim'
- rm -r "${pkgdir}"/usr/share/man/ "${pkgdir}"/usr/bin/
-
- # Don't forget logtalk.dict
- install -Dm 644 runtime/ftplugin/logtalk.dict \
- "${pkgdir}"/usr/share/vim/vim${_versiondir}/ftplugin/logtalk.dict
-
- # rc files
- install -Dm 644 "${srcdir}"/vimrc "${pkgdir}"/etc/vimrc
- install -Dm 644 "${srcdir}"/archlinux.vim \
- "${pkgdir}"/usr/share/vim/vimfiles/archlinux.vim
-
- # rgb.txt file
- install -Dm 644 runtime/rgb.txt \
- "${pkgdir}"/usr/share/vim/vim${_versiondir}/rgb.txt
-
- # no desktop files and icons
- rm -r "${pkgdir}"/usr/share/{applications,icons}
-
- # license
- install -dm 755 "${pkgdir}"/usr/share/licenses/vim-runtime
- ln -s /usr/share/vim/vim${_versiondir}/doc/uganda.txt \
- "${pkgdir}"/usr/share/licenses/vim-runtime/license.txt
-
- # pacman hook for documentation helptags
- install -Dm 644 "${srcdir}"/vimdoc.hook "${pkgdir}"/usr/share/libalpm/hooks/vimdoc.hook
-}
-
-package_vim() {
- depends=("vim-runtime=${pkgver}-${pkgrel}" 'gpm' 'acl' 'glibc' 'libgcrypt' 'pcre'
- 'zlib')
- optdepends=('python2: Python 2 language support'
- 'python: Python 3 language support'
- 'ruby: Ruby language support'
- 'lua: Lua language support'
- 'perl: Perl language support'
- 'tcl: Tcl language support')
- conflicts=('gvim' 'vim-minimal' 'vim-python3')
- provides=('xxd' 'vim-minimal' 'vim-python3' 'vim-plugin-runtime')
- replaces=('vim-python3' 'vim-minimal')
-
- cd vim-${pkgver}
- make -j1 VIMRCLOC=/etc DESTDIR="${pkgdir}" install
-
- # provided by (n)vi in core
- rm "${pkgdir}"/usr/bin/{ex,view}
-
- # delete some manpages
- find "${pkgdir}"/usr/share/man -type d -name 'man1' 2>/dev/null | \
- while read _mandir; do
- cd "${_mandir}"
- rm -f ex.1 view.1 # provided by (n)vi
- rm -f evim.1 # this does not make sense if we have no GUI
- done
-
- # Runtime provided by runtime package
- rm -r "${pkgdir}"/usr/share/vim
-
- # remove gvim.desktop as not included
- rm "${pkgdir}"/usr/share/applications/gvim.desktop
-
- # license
- install -Dm 644 runtime/doc/uganda.txt \
- "${pkgdir}"/usr/share/licenses/${pkgname}/license.txt
-}
-
-package_gvim() {
- pkgdesc+=' (with advanced features, such as a GUI)'
- depends=("vim-runtime=${pkgver}-${pkgrel}" 'gpm' 'libxt' 'gtk3' 'glibc' 'libgcrypt' 'pcre'
- 'zlib' 'libcanberra')
- optdepends=('python2: Python 2 language support'
- 'python: Python 3 language support'
- 'ruby: Ruby language support'
- 'lua: Lua language support'
- 'perl: Perl language support'
- 'tcl: Tcl language support')
- provides=("vim=${pkgver}-${pkgrel}" "xxd" 'vim-plugin-runtime')
- conflicts=('vim-minimal' 'vim')
- replaces=('gvim-python3')
-
- cd gvim-${pkgver}
- make -j1 VIMRCLOC=/etc DESTDIR="${pkgdir}" install
-
- # provided by (n)vi in core
- rm "${pkgdir}"/usr/bin/{ex,view}
-
- # delete some manpages
- find "${pkgdir}"/usr/share/man -type d -name 'man1' 2>/dev/null | \
- while read _mandir; do
- cd "${_mandir}"
- rm -f ex.1 view.1 # provided by (n)vi
- done
-
- # need to remove since this is provided by vim-runtime
- rm -r "${pkgdir}"/usr/share/vim
-
- # license
- install -Dm 644 runtime/doc/uganda.txt \
- "${pkgdir}"/usr/share/licenses/${pkgname}/license.txt
-}
-
-# vim: ts=2 sw=2 et:
Copied: vim/repos/testing-x86_64/PKGBUILD (from rev 416438, vim/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2021-05-25 01:55:55 UTC (rev 416439)
@@ -0,0 +1,214 @@
+# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
+# Contributor: Anatol Pomozov <anatol.pomozov at gmail.com>
+# Contributor: Thomas Dziedzic <gostrc at gmail.com>
+# Contributor: Jan "heftig" Steffens <jan.steffens at gmail.com>
+# Contributor: tobias [ tobias at archlinux org ]
+# Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
+# Contributor: Christian Hesse <mail at eworm.de>
+# Contributor: Eli Schwartz <eschwartz at archlinux.org>
+
+pkgbase=vim
+pkgname=('vim' 'gvim' 'vim-runtime')
+pkgver=8.2.2885
+_versiondir=82
+pkgrel=2
+pkgdesc='Vi Improved, a highly configurable, improved version of the vi text editor'
+url='https://www.vim.org'
+arch=('x86_64')
+license=('custom:vim')
+makedepends=('glibc' 'libgcrypt' 'gpm' 'python2' 'python' 'ruby' 'libxt' 'gtk3' 'lua'
+ 'gawk' 'tcl' 'pcre' 'zlib' 'libcanberra')
+source=(https://github.com/vim/vim/archive/v${pkgver}/${pkgbase}-${pkgver}.tar.gz
+ vimrc
+ archlinux.vim
+ vimdoc.hook)
+sha256sums=('029f2785403e9677a33100c959de4bde1c1f920f0b10b6f3870f92e8bb24045c'
+ 'b16e85e457397ab2043a7ee0a3c84307c6b4eac157fd0b721694761f25b3ed5b'
+ 'cc3d931129854c298eb22e993ec14c2ad86cc1e70a08a64496f5e06559289972'
+ '8e9656934d9d7793063230d15a689e10455e6db9b9fe73afa0f294792795d8ae')
+sha512sums=('daee8c437336b90ae50a2404c317ba39d62c70d18dd9e4bc20289e1ae3a614255d27b0da97e2ea363c4fb9b813d8a653111176ac1a2109745fb4e2c4be96b599'
+ '4b5bed0813f22af9e158ea9aa56a4a9862dd786ba2d201f20159ccf652da6190164aaed0b6b7217d578f7b25c33a8adcc307bfcf3caa8d173a7ff29e2a00fee7'
+ 'fe091d289d876f45319c898f6021ef86d6a238b540c225a279c46efc5c36fa7d868cd0cee73a111811c4be90df160f85340bb251be3a437727dbe5c699950363'
+ 'a02ad0d66f300160911aeb81d8886c6c558436ac4ee3fcd161dd65c6b1e5d1f41b9005a7f5bb5ba68d57027fc1c8e43daabf055bd6207fb5a216a67f758df8d1')
+
+prepare() {
+ (cd vim-${pkgver}/src
+ # define the place for the global (g)vimrc file (set to /etc/vimrc)
+ sed -E 's|^.*(#define SYS_.*VIMRC_FILE.*").*$|\1|g' -i feature.h
+ sed -E 's|^.*(#define VIMRC_FILE.*").*$|\1|g' -i feature.h
+ autoconf
+ )
+ cp -a vim-${pkgver} gvim-${pkgver}
+}
+
+build() {
+ echo "Building vim..."
+ (cd vim-${pkgver}
+ ./configure \
+ --prefix=/usr \
+ --localstatedir=/var/lib/vim \
+ --with-features=huge \
+ --with-compiledby='Arch Linux' \
+ --enable-gpm \
+ --enable-acl \
+ --with-x=no \
+ --disable-gui \
+ --enable-multibyte \
+ --enable-cscope \
+ --enable-netbeans \
+ --enable-perlinterp \
+ --enable-pythoninterp=dynamic \
+ --enable-python3interp=dynamic \
+ --enable-rubyinterp=dynamic \
+ --enable-luainterp=dynamic \
+ --enable-tclinterp=dynamic \
+ --disable-canberra
+ make
+ )
+
+ echo "Building gvim..."
+ (cd gvim-${pkgver}
+ ./configure \
+ --prefix=/usr \
+ --localstatedir=/var/lib/vim \
+ --with-features=huge \
+ --with-compiledby='Arch Linux' \
+ --enable-gpm \
+ --enable-acl \
+ --with-x=yes \
+ --enable-gui=gtk3 \
+ --enable-multibyte \
+ --enable-cscope \
+ --enable-netbeans \
+ --enable-perlinterp \
+ --enable-pythoninterp=dynamic \
+ --enable-python3interp=dynamic \
+ --enable-rubyinterp=dynamic \
+ --enable-luainterp=dynamic \
+ --enable-tclinterp=dynamic \
+ --enable-canberra
+ make
+ )
+}
+
+check() {
+ cd vim-${pkgver}
+ TERM=xterm make -j1 test
+}
+
+package_vim-runtime() {
+ pkgdesc+=' (shared runtime)'
+ optdepends=('sh: support for some tools and macros'
+ 'python: demoserver example tool'
+ 'gawk: mve tools upport')
+ backup=('etc/vimrc')
+
+ cd vim-${pkgver}
+
+ make -j1 VIMRCLOC=/etc DESTDIR="${pkgdir}" install
+ # man and bin files belong to 'vim'
+ rm -r "${pkgdir}"/usr/share/man/ "${pkgdir}"/usr/bin/
+
+ # Don't forget logtalk.dict
+ install -Dm 644 runtime/ftplugin/logtalk.dict \
+ "${pkgdir}"/usr/share/vim/vim${_versiondir}/ftplugin/logtalk.dict
+
+ # rc files
+ install -Dm 644 "${srcdir}"/vimrc "${pkgdir}"/etc/vimrc
+ install -Dm 644 "${srcdir}"/archlinux.vim \
+ "${pkgdir}"/usr/share/vim/vimfiles/archlinux.vim
+
+ # rgb.txt file
+ install -Dm 644 runtime/rgb.txt \
+ "${pkgdir}"/usr/share/vim/vim${_versiondir}/rgb.txt
+
+ # no desktop files and icons
+ rm -r "${pkgdir}"/usr/share/{applications,icons}
+
+ # license
+ install -dm 755 "${pkgdir}"/usr/share/licenses/vim-runtime
+ ln -s /usr/share/vim/vim${_versiondir}/doc/uganda.txt \
+ "${pkgdir}"/usr/share/licenses/vim-runtime/license.txt
+
+ # pacman hook for documentation helptags
+ install -Dm 644 "${srcdir}"/vimdoc.hook "${pkgdir}"/usr/share/libalpm/hooks/vimdoc.hook
+}
+
+package_vim() {
+ # TODO: move perl back into optdeps after --enable-perlinterp=dynamic
+ # starts working again (https://github.com/vim/vim/issues/8250)
+ depends=("vim-runtime=${pkgver}-${pkgrel}" 'gpm' 'acl' 'glibc' 'libgcrypt' 'pcre'
+ 'zlib' 'perl')
+ optdepends=('python2: Python 2 language support'
+ 'python: Python 3 language support'
+ 'ruby: Ruby language support'
+ 'lua: Lua language support'
+ #'perl: Perl language support'
+ 'tcl: Tcl language support')
+ conflicts=('gvim' 'vim-minimal' 'vim-python3')
+ provides=('xxd' 'vim-minimal' 'vim-python3' 'vim-plugin-runtime')
+ replaces=('vim-python3' 'vim-minimal')
+
+ cd vim-${pkgver}
+ make -j1 VIMRCLOC=/etc DESTDIR="${pkgdir}" install
+
+ # provided by (n)vi in core
+ rm "${pkgdir}"/usr/bin/{ex,view}
+
+ # delete some manpages
+ find "${pkgdir}"/usr/share/man -type d -name 'man1' 2>/dev/null | \
+ while read _mandir; do
+ cd "${_mandir}"
+ rm -f ex.1 view.1 # provided by (n)vi
+ rm -f evim.1 # this does not make sense if we have no GUI
+ done
+
+ # Runtime provided by runtime package
+ rm -r "${pkgdir}"/usr/share/vim
+
+ # remove gvim.desktop as not included
+ rm "${pkgdir}"/usr/share/applications/gvim.desktop
+
+ # license
+ install -Dm 644 runtime/doc/uganda.txt \
+ "${pkgdir}"/usr/share/licenses/${pkgname}/license.txt
+}
+
+package_gvim() {
+ pkgdesc+=' (with advanced features, such as a GUI)'
+ # TODO: move perl back into optdeps after --enable-perlinterp=dynamic
+ # starts working again (https://github.com/vim/vim/issues/8250)
+ depends=("vim-runtime=${pkgver}-${pkgrel}" 'gpm' 'libxt' 'gtk3' 'glibc' 'libgcrypt' 'pcre'
+ 'zlib' 'libcanberra' 'perl')
+ optdepends=('python2: Python 2 language support'
+ 'python: Python 3 language support'
+ 'ruby: Ruby language support'
+ 'lua: Lua language support'
+ #'perl: Perl language support'
+ 'tcl: Tcl language support')
+ provides=("vim=${pkgver}-${pkgrel}" "xxd" 'vim-plugin-runtime')
+ conflicts=('vim-minimal' 'vim')
+ replaces=('gvim-python3')
+
+ cd gvim-${pkgver}
+ make -j1 VIMRCLOC=/etc DESTDIR="${pkgdir}" install
+
+ # provided by (n)vi in core
+ rm "${pkgdir}"/usr/bin/{ex,view}
+
+ # delete some manpages
+ find "${pkgdir}"/usr/share/man -type d -name 'man1' 2>/dev/null | \
+ while read _mandir; do
+ cd "${_mandir}"
+ rm -f ex.1 view.1 # provided by (n)vi
+ done
+
+ # need to remove since this is provided by vim-runtime
+ rm -r "${pkgdir}"/usr/share/vim
+
+ # license
+ install -Dm 644 runtime/doc/uganda.txt \
+ "${pkgdir}"/usr/share/licenses/${pkgname}/license.txt
+}
+
+# vim: ts=2 sw=2 et:
Deleted: archlinux.vim
===================================================================
--- archlinux.vim 2021-05-25 01:55:47 UTC (rev 416438)
+++ archlinux.vim 2021-05-25 01:55:55 UTC (rev 416439)
@@ -1,46 +0,0 @@
-" The Arch Linux global vimrc - setting only a few sane defaults
-"
-" DO NOT EDIT THIS FILE. IT'S OVERWRITTEN UPON UPGRADES.
-"
-" Use /etc/vimrc for system-wide and $HOME/.vimrc for personal configuration
-" (for details see ':help initialization').
-"
-" Use :help '<option>' to see the documentation for the given option.
-
-" Use Vim defaults instead of 100% vi compatibility
-" Avoid side-effects when nocompatible has already been set.
-if &compatible
- set nocompatible
-endif
-
-set backspace=indent,eol,start
-set ruler
-set suffixes+=.aux,.bbl,.blg,.brf,.cb,.dvi,.idx,.ilg,.ind,.inx,.jpg,.log,.out,.png,.toc
-set suffixes-=.h
-set suffixes-=.obj
-
-" Move temporary files to a secure location to protect against CVE-2017-1000382
-if exists('$XDG_CACHE_HOME')
- let &g:directory=$XDG_CACHE_HOME
-else
- let &g:directory=$HOME . '/.cache'
-endif
-let &g:undodir=&g:directory . '/vim/undo//'
-let &g:backupdir=&g:directory . '/vim/backup//'
-let &g:directory.='/vim/swap//'
-" Create directories if they doesn't exist
-if ! isdirectory(expand(&g:directory))
- silent! call mkdir(expand(&g:directory), 'p', 0700)
-endif
-if ! isdirectory(expand(&g:backupdir))
- silent! call mkdir(expand(&g:backupdir), 'p', 0700)
-endif
-if ! isdirectory(expand(&g:undodir))
- silent! call mkdir(expand(&g:undodir), 'p', 0700)
-endif
-
-" Make shift-insert work like in Xterm
-if has('gui_running')
- map <S-Insert> <MiddleMouse>
- map! <S-Insert> <MiddleMouse>
-endif
Copied: vim/repos/testing-x86_64/archlinux.vim (from rev 416438, vim/trunk/archlinux.vim)
===================================================================
--- archlinux.vim (rev 0)
+++ archlinux.vim 2021-05-25 01:55:55 UTC (rev 416439)
@@ -0,0 +1,46 @@
+" The Arch Linux global vimrc - setting only a few sane defaults
+"
+" DO NOT EDIT THIS FILE. IT'S OVERWRITTEN UPON UPGRADES.
+"
+" Use /etc/vimrc for system-wide and $HOME/.vimrc for personal configuration
+" (for details see ':help initialization').
+"
+" Use :help '<option>' to see the documentation for the given option.
+
+" Use Vim defaults instead of 100% vi compatibility
+" Avoid side-effects when nocompatible has already been set.
+if &compatible
+ set nocompatible
+endif
+
+set backspace=indent,eol,start
+set ruler
+set suffixes+=.aux,.bbl,.blg,.brf,.cb,.dvi,.idx,.ilg,.ind,.inx,.jpg,.log,.out,.png,.toc
+set suffixes-=.h
+set suffixes-=.obj
+
+" Move temporary files to a secure location to protect against CVE-2017-1000382
+if exists('$XDG_CACHE_HOME')
+ let &g:directory=$XDG_CACHE_HOME
+else
+ let &g:directory=$HOME . '/.cache'
+endif
+let &g:undodir=&g:directory . '/vim/undo//'
+let &g:backupdir=&g:directory . '/vim/backup//'
+let &g:directory.='/vim/swap//'
+" Create directories if they doesn't exist
+if ! isdirectory(expand(&g:directory))
+ silent! call mkdir(expand(&g:directory), 'p', 0700)
+endif
+if ! isdirectory(expand(&g:backupdir))
+ silent! call mkdir(expand(&g:backupdir), 'p', 0700)
+endif
+if ! isdirectory(expand(&g:undodir))
+ silent! call mkdir(expand(&g:undodir), 'p', 0700)
+endif
+
+" Make shift-insert work like in Xterm
+if has('gui_running')
+ map <S-Insert> <MiddleMouse>
+ map! <S-Insert> <MiddleMouse>
+endif
Deleted: use-perls-inline-functions.patch
===================================================================
--- use-perls-inline-functions.patch 2021-05-25 01:55:47 UTC (rev 416438)
+++ use-perls-inline-functions.patch 2021-05-25 01:55:55 UTC (rev 416439)
@@ -1,84 +0,0 @@
-diff -upr vim-8.2.2885.orig/src/if_perl.xs vim-8.2.2885/src/if_perl.xs
---- vim-8.2.2885.orig/src/if_perl.xs 2021-05-24 23:56:15.000000000 +0300
-+++ vim-8.2.2885/src/if_perl.xs 2021-05-25 02:49:30.913667666 +0300
-@@ -37,13 +37,6 @@
-
- #include "vim.h"
-
--/* Work around for perl-5.18.
-- * Don't include "perl\lib\CORE\inline.h" for now,
-- * include it after Perl_sv_free2 is defined. */
--#ifdef DYNAMIC_PERL
--# define PERL_NO_INLINE_FUNCTIONS
--#endif
--
- #ifdef _MSC_VER
- // Work around for using MSVC and ActivePerl 5.18.
- # define __inline__ __inline
-@@ -651,66 +644,6 @@ static struct {
- {"", NULL},
- };
-
--/* Work around for perl-5.18.
-- * For now, only the definitions of S_SvREFCNT_dec are needed in
-- * "perl\lib\CORE\inline.h". */
--# if (PERL_REVISION == 5) && (PERL_VERSION >= 18)
--static void
--S_SvREFCNT_dec(pTHX_ SV *sv)
--{
-- if (LIKELY(sv != NULL)) {
-- U32 rc = SvREFCNT(sv);
-- if (LIKELY(rc > 1))
-- SvREFCNT(sv) = rc - 1;
-- else
-- Perl_sv_free2(aTHX_ sv, rc);
-- }
--}
--# endif
--
--/* perl-5.32 needs Perl_SvREFCNT_dec */
--# if (PERL_REVISION == 5) && (PERL_VERSION >= 32)
--# define Perl_SvREFCNT_dec S_SvREFCNT_dec
--# endif
--
--/* perl-5.26 also needs S_TOPMARK and S_POPMARK. */
--# if (PERL_REVISION == 5) && (PERL_VERSION >= 26)
--PERL_STATIC_INLINE I32
--S_TOPMARK(pTHX)
--{
-- DEBUG_s(DEBUG_v(PerlIO_printf(Perl_debug_log,
-- "MARK top %p %" IVdf "\n",
-- PL_markstack_ptr,
-- (IV)*PL_markstack_ptr)));
-- return *PL_markstack_ptr;
--}
--
--PERL_STATIC_INLINE I32
--S_POPMARK(pTHX)
--{
-- DEBUG_s(DEBUG_v(PerlIO_printf(Perl_debug_log,
-- "MARK pop %p %" IVdf "\n",
-- (PL_markstack_ptr-1),
-- (IV)*(PL_markstack_ptr-1))));
-- assert((PL_markstack_ptr > PL_markstack) || !"MARK underflow");
-- return *PL_markstack_ptr--;
--}
--# endif
--
--/* perl-5.32 needs Perl_POPMARK */
--# if (PERL_REVISION == 5) && (PERL_VERSION >= 32)
--# define Perl_POPMARK S_POPMARK
--
--/* perl-5.32 needs Perl_SvTRUE */
--PERL_STATIC_INLINE bool
--Perl_SvTRUE(pTHX_ SV *sv) {
-- if (!LIKELY(sv))
-- return FALSE;
-- SvGETMAGIC(sv);
-- return SvTRUE_nomg_NN(sv);
--}
--# endif
--
- /*
- * Make all runtime-links of perl.
- *
Deleted: vimdoc.hook
===================================================================
--- vimdoc.hook 2021-05-25 01:55:47 UTC (rev 416438)
+++ vimdoc.hook 2021-05-25 01:55:55 UTC (rev 416439)
@@ -1,11 +0,0 @@
-[Trigger]
-Operation = Install
-Operation = Upgrade
-Operation= Remove
-Type = Path
-Target = usr/share/vim/vimfiles/doc/
-
-[Action]
-Description = Updating Vim help tags...
-Exec = /usr/bin/vim -es --cmd ":helptags /usr/share/vim/vimfiles/doc" --cmd ":q"
-When = PostTransaction
Copied: vim/repos/testing-x86_64/vimdoc.hook (from rev 416438, vim/trunk/vimdoc.hook)
===================================================================
--- vimdoc.hook (rev 0)
+++ vimdoc.hook 2021-05-25 01:55:55 UTC (rev 416439)
@@ -0,0 +1,11 @@
+[Trigger]
+Operation = Install
+Operation = Upgrade
+Operation= Remove
+Type = Path
+Target = usr/share/vim/vimfiles/doc/
+
+[Action]
+Description = Updating Vim help tags...
+Exec = /usr/bin/vim -es --cmd ":helptags /usr/share/vim/vimfiles/doc" --cmd ":q"
+When = PostTransaction
Deleted: vimrc
===================================================================
--- vimrc 2021-05-25 01:55:47 UTC (rev 416438)
+++ vimrc 2021-05-25 01:55:55 UTC (rev 416439)
@@ -1,18 +0,0 @@
-" All system-wide defaults are set in $VIMRUNTIME/archlinux.vim (usually just
-" /usr/share/vim/vimfiles/archlinux.vim) and sourced by the call to :runtime
-" you can find below. If you wish to change any of those settings, you should
-" do it in this file (/etc/vimrc), since archlinux.vim will be overwritten
-" everytime an upgrade of the vim packages is performed. It is recommended to
-" make changes after sourcing archlinux.vim since it alters the value of the
-" 'compatible' option.
-
-" This line should not be removed as it ensures that various options are
-" properly set to work with the Vim-related packages.
-runtime! archlinux.vim
-
-" If you prefer the old-style vim functionalty, add 'runtime! vimrc_example.vim'
-" Or better yet, read /usr/share/vim/vim80/vimrc_example.vim or the vim manual
-" and configure vim to your own liking!
-
-" do not load defaults if ~/.vimrc is missing
-"let skip_defaults_vim=1
Copied: vim/repos/testing-x86_64/vimrc (from rev 416438, vim/trunk/vimrc)
===================================================================
--- vimrc (rev 0)
+++ vimrc 2021-05-25 01:55:55 UTC (rev 416439)
@@ -0,0 +1,18 @@
+" All system-wide defaults are set in $VIMRUNTIME/archlinux.vim (usually just
+" /usr/share/vim/vimfiles/archlinux.vim) and sourced by the call to :runtime
+" you can find below. If you wish to change any of those settings, you should
+" do it in this file (/etc/vimrc), since archlinux.vim will be overwritten
+" everytime an upgrade of the vim packages is performed. It is recommended to
+" make changes after sourcing archlinux.vim since it alters the value of the
+" 'compatible' option.
+
+" This line should not be removed as it ensures that various options are
+" properly set to work with the Vim-related packages.
+runtime! archlinux.vim
+
+" If you prefer the old-style vim functionalty, add 'runtime! vimrc_example.vim'
+" Or better yet, read /usr/share/vim/vim80/vimrc_example.vim or the vim manual
+" and configure vim to your own liking!
+
+" do not load defaults if ~/.vimrc is missing
+"let skip_defaults_vim=1
More information about the arch-commits
mailing list