From f60b6a84f96e3e26a79b57cc06b95621a184e7360d021b58930cea20c554f703 Mon Sep 17 00:00:00 2001
From: OBS User autobuild <null@suse.de>
Date: Tue, 13 Oct 2009 15:23:15 +0000
Subject: [PATCH] checked in

OBS-URL: https://build.opensuse.org/package/show/editors/vim?expand=0&rev=8
---
 vim-7.2.257.patch | 61 -----------------------------------------------
 vim.changes       |  5 ----
 vim.spec          |  3 ---
 3 files changed, 69 deletions(-)
 delete mode 100644 vim-7.2.257.patch

diff --git a/vim-7.2.257.patch b/vim-7.2.257.patch
deleted file mode 100644
index f791a24..0000000
--- a/vim-7.2.257.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-To: vim-dev@vim.org
-Subject: Patch 7.2.257
-Fcc: outbox
-From: Bram Moolenaar <Bram@moolenaar.net>
-Mime-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-------------
-
-Patch 7.2.257
-Problem:    With GTK 2.17 lots of assertion error messages.
-Solution:   Remove check for static gravity. (Sebastian Droege)
-Files:	    src/gui_gtk_f.c
-
-
-*** ../vim-7.2.256/src/gui_gtk_f.c	2009-05-17 23:25:16.000000000 +0200
---- src/gui_gtk_f.c	2009-09-11 15:15:41.000000000 +0200
-***************
-*** 860,870 ****
-  gtk_form_set_static_gravity(GdkWindow *window, gboolean use_static)
-  {
-  #ifdef HAVE_GTK2
-!     gboolean static_gravity_supported;
-! 
-!     static_gravity_supported = gdk_window_set_static_gravities(window,
-! 							       use_static);
-!     g_return_if_fail(static_gravity_supported);
-  #else
-      XSetWindowAttributes xattributes;
-  
---- 860,868 ----
-  gtk_form_set_static_gravity(GdkWindow *window, gboolean use_static)
-  {
-  #ifdef HAVE_GTK2
-!     /* We don't check if static gravity is actually supported, because it
-!      * results in an annoying assertion error message. */
-!     gdk_window_set_static_gravities(window, use_static);
-  #else
-      XSetWindowAttributes xattributes;
-  
-*** ../vim-7.2.256/src/version.c	2009-09-11 15:46:20.000000000 +0200
---- src/version.c	2009-09-11 16:16:52.000000000 +0200
-***************
-*** 678,679 ****
---- 678,681 ----
-  {   /* Add new patch number below this line */
-+ /**/
-+     257,
-  /**/
-
--- 
-hundred-and-one symptoms of being an internet addict:
-231. You sprinkle Carpet Fresh on the rugs and put your vacuum cleaner
-     in the front doorway permanently so it always looks like you are
-     actually attempting to do something about that mess that has amassed
-     since you discovered the Internet.
-
- /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
-///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
-\\\        download, build and distribute -- http://www.A-A-P.org        ///
- \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
diff --git a/vim.changes b/vim.changes
index 9d438a8..d37b9da 100644
--- a/vim.changes
+++ b/vim.changes
@@ -1,8 +1,3 @@
--------------------------------------------------------------------
-Tue Oct 13 12:04:46 CEST 2009 - mmarek@suse.cz
-
-- add patch vim-7.2.257.patch to hide gtk assertions (bnc#536535).
-
 -------------------------------------------------------------------
 Mon Sep 28 15:32:01 CEST 2009 - werner@suse.de
 
diff --git a/vim.spec b/vim.spec
index e75c6cf..430e6cc 100644
--- a/vim.spec
+++ b/vim.spec
@@ -96,8 +96,6 @@ Patch22:        vim-7.1-remove-terrible-hack.patch
 Patch23:        vim-7.2-php.patch
 Patch24:        vim-7.2-lib64.patch
 Patch25:        vim-7.2-lzma-support.patch
-# PATCH-FIX-UPSTREAM vim-7.2.257.patch bnc#536535 mmarek@novell.com -- Hide gtk assertions.
-Patch26:        vim-7.2.257.patch
 Patch100:       vim-7.1.314-CVE-2009-0316-debian.patch
 # tbd???        %name-6.3-ga-utf8.diff
 # tbd???        %name-6.3-initvals.diff
@@ -315,7 +313,6 @@ unset p
 %patch23
 %patch24
 %patch25
-%patch26
 %patch100 -p1
 cp %{S:3} %{S:4} %{S:5} %{S:6} %{S:8} %{S:9} %{S:10} .
 rename no nb $RPM_BUILD_DIR/vim*/src/po/no.*