diff options
| -rw-r--r-- | libre/vim/PKGBUILD | 20 | ||||
| -rw-r--r-- | libre/vim/vimrc | 3 |
2 files changed, 16 insertions, 7 deletions
diff --git a/libre/vim/PKGBUILD b/libre/vim/PKGBUILD index cba886c6b..be9a95b26 100644 --- a/libre/vim/PKGBUILD +++ b/libre/vim/PKGBUILD @@ -1,15 +1,16 @@ -# $Id: PKGBUILD 272857 2016-08-02 12:22:34Z anatolik $ +# $Id: PKGBUILD 275792 2016-09-06 17:04:20Z anatolik $ # Maintainer (Arch): Anatol Pomozov <anatol.pomozov@gmail.com> # Contributor (Arch): Thomas Dziedzic <gostrc@gmail.com> # Contributor (Arch): Jan "heftig" Steffens <jan.steffens@gmail.com> # Contributor (Arch): tobias [ tobias at archlinux org ] # Contributor (Arch): Daniel J Griffiths <ghost1227@archlinux.us> +# Contributor (Arch): Christian Hesse <mail@eworm.de> # Maintainer: André Silva <emulatorman@parabola.nu> # Contributor: Márcio Silva <coadde@parabola.nu> pkgbase=vim pkgname=(vim gvim vim-runtime) -pkgver=7.4.2143 +pkgver=7.4.2334 _versiondir=74 pkgrel=1.parabola1 arch=(i686 x86_64 armv7h) @@ -19,8 +20,8 @@ makedepends=(gpm python2 python ruby libxt gtk2 gtk3 lua gawk tcl) source=(vim-$pkgver.tar.gz::http://github.com/vim/vim/archive/v$pkgver.tar.gz vimrc parabola.vim) -sha1sums=('5f877ed14f29926266a1c0120a0bb359a18b0a49' - '7bacf26cb66f6c36184a62bc306ef33bfe892686' +sha1sums=('3a1cf404cf54ec0ea09d86202f63d345cf3b284a' + '973f7ee95d96d2ed6967f79a2a565439bc3337ec' 'a72ca0f8d941ff221598091338d9c1bf75a3494b') prepare() { @@ -124,6 +125,9 @@ package_vim-runtime() { install -Dm644 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 -dm755 "${pkgdir}"/usr/share/licenses/vim-runtime ln -s /usr/share/vim/vim${_versiondir}/doc/uganda.txt \ @@ -160,6 +164,9 @@ package_vim() { # Runtime provided by runtime package rm -r "${pkgdir}"/usr/share/vim + # no desktop files and icons + rm -r "${pkgdir}"/usr/share/{applications,icons} + # license install -Dm644 runtime/doc/uganda.txt \ "${pkgdir}"/usr/share/licenses/${pkgname}/license.txt @@ -194,9 +201,8 @@ package_gvim() { # need to remove since this is provided by vim-runtime rm -r "${pkgdir}"/usr/share/vim - # freedesktop links - install -Dm644 runtime/gvim.desktop "${pkgdir}"/usr/share/applications/gvim.desktop - install -Dm644 runtime/vim48x48.png "${pkgdir}"/usr/share/pixmaps/gvim.png + # keep gvim desktop file only, remove vim + rm "${pkgdir}"/usr/share/applications/vim.desktop # license install -Dm644 runtime/doc/uganda.txt \ diff --git a/libre/vim/vimrc b/libre/vim/vimrc index fc67e7eb0..15c1f570c 100644 --- a/libre/vim/vimrc +++ b/libre/vim/vimrc @@ -10,6 +10,9 @@ " properly set to work with the Vim-related packages. runtime! parabola.vim +" do not load defaults if ~/.vimrc is missing +"let skip_defaults_vim=1 + " If you prefer the old-style vim functionalty, add 'runtime! vimrc_example.vim' " Or better yet, read /usr/share/vim/vim74/vimrc_example.vim or the vim manual " and configure vim to your own liking! |