From 13ea07ff7311df29e5880e1463741ebc0ae6168d9d679f05997df8a425df62bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= <ismail@i10z.com>
Date: Sat, 12 Nov 2016 07:07:40 +0000
Subject: [PATCH] -

OBS-URL: https://build.opensuse.org/package/show/editors/vim?expand=0&rev=391
---
 bsc-1008800.patch | 25 +++++++++++++++++++++++++
 vim.changes       |  6 ++++++
 vim.spec          |  2 ++
 3 files changed, 33 insertions(+)
 create mode 100644 bsc-1008800.patch

diff --git a/bsc-1008800.patch b/bsc-1008800.patch
new file mode 100644
index 0000000..c643028
--- /dev/null
+++ b/bsc-1008800.patch
@@ -0,0 +1,25 @@
+Index: vim-8.0.0045/src/gui_gtk_x11.c
+===================================================================
+--- vim-8.0.0045.orig/src/gui_gtk_x11.c
++++ vim-8.0.0045/src/gui_gtk_x11.c
+@@ -3099,6 +3099,9 @@ drawarea_configure_event_cb(GtkWidget
+     if (event->width == cur_width && event->height == cur_height)
+ 	return TRUE;
+ 
++    if (!gtk_check_version(3, 22, 2) && event->send_event == FALSE)
++        return TRUE;
++
+     cur_width = event->width;
+     cur_height = event->height;
+ 
+@@ -4429,6 +4432,10 @@ form_configure_event(GtkWidget *widget U
+ {
+     int usable_height = event->height;
+ 
++    if (!gtk_check_version(3, 22, 2) &&
++        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.
diff --git a/vim.changes b/vim.changes
index e7e4d11..5e175fa 100644
--- a/vim.changes
+++ b/vim.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Nov  7 12:51:19 UTC 2016 - idonmez@suse.com
+
+- Add bsc-1008800.patch to fix gvim rendering with recent gtk+
+  update. Fixes bsc#1008800. Patch by Jan Alexander Steffens.
+
 -------------------------------------------------------------------
 Wed Oct 19 07:49:14 UTC 2016 - idonmez@suse.com
 
diff --git a/vim.spec b/vim.spec
index c688faa..f5062d5 100644
--- a/vim.spec
+++ b/vim.spec
@@ -92,6 +92,7 @@ Patch15:        %{name}-7.4-filetype_apparmor.patch
 Patch18:        %{name}-7.3-filetype_spec.patch
 Patch21:        %{name}-7.3-filetype_changes.patch
 Patch22:        %{name}-7.4-filetype_mine.patch
+Patch23:        bsc-1008800.patch
 Patch100:       vim73-no-static-libpython.patch
 
 %description
@@ -166,6 +167,7 @@ cp %{SOURCE23} runtime/syntax/apparmor.vim
 %patch18 -p1
 %patch21 -p1
 %patch22 -p1
+%patch23 -p1
 %patch100 -p1
 cp %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE8} %{SOURCE10} .