vim-8.0.0055-1.parabola1: updating version

2 files changed, 27 insertions, 11 deletions

diff --git a/libre/vim/PKGBUILD b/libre/vim/PKGBUILD
index 98901a06b..2e60fd625 100644
--- a/libre/vim/PKGBUILD
+++ b/libre/vim/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 279209 2016-10-24 17:49:35Z heftig $
+# $Id: PKGBUILD 279505 2016-10-30 22:41:55Z 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,31 +10,33 @@
 
 pkgbase=vim
 pkgname=(vim gvim vim-runtime)
-pkgver=8.0.0046
+pkgver=8.0.0055
 _versiondir=80
-pkgrel=2.parabola1
+pkgrel=1.parabola1
 arch=(i686 x86_64 armv7h)
 license=('custom:vim')
 url='http://www.vim.org'
-makedepends=(gpm python2 python ruby libxt gtk3 lua gawk tcl)
+makedepends=(gpm python2 python ruby libxt gtk2 lua gawk tcl)
 source=(vim-$pkgver.tar.gz::http://github.com/vim/vim/archive/v$pkgver.tar.gz
         0001-Fix-widget-sizing-on-current-Gtk-3.22-branch.patch
         0002-Further-fix-widget-sizing.patch
         vimrc
-        parabola.vim)
-sha1sums=('28b81536dfa01abd86f084dd6c02f5a2c47b7dec'
+        parabola.vim
+        vimdoc.hook)
+sha1sums=('20f144e8dc42bb2f5201b18b2f3a9990efc294f6'
           'ca4a3bdf8b512336bff4af3ae93d95a8580e0eaf'
           '04b86163bb379a7d42058d932aed3075ed49d2a9'
           '1030d4be309802375832b8b2313c69e8fe9724b9'
-          'a72ca0f8d941ff221598091338d9c1bf75a3494b')
+          'a72ca0f8d941ff221598091338d9c1bf75a3494b'
+          'adc4c82b6c4097944e5a767270a772721455eb8c')
 
 prepare() {
   cd vim-$pkgver/src
 
   # https://github.com/vim/vim/pull/1193
   # drop these if the problematic commits on gtk3 get reverted...
-  patch -Np2 -i "$srcdir"/0001-Fix-widget-sizing-on-current-Gtk-3.22-branch.patch
-  patch -Np2 -i "$srcdir"/0002-Further-fix-widget-sizing.patch
+  #patch -Np2 -i "$srcdir"/0001-Fix-widget-sizing-on-current-Gtk-3.22-branch.patch
+  #patch -Np2 -i "$srcdir"/0002-Further-fix-widget-sizing.patch
 
   # define the place for the global (g)vimrc file (set to /etc/vimrc)
   sed -i 's|^.*\(#define SYS_.*VIMRC_FILE.*"\) .*$|\1|' feature.h
@@ -77,7 +79,7 @@ build() {
     --enable-gpm \
     --enable-acl \
     --with-x=yes \
-    --enable-gui=gtk3 \
+    --enable-gui=gtk2 \
     --enable-multibyte \
     --enable-cscope \
     --enable-netbeans \
@@ -137,6 +139,9 @@ package_vim-runtime() {
   install -dm755 "${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 -Dm644 "${srcdir}"/vimdoc.hook "${pkgdir}"/usr/share/libalpm/hooks/vimdoc.hook
 }
 
 package_vim() {
@@ -179,7 +184,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' 'gtk3')
+  depends=("vim-runtime=${pkgver}-${pkgrel}" 'gpm' 'libxt' 'gtk2')
   optdepends=('python2: Python 2 language support'
               'python: Python 3 language support'
               'ruby: Ruby language support'
diff --git a/libre/vim/vimdoc.hook b/libre/vim/vimdoc.hook
new file mode 100644
index 000000000..b77d5929f
--- /dev/null
+++ b/libre/vim/vimdoc.hook
@@ -0,0 +1,11 @@
+[Trigger]
+Operation = Install
+Operation = Upgrade
+Operation= Remove
+Type = File
+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