[arch-commits] Commit in vim/trunk (PKGBUILD)

[Anatol Pomozov]

    Date: Wednesday, October 26, 2016 @ 20:10:28
  Author: anatolik
Revision: 279295

FS#51366: revert back to gtk2

gtk3 has a number of issues, let's revert vim back to gtk2
until upstream fixes the issues.

Modified:
  vim/trunk/PKGBUILD

----------+
 PKGBUILD |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-10-26 19:30:00 UTC (rev 279294)
+++ PKGBUILD	2016-10-26 20:10:28 UTC (rev 279295)
@@ -10,11 +10,11 @@
 pkgname=(vim gvim vim-runtime)
 pkgver=8.0.0046
 _versiondir=80
-pkgrel=2
+pkgrel=3
 arch=(i686 x86_64)
 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
@@ -31,8 +31,8 @@
 
   # 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
@@ -75,7 +75,7 @@
     --enable-gpm \
     --enable-acl \
     --with-x=yes \
-    --enable-gui=gtk3 \
+    --enable-gui=gtk2 \
     --enable-multibyte \
     --enable-cscope \
     --enable-netbeans \
@@ -175,7 +175,7 @@
 
 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'