diff options
| -rw-r--r-- | libre/vim/PKGBUILD | 22 | ||||
| -rw-r--r-- | libre/vim/vimrc | 7 |
2 files changed, 12 insertions, 17 deletions
diff --git a/libre/vim/PKGBUILD b/libre/vim/PKGBUILD index be9a95b26..e64466400 100644 --- a/libre/vim/PKGBUILD +++ b/libre/vim/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 275792 2016-09-06 17:04:20Z anatolik $ +# $Id: PKGBUILD 276651 2016-09-17 19:01:29Z 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> @@ -10,18 +10,18 @@ pkgbase=vim pkgname=(vim gvim vim-runtime) -pkgver=7.4.2334 -_versiondir=74 +pkgver=8.0.0005 +_versiondir=80 pkgrel=1.parabola1 arch=(i686 x86_64 armv7h) license=('custom:vim') url='http://www.vim.org' -makedepends=(gpm python2 python ruby libxt gtk2 gtk3 lua gawk tcl) +makedepends=(gpm python2 python ruby libxt gtk3 lua gawk tcl) source=(vim-$pkgver.tar.gz::http://github.com/vim/vim/archive/v$pkgver.tar.gz vimrc parabola.vim) -sha1sums=('3a1cf404cf54ec0ea09d86202f63d345cf3b284a' - '973f7ee95d96d2ed6967f79a2a565439bc3337ec' +sha1sums=('a18072d7c2e22fbd50c3a6b92075a21e2b616160' + '1030d4be309802375832b8b2313c69e8fe9724b9' 'a72ca0f8d941ff221598091338d9c1bf75a3494b') prepare() { @@ -68,7 +68,7 @@ build() { --enable-gpm \ --enable-acl \ --with-x=yes \ - --enable-gui=gtk2 \ + --enable-gui=gtk3 \ --enable-multibyte \ --enable-cscope \ --enable-netbeans \ @@ -82,12 +82,8 @@ build() { } check() { - # disable tests because they seem to freeze cd "${srcdir}"/vim-$pkgver - #make test - - cd "${srcdir}"/gvim-$pkgver - #make test + TERM=xterm make -j1 test } package_vim-runtime() { @@ -174,7 +170,7 @@ package_vim() { package_gvim() { pkgdesc='Vi Improved, a highly configurable, improved version of the vi text editor (with advanced features, such as a GUI)' - depends=("vim-runtime=${pkgver}-${pkgrel}" 'gpm' 'libxt' 'gtk2') + depends=("vim-runtime=${pkgver}-${pkgrel}" 'gpm' 'libxt' 'gtk3') optdepends=('python2: Python 2 language support' 'python: Python 3 language support' 'ruby: Ruby language support' diff --git a/libre/vim/vimrc b/libre/vim/vimrc index 15c1f570c..d2c5b0827 100644 --- a/libre/vim/vimrc +++ b/libre/vim/vimrc @@ -10,10 +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 +" 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 |