diff -u vim-7.2.245/debian/changelog vim-7.2.245/debian/changelog --- vim-7.2.245/debian/changelog +++ vim-7.2.245/debian/changelog @@ -1,3 +1,10 @@ +vim (2:7.2.245-2ubuntu2.1) karmic-proposed; urgency=low + + * Fix gtk assertion errors by applying upstream patch #257 + (LP: #402188) + + -- Philip Muskovac Sun, 15 Nov 2009 13:01:01 +0100 + vim (2:7.2.245-2ubuntu2) karmic; urgency=low * Add lucid as a valid suite in changelogs and sources.list. only in patch2: unchanged: --- vim-7.2.245.orig/src/version.c +++ vim-7.2.245/src/version.c @@ -677,6 +677,8 @@ static int included_patches[] = { /* Add new patch number below this line */ /**/ + 257, +/**/ 245, /**/ 244, only in patch2: unchanged: --- vim-7.2.245.orig/src/gui_gtk_f.c +++ vim-7.2.245/src/gui_gtk_f.c @@ -860,11 +860,9 @@ 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); + /* 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;