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

[Anatol Pomozov]

    Date: Wednesday, April 26, 2017 @ 04:05:31
  Author: anatolik
Revision: 294716

upgpkg: vim 8.0.0586-1

Reenable gtk3 support in gvim https://github.com/vim/vim/issues/1199

Modified:
  vim/trunk/PKGBUILD
Deleted:
  vim/trunk/0001-Fix-widget-sizing-on-current-Gtk-3.22-branch.patch
  vim/trunk/0002-Further-fix-widget-sizing.patch

---------------------------------------------------------+
 0001-Fix-widget-sizing-on-current-Gtk-3.22-branch.patch |   39 --------------
 0002-Further-fix-widget-sizing.patch                    |   29 ----------
 PKGBUILD                                                |   14 +----
 3 files changed, 5 insertions(+), 77 deletions(-)

Deleted: 0001-Fix-widget-sizing-on-current-Gtk-3.22-branch.patch
===================================================================
--- 0001-Fix-widget-sizing-on-current-Gtk-3.22-branch.patch	2017-04-26 03:36:08 UTC (rev 294715)
+++ 0001-Fix-widget-sizing-on-current-Gtk-3.22-branch.patch	2017-04-26 04:05:31 UTC (rev 294716)
@@ -1,39 +0,0 @@
-From 0060136ccbe78ff791e5bd732510cff12094bec9 Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
-Date: Sun, 23 Oct 2016 21:12:15 +0200
-Subject: [PATCH 1/2] Fix widget sizing on current Gtk+ 3.22 branch
-
-Gtk recently started emitting configure events when repositioning child
-windows[1]. Events for the form's child windows bubble up the widget
-hierarchy, get caught by our configure event handler, and treated as if
-they were reporting the size of the form window. As a result, the shell
-was sized using far too small dimensions[2][3]. This change will be part
-of Gtk+ 3.22.2.
-
-Solve this by checking whether the configure event we get is really for
-the form widget.
-
-[1]: https://git.gnome.org/browse/gtk+/commit/?h=gtk-3-22&id=12579fe71b3b8f79eb9c1b80e429443bcc437dd0
-[2]: https://bugs.archlinux.org/task/51509
-[3]: https://bugzilla.gnome.org/show_bug.cgi?id=773387
----
- src/gui_gtk_x11.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/src/gui_gtk_x11.c b/src/gui_gtk_x11.c
-index 388464215fadc3b5..bf3c99ad9a043ad9 100644
---- a/src/gui_gtk_x11.c
-+++ b/src/gui_gtk_x11.c
-@@ -4429,6 +4429,9 @@ form_configure_event(GtkWidget *widget UNUSED,
- {
-     int usable_height = event->height;
- 
-+    if (event->window != gtk_widget_get_window (gui.formwin))
-+	return TRUE;
-+
-     /* When in a GtkPlug, we can't guarantee valid heights (as a round
-      * no. of char-heights), so we have to manually sanitise them.
-      * Widths seem to sort themselves out, don't ask me why.
--- 
-2.10.1
-

Deleted: 0002-Further-fix-widget-sizing.patch
===================================================================
--- 0002-Further-fix-widget-sizing.patch	2017-04-26 03:36:08 UTC (rev 294715)
+++ 0002-Further-fix-widget-sizing.patch	2017-04-26 04:05:31 UTC (rev 294716)
@@ -1,29 +0,0 @@
-From ba1eefe7a2f52e1d8d16b51f12c6aba57148fb19 Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
-Date: Mon, 24 Oct 2016 19:26:36 +0200
-Subject: [PATCH 2/2] Further fix widget sizing
-
-Follow-up by ofourdan in order to fix resizing on maximization. This
-makes the drawing area ignore configure events that weren't explicitly
-sent (such as from GtkForm).
----
- src/gui_gtk_x11.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/src/gui_gtk_x11.c b/src/gui_gtk_x11.c
-index bf3c99ad9a043ad9..71dc08ff3dc99c19 100644
---- a/src/gui_gtk_x11.c
-+++ b/src/gui_gtk_x11.c
-@@ -3099,6 +3099,9 @@ drawarea_configure_event_cb(GtkWidget	      *widget,
-     if (event->width == cur_width && event->height == cur_height)
- 	return TRUE;
- 
-+    if (event->send_event == FALSE)
-+	return TRUE;
-+
-     cur_width = event->width;
-     cur_height = event->height;
- 
--- 
-2.10.1
-

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-04-26 03:36:08 UTC (rev 294715)
+++ PKGBUILD	2017-04-26 04:05:31 UTC (rev 294716)
@@ -9,22 +9,18 @@
 
 pkgbase=vim
 pkgname=(vim gvim vim-runtime)
-pkgver=8.0.0427
+pkgver=8.0.0586
 _versiondir=80
 pkgrel=1
 arch=(i686 x86_64)
 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
         archlinux.vim
         vimdoc.hook)
-sha1sums=('ba62eaec8847892c8bb20fd9498ae0af05eda2ba'
-          'ca4a3bdf8b512336bff4af3ae93d95a8580e0eaf'
-          '04b86163bb379a7d42058d932aed3075ed49d2a9'
+sha1sums=('0215480a10362cbfc1494b074742dc2399dd3d11'
           '539bfaa0517dfff6d61c37f9c2d81a0db756a4c9'
           '94f7bb87b5d06bace86bc4b3ef1372813b4eedf2'
           'adc4c82b6c4097944e5a767270a772721455eb8c')
@@ -78,7 +74,7 @@
     --enable-gpm \
     --enable-acl \
     --with-x=yes \
-    --enable-gui=gtk2 \
+    --enable-gui=gtk3 \
     --enable-multibyte \
     --enable-cscope \
     --enable-netbeans \
@@ -181,7 +177,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' 'gtk2')
+  depends=("vim-runtime=${pkgver}-${pkgrel}" 'gpm' 'libxt' 'gtk')
   optdepends=('python2: Python 2 language support'
               'python: Python 3 language support'
               'ruby: Ruby language support'