r23658 - in /desktop/unstable/vte/debian: changelog patches/01_transparent_crash.patch patches/series

joss at users.alioth.debian.org joss at users.alioth.debian.org
Fri Apr 9 16:37:29 UTC 2010


Author: joss
Date: Fri Apr  9 16:37:29 2010
New Revision: 23658

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=23658
Log:
01_transparent_crash.patch: patch by Tetralet to fix a crash when 
the background file is missing, or when the transparent background 
has no root window. Closes: #576624.

Added:
    desktop/unstable/vte/debian/patches/01_transparent_crash.patch
Modified:
    desktop/unstable/vte/debian/changelog
    desktop/unstable/vte/debian/patches/series

Modified: desktop/unstable/vte/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/vte/debian/changelog?rev=23658&op=diff
==============================================================================
--- desktop/unstable/vte/debian/changelog [utf-8] (original)
+++ desktop/unstable/vte/debian/changelog [utf-8] Fri Apr  9 16:37:29 2010
@@ -1,3 +1,11 @@
+vte (1:0.24.0-2) unstable; urgency=low
+
+  * 01_transparent_crash.patch: patch by Tetralet to fix a crash when 
+    the background file is missing, or when the transparent background 
+    has no root window. Closes: #576624.
+
+ -- Josselin Mouette <joss at debian.org>  Fri, 09 Apr 2010 18:23:02 +0200
+
 vte (1:0.24.0-1) unstable; urgency=low
 
   * New upstream stable release:

Added: desktop/unstable/vte/debian/patches/01_transparent_crash.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/vte/debian/patches/01_transparent_crash.patch?rev=23658&op=file
==============================================================================
--- desktop/unstable/vte/debian/patches/01_transparent_crash.patch (added)
+++ desktop/unstable/vte/debian/patches/01_transparent_crash.patch [utf-8] Fri Apr  9 16:37:29 2010
@@ -1,0 +1,29 @@
+GNOME #614910; set_background_image does not accept None in Python bindings
+Debian #576624; Segfault when loading the background pixbuf failed
+Patch author: Tetralet <tetralet AT gmail DOT com>
+
+--- vte-0.24.0.orig/src/vtebg.c
++++ vte-0.24.0/src/vtebg.c
+@@ -469,6 +469,8 @@
+ 			item->source_file = g_strdup(source_file);
+ 			pixbuf = gdk_pixbuf_new_from_file(source_file, NULL);
+ 		}
++		if (!pixbuf)
++			return NULL;
+ 		break;
+ 	default:
+ 		g_assert_not_reached();
+@@ -479,8 +481,11 @@
+ 		width = gdk_pixbuf_get_width(pixbuf);
+ 		height = gdk_pixbuf_get_height(pixbuf);
+ 	} else {
+-		width = cairo_xlib_surface_get_width(bg->root_surface);
+-		height = cairo_xlib_surface_get_height(bg->root_surface);
++		if (bg->root_surface) {
++			width = cairo_xlib_surface_get_width(bg->root_surface);
++			height = cairo_xlib_surface_get_height(bg->root_surface);
++		} else
++			return NULL;
+ 	}
+ 
+ 	item->surface =

Modified: desktop/unstable/vte/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/vte/debian/patches/series?rev=23658&op=diff
==============================================================================
--- desktop/unstable/vte/debian/patches/series [utf-8] (original)
+++ desktop/unstable/vte/debian/patches/series [utf-8] Fri Apr  9 16:37:29 2010
@@ -1,3 +1,4 @@
+01_transparent_crash.patch
 12_python_reaper.patch
 25_optional-ncurses.patch
 60_termcap-home-end.patch




More information about the pkg-gnome-commits mailing list