Date: Tuesday, September 6, 2016 @ 17:04:20 Author: anatolik Revision: 275792
upgpkg: vim 7.4.2334-1 Modified: vim/trunk/PKGBUILD vim/trunk/vimrc ----------+ PKGBUILD | 18 ++++++++++++------ vimrc | 3 +++ 2 files changed, 15 insertions(+), 6 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2016-09-06 16:10:28 UTC (rev 275791) +++ PKGBUILD 2016-09-06 17:04:20 UTC (rev 275792) @@ -4,10 +4,11 @@ # Contributor: Jan "heftig" Steffens <[email protected]> # Contributor: tobias [ tobias at archlinux org ] # Contributor: Daniel J Griffiths <[email protected]> +# Contributor: Christian Hesse <[email protected]> pkgbase=vim pkgname=(vim gvim vim-runtime) -pkgver=7.4.2143 +pkgver=7.4.2334 _versiondir=74 pkgrel=1 arch=(i686 x86_64) @@ -17,8 +18,8 @@ source=(vim-$pkgver.tar.gz::http://github.com/vim/vim/archive/v$pkgver.tar.gz vimrc archlinux.vim) -sha1sums=('5f877ed14f29926266a1c0120a0bb359a18b0a49' - '15ebf3f48693f1f219fe2d8edb7643683139eb6b' +sha1sums=('3a1cf404cf54ec0ea09d86202f63d345cf3b284a' + 'b8ca9132826e53cd14431ef9767e4fd820faa782' '94f7bb87b5d06bace86bc4b3ef1372813b4eedf2') prepare() { @@ -120,6 +121,9 @@ 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 \ @@ -156,6 +160,9 @@ # 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 @@ -190,9 +197,8 @@ # 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 \ Modified: vimrc =================================================================== --- vimrc 2016-09-06 16:10:28 UTC (rev 275791) +++ vimrc 2016-09-06 17:04:20 UTC (rev 275792) @@ -10,6 +10,9 @@ " properly set to work with the Vim-related packages. runtime! archlinux.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!
