summaryrefslogtreecommitdiff
path: root/libre/vim
diff options
context:
space:
mode:
Diffstat (limited to 'libre/vim')
-rw-r--r--libre/vim/PKGBUILD21
1 files changed, 6 insertions, 15 deletions
diff --git a/libre/vim/PKGBUILD b/libre/vim/PKGBUILD
index 411992507..fd3c38983 100644
--- a/libre/vim/PKGBUILD
+++ b/libre/vim/PKGBUILD
@@ -11,22 +11,18 @@
pkgbase=vim
pkgname=(vim gvim vim-runtime)
-pkgver=8.0.0427
+pkgver=8.0.0586
_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 gtk2 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
- 0001-Fix-widget-sizing-on-current-Gtk-3.22-branch.patch
- 0002-Further-fix-widget-sizing.patch
vimrc
parabola.vim
vimdoc.hook)
-sha1sums=('ba62eaec8847892c8bb20fd9498ae0af05eda2ba'
- 'ca4a3bdf8b512336bff4af3ae93d95a8580e0eaf'
- '04b86163bb379a7d42058d932aed3075ed49d2a9'
+sha1sums=('0215480a10362cbfc1494b074742dc2399dd3d11'
'1030d4be309802375832b8b2313c69e8fe9724b9'
'a72ca0f8d941ff221598091338d9c1bf75a3494b'
'adc4c82b6c4097944e5a767270a772721455eb8c')
@@ -34,11 +30,6 @@ sha1sums=('ba62eaec8847892c8bb20fd9498ae0af05eda2ba'
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
@@ -80,7 +71,7 @@ build() {
--enable-gpm \
--enable-acl \
--with-x=yes \
- --enable-gui=gtk2 \
+ --enable-gui=gtk3 \
--enable-multibyte \
--enable-cscope \
--enable-netbeans \
@@ -185,7 +176,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'