From 1e1a52cc3abd74c8a64d8a9f383dd7599d501b6b Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado <emulatorman@parabola.nu>
Date: Tue, 25 Oct 2016 00:21:12 -0300
Subject: vim-8.0.0046-2.parabola1: updating version

---
 libre/vim/PKGBUILD | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

(limited to 'libre/vim/PKGBUILD')

diff --git a/libre/vim/PKGBUILD b/libre/vim/PKGBUILD
index 0027643f5..98901a06b 100644
--- a/libre/vim/PKGBUILD
+++ b/libre/vim/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 276977 2016-09-26 17:10:48Z anatolik $
+# $Id: PKGBUILD 279209 2016-10-24 17:49:35Z heftig $
 # 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,23 +10,32 @@
 
 pkgbase=vim
 pkgname=(vim gvim vim-runtime)
-pkgver=8.0.0013
+pkgver=8.0.0046
 _versiondir=80
-pkgrel=1.parabola1
+pkgrel=2.parabola1
 arch=(i686 x86_64 armv7h)
 license=('custom:vim')
 url='http://www.vim.org'
 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
+        0001-Fix-widget-sizing-on-current-Gtk-3.22-branch.patch
+        0002-Further-fix-widget-sizing.patch
         vimrc
         parabola.vim)
-sha1sums=('605be1eddc4501aea7c83b72a63b9ade6da5d43b'
+sha1sums=('28b81536dfa01abd86f084dd6c02f5a2c47b7dec'
+          'ca4a3bdf8b512336bff4af3ae93d95a8580e0eaf'
+          '04b86163bb379a7d42058d932aed3075ed49d2a9'
           '1030d4be309802375832b8b2313c69e8fe9724b9'
           'a72ca0f8d941ff221598091338d9c1bf75a3494b')
 
 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
+
   # define the place for the global (g)vimrc file (set to /etc/vimrc)
   sed -i 's|^.*\(#define SYS_.*VIMRC_FILE.*"\) .*$|\1|' feature.h
   sed -i 's|^.*\(#define VIMRC_FILE.*"\) .*$|\1|' feature.h
-- 
cgit v1.2.3