Date: Monday, October 24, 2016 @ 17:49:35 Author: heftig Revision: 279209
8.0.0046-2 Added: vim/trunk/0002-Further-fix-widget-sizing.patch Modified: vim/trunk/0001-Fix-widget-sizing-on-current-Gtk-3.22-branch.patch vim/trunk/PKGBUILD ---------------------------------------------------------+ 0001-Fix-widget-sizing-on-current-Gtk-3.22-branch.patch | 8 +-- 0002-Further-fix-widget-sizing.patch | 29 ++++++++++++++ PKGBUILD | 9 +++- 3 files changed, 40 insertions(+), 6 deletions(-) Modified: 0001-Fix-widget-sizing-on-current-Gtk-3.22-branch.patch =================================================================== --- 0001-Fix-widget-sizing-on-current-Gtk-3.22-branch.patch 2016-10-24 16:01:19 UTC (rev 279208) +++ 0001-Fix-widget-sizing-on-current-Gtk-3.22-branch.patch 2016-10-24 17:49:35 UTC (rev 279209) @@ -1,7 +1,7 @@ -From feb38a618c1e1035f10ebde3cfa1f329daea67c3 Mon Sep 17 00:00:00 2001 +From 0060136ccbe78ff791e5bd732510cff12094bec9 Mon Sep 17 00:00:00 2001 From: "Jan Alexander Steffens (heftig)" <[email protected]> Date: Sun, 23 Oct 2016 21:12:15 +0200 -Subject: [PATCH] Fix widget sizing on current Gtk+ 3.22 branch +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 @@ -21,7 +21,7 @@ 1 file changed, 3 insertions(+) diff --git a/src/gui_gtk_x11.c b/src/gui_gtk_x11.c -index 388464215fadc3b5..35fee511a616db5a 100644 +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, @@ -29,7 +29,7 @@ int usable_height = event->height; + if (event->window != gtk_widget_get_window (gui.formwin)) -+ return; ++ 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. Added: 0002-Further-fix-widget-sizing.patch =================================================================== --- 0002-Further-fix-widget-sizing.patch (rev 0) +++ 0002-Further-fix-widget-sizing.patch 2016-10-24 17:49:35 UTC (rev 279209) @@ -0,0 +1,29 @@ +From ba1eefe7a2f52e1d8d16b51f12c6aba57148fb19 Mon Sep 17 00:00:00 2001 +From: "Jan Alexander Steffens (heftig)" <[email protected]> +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 2016-10-24 16:01:19 UTC (rev 279208) +++ PKGBUILD 2016-10-24 17:49:35 UTC (rev 279209) @@ -10,7 +10,7 @@ pkgname=(vim gvim vim-runtime) pkgver=8.0.0046 _versiondir=80 -pkgrel=1 +pkgrel=2 arch=(i686 x86_64) license=('custom:vim') url='http://www.vim.org' @@ -17,10 +17,12 @@ 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) sha1sums=('28b81536dfa01abd86f084dd6c02f5a2c47b7dec' - 'b566870f0b75f68a9ec3b5cc617f4c76843e8ce3' + 'ca4a3bdf8b512336bff4af3ae93d95a8580e0eaf' + '04b86163bb379a7d42058d932aed3075ed49d2a9' '539bfaa0517dfff6d61c37f9c2d81a0db756a4c9' '94f7bb87b5d06bace86bc4b3ef1372813b4eedf2') @@ -27,7 +29,10 @@ 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
