Fix assert handling wrt upstream #5791. Thanks to Alexis Ballier.

(Portage version: 2.2_rc42/cvs/Linux x86_64)

3 files changed, 55 insertions, 3 deletions

diff --git a/xfce-base/xfdesktop/ChangeLog b/xfce-base/xfdesktop/ChangeLog
index 3cb5dabe48a8..425ad8ab04f2 100644
--- a/xfce-base/xfdesktop/ChangeLog
+++ b/xfce-base/xfdesktop/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for xfce-base/xfdesktop
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfdesktop/ChangeLog,v 1.149 2009/09/23 11:09:56 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfdesktop/ChangeLog,v 1.150 2009/09/27 16:14:18 ssuominen Exp $
+
+  27 Sep 2009; Samuli Suominen <ssuominen@gentoo.org>
+  xfdesktop-4.6.1-r1.ebuild, +files/xfdesktop-4.6.1-assert.patch:
+  Fix assert handling wrt upstream #5791. Thanks to Alexis Ballier.
 
 *xfdesktop-4.6.1-r1 (23 Sep 2009)
 
diff --git a/xfce-base/xfdesktop/files/xfdesktop-4.6.1-assert.patch b/xfce-base/xfdesktop/files/xfdesktop-4.6.1-assert.patch
new file mode 100644
index 000000000000..35fa6d26e2f7
--- /dev/null
+++ b/xfce-base/xfdesktop/files/xfdesktop-4.6.1-assert.patch
@@ -0,0 +1,47 @@
+Index: xfdesktop-4.6.1/src/xfdesktop-icon-view.c
+===================================================================
+--- xfdesktop-4.6.1.orig/src/xfdesktop-icon-view.c
++++ xfdesktop-4.6.1/src/xfdesktop-icon-view.c
+@@ -2143,12 +2143,14 @@ xfdesktop_icon_view_paint_icon(Xfdesktop
+     GdkRectangle pix_area, text_area, intersection, adj_area;
+     const gchar *label;
+     guint16 row, col;
++    gboolean ret = FALSE;
+     gchar x_offset = 0, y_offset = 0;
+     GdkColor *sh_text_col = NULL;
+     
+     /*TRACE("entering (%s)", xfdesktop_icon_peek_label(icon));*/
+-    
+-    g_return_if_fail(xfdesktop_icon_get_position(icon, &row, &col));
++
++    ret = xfdesktop_icon_get_position(icon, &row, &col);
++    g_return_if_fail(ret);
+     
+     if(g_list_find(icon_view->priv->selected_icons, icon)) {
+         if(GTK_WIDGET_FLAGS(widget) & GTK_HAS_FOCUS)
+@@ -2494,8 +2496,10 @@ xfdesktop_grid_unset_position_free(Xfdes
+                                    XfdesktopIcon *icon)
+ {
+     guint16 row, col;
+-    
+-    g_return_val_if_fail(xfdesktop_icon_get_position(icon, &row, &col), FALSE);
++    gboolean ret = FALSE;
++
++    ret = xfdesktop_icon_get_position(icon, &row, &col);
++    g_return_val_if_fail(ret, FALSE);
+     
+     return xfdesktop_grid_unset_position_free_raw(icon_view, row, col, icon);
+ }
+@@ -2738,9 +2742,11 @@ xfdesktop_icon_view_add_item_internal(Xf
+ {
+     guint16 row, col;
+     GdkRectangle fake_area;
++    gboolean ret = FALSE;
+     
+     /* sanity check: at this point this should be taken care of */
+-    g_return_if_fail(xfdesktop_icon_get_position(icon, &row, &col));
++    ret = xfdesktop_icon_get_position(icon, &row, &col);
++    g_return_if_fail(ret);
+     
+     xfdesktop_grid_unset_position_free(icon_view, icon);
+     
\ No newline at end of file
diff --git a/xfce-base/xfdesktop/xfdesktop-4.6.1-r1.ebuild b/xfce-base/xfdesktop/xfdesktop-4.6.1-r1.ebuild
index ed92dde954ac..8d963a215f52 100644
--- a/xfce-base/xfdesktop/xfdesktop-4.6.1-r1.ebuild
+++ b/xfce-base/xfdesktop/xfdesktop-4.6.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfdesktop/xfdesktop-4.6.1-r1.ebuild,v 1.1 2009/09/23 11:09:56 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfdesktop/xfdesktop-4.6.1-r1.ebuild,v 1.2 2009/09/27 16:14:18 ssuominen Exp $
 
 EAPI=2
 EAUTORECONF=yes
@@ -54,7 +54,8 @@ pkg_setup() {
 		$(use_enable doc xsltproc)
 		$(use_enable debug)"
 	DOCS="AUTHORS ChangeLog NEWS TODO README"
-	PATCHES=( "${FILESDIR}/${P}-automagic.patch" )
+	PATCHES=( "${FILESDIR}/${P}-automagic.patch"
+		"${FILESDIR}/${P}-assert.patch" )
 }
 
 src_prepare() {