fix screenshots segfaulting, fixes bug #158824

(Portage version: 2.1.2_rc3-r9)

4 files changed, 92 insertions, 1 deletions

diff --git a/gnome-extra/gnome-utils/ChangeLog b/gnome-extra/gnome-utils/ChangeLog
index 755c43bd1a8c..6141df162b24 100644
--- a/gnome-extra/gnome-utils/ChangeLog
+++ b/gnome-extra/gnome-utils/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-extra/gnome-utils
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-utils/ChangeLog,v 1.138 2006/12/21 13:18:04 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-utils/ChangeLog,v 1.139 2006/12/22 22:53:31 remi Exp $
+
+*gnome-utils-2.16.2-r1 (22 Dec 2006)
+
+  22 Dec 2006; Remi <remi@gentoo.org>
+  +files/gnome-utils-2.16.2-cannot_save_screenshots.diff,
+  +gnome-utils-2.16.2-r1.ebuild:
+  fix screenshots segfaulting, fixes bug #158824
 
   21 Dec 2006; Markus Rothe <corsair@gentoo.org> gnome-utils-2.16.2.ebuild:
   Stable on ppc64; bug #156662
diff --git a/gnome-extra/gnome-utils/files/digest-gnome-utils-2.16.2-r1 b/gnome-extra/gnome-utils/files/digest-gnome-utils-2.16.2-r1
new file mode 100644
index 000000000000..8653a6bdf564
--- /dev/null
+++ b/gnome-extra/gnome-utils/files/digest-gnome-utils-2.16.2-r1
@@ -0,0 +1,3 @@
+MD5 4e70e667a78fc5bee4a4b8f2f3ae8440 gnome-utils-2.16.2.tar.bz2 3369888
+RMD160 1be3877435cb228470252a25e65a5b85532906e2 gnome-utils-2.16.2.tar.bz2 3369888
+SHA256 40cf468e6393bc0840e1a38380742d9f91ad236440a4b240318c35f979809425 gnome-utils-2.16.2.tar.bz2 3369888
diff --git a/gnome-extra/gnome-utils/files/gnome-utils-2.16.2-cannot_save_screenshots.diff b/gnome-extra/gnome-utils/files/gnome-utils-2.16.2-cannot_save_screenshots.diff
new file mode 100644
index 000000000000..7a0a70a03536
--- /dev/null
+++ b/gnome-extra/gnome-utils/files/gnome-utils-2.16.2-cannot_save_screenshots.diff
@@ -0,0 +1,32 @@
+--- gnome-screenshot/screenshot-save.c	2006-06-11 12:19:30.000000000 +0100
++++ gnome-screenshot/screenshot-save.c~	2006-12-22 11:57:28.000000000 +0000
+@@ -96,16 +96,20 @@
+       gchar *message = NULL;
+       gchar *error_message = NULL;
+       GtkWidget *dialog;
++      GIOStatus status;
+ 
+-      g_io_channel_read_line (source, &error_message, NULL, NULL, NULL);
+-      message = g_strdup_printf ("Unable to save the screenshot to disk:\n\n%s", error_message);
+-      dialog = gtk_message_dialog_new (NULL, 0,
+-				       GTK_MESSAGE_ERROR,
+-				       GTK_BUTTONS_OK,
+-				       message);
+-      gtk_dialog_run (GTK_DIALOG (dialog));
+-      gtk_widget_destroy (dialog);
+-      exit (1);
++      status = g_io_channel_read_line (source, &error_message, NULL, NULL, NULL);
++      if (status == G_IO_STATUS_NORMAL)
++        {
++	  message = g_strdup_printf ("Unable to save the screenshot to disk:\n\n%s", error_message);
++          dialog = gtk_message_dialog_new (NULL, 0,
++				           GTK_MESSAGE_ERROR,
++				           GTK_BUTTONS_OK,
++				           message);
++          gtk_dialog_run (GTK_DIALOG (dialog));
++          gtk_widget_destroy (dialog);
++          exit (1);
++	}
+     }
+ 
+   (*save_callback) (save_user_data);
diff --git a/gnome-extra/gnome-utils/gnome-utils-2.16.2-r1.ebuild b/gnome-extra/gnome-utils/gnome-utils-2.16.2-r1.ebuild
new file mode 100644
index 000000000000..37f9ced48bf9
--- /dev/null
+++ b/gnome-extra/gnome-utils/gnome-utils-2.16.2-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-utils/gnome-utils-2.16.2-r1.ebuild,v 1.1 2006/12/22 22:53:31 remi Exp $
+
+inherit gnome2
+
+DESCRIPTION="Utilities for the Gnome2 desktop"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86"
+IUSE="hal ipv6"
+
+RDEPEND=">=x11-libs/gtk+-2.8
+	>=dev-libs/glib-2.9.1
+	>=gnome-base/gnome-desktop-2.9.91
+	>=gnome-base/libgnome-2.13.2
+	>=gnome-base/libgnomeui-2.13.7
+	>=gnome-base/libglade-2.3
+	>=gnome-base/libbonoboui-2.1
+	>=gnome-base/gnome-vfs-2.8.4
+	>=gnome-base/gnome-panel-2.13.4
+	>=gnome-base/libgnomeprint-2.8
+	>=gnome-base/libgnomeprintui-2.8
+	>=gnome-base/libgtop-2.12
+	>=gnome-base/libgnomecanvas-2.10.2
+	>=gnome-base/gconf-2
+	sys-fs/e2fsprogs
+	hal? ( >=sys-apps/hal-0.5 )"
+
+DEPEND="${RDEPEND}
+	app-text/scrollkeeper
+	>=dev-util/intltool-0.35
+	>=dev-util/pkgconfig-0.9"
+
+
+DOCS="AUTHORS ChangeLog NEWS README THANKS"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-cannot_save_screenshots.diff"
+}
+
+pkg_setup() {
+	G2CONF="${G2CONF} $(use_enable ipv6) $(use_enable hal)"
+}