From ccf8481401d3a17906fe5b0e4b37c85511a209b1 Mon Sep 17 00:00:00 2001 From: Remi Cardona Date: Fri, 22 Dec 2006 22:53:31 +0000 Subject: [PATCH] fix screenshots segfaulting, fixes bug #158824 Package-Manager: portage-2.1.2_rc3-r9 --- gnome-extra/gnome-utils/ChangeLog | 9 +++- gnome-extra/gnome-utils/Manifest | 19 +++++-- .../files/digest-gnome-utils-2.16.2-r1 | 3 ++ ...-utils-2.16.2-cannot_save_screenshots.diff | 32 ++++++++++++ .../gnome-utils/gnome-utils-2.16.2-r1.ebuild | 49 +++++++++++++++++++ 5 files changed, 107 insertions(+), 5 deletions(-) create mode 100644 gnome-extra/gnome-utils/files/digest-gnome-utils-2.16.2-r1 create mode 100644 gnome-extra/gnome-utils/files/gnome-utils-2.16.2-cannot_save_screenshots.diff create mode 100644 gnome-extra/gnome-utils/gnome-utils-2.16.2-r1.ebuild 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 + +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 gnome-utils-2.16.2.ebuild: Stable on ppc64; bug #156662 diff --git a/gnome-extra/gnome-utils/Manifest b/gnome-extra/gnome-utils/Manifest index f280c90b8ace..89d78f000309 100644 --- a/gnome-extra/gnome-utils/Manifest +++ b/gnome-extra/gnome-utils/Manifest @@ -1,3 +1,7 @@ +AUX gnome-utils-2.16.2-cannot_save_screenshots.diff 1227 RMD160 f7580fba8ca85d6eda8eb7e16d6c28d2de90e49a SHA1 d9cf857147e4d41005fae5e420d5099e113c73ef SHA256 cf131c9da908ab049423975cff37dc0a3bdfda7183dccbaf5f76d35738a122c7 +MD5 d8d05452270c8bfbbc10e77c86a1be77 files/gnome-utils-2.16.2-cannot_save_screenshots.diff 1227 +RMD160 f7580fba8ca85d6eda8eb7e16d6c28d2de90e49a files/gnome-utils-2.16.2-cannot_save_screenshots.diff 1227 +SHA256 cf131c9da908ab049423975cff37dc0a3bdfda7183dccbaf5f76d35738a122c7 files/gnome-utils-2.16.2-cannot_save_screenshots.diff 1227 DIST gnome-utils-2.14.0.tar.bz2 1881962 RMD160 799c47e836ed478734e3c42359b0c97fa3e3f319 SHA1 96dc3d95ab6ea0057a081403146209f4b7657034 SHA256 44586246763c9bfb2b67baedff8c800abde0898012e646ee580ce7a4c2d57e7e DIST gnome-utils-2.16.1.tar.bz2 3170280 RMD160 b8fb41d2d7758d53a7047c7d4981a75f687736e4 SHA1 13490482305cd1e5945ef3d897604cbdff225eb8 SHA256 7981ed72f2ddc9bfb9cc38cd6038da41b95a100d4451c9794561e9eea4cc42cd DIST gnome-utils-2.16.2.tar.bz2 3369888 RMD160 1be3877435cb228470252a25e65a5b85532906e2 SHA1 216cd579ad369d1dd3b77eed798419bfb7f86836 SHA256 40cf468e6393bc0840e1a38380742d9f91ad236440a4b240318c35f979809425 @@ -9,14 +13,18 @@ EBUILD gnome-utils-2.16.1.ebuild 1114 RMD160 735d182f4af4accbc0d1b441bd838f5b1fa MD5 2a2654cf15213c8264ba686a7fadb2d6 gnome-utils-2.16.1.ebuild 1114 RMD160 735d182f4af4accbc0d1b441bd838f5b1fa0dc6a gnome-utils-2.16.1.ebuild 1114 SHA256 e343aeca0ae01cd30fac470b9a54fca19c4ee2f0280abf927071a5860fc489f0 gnome-utils-2.16.1.ebuild 1114 +EBUILD gnome-utils-2.16.2-r1.ebuild 1211 RMD160 5df030a5e889d989cd112871c5ac7869a537011a SHA1 f86f25ea040bf7ae0b9ca5c540ec04b6d8c5130b SHA256 d2d0019d668d5fd26ec442bfc4646f10be4c70ab5c65ac1912d18b38a57f5e56 +MD5 b94a6373d667842b6061bfbda99754b4 gnome-utils-2.16.2-r1.ebuild 1211 +RMD160 5df030a5e889d989cd112871c5ac7869a537011a gnome-utils-2.16.2-r1.ebuild 1211 +SHA256 d2d0019d668d5fd26ec442bfc4646f10be4c70ab5c65ac1912d18b38a57f5e56 gnome-utils-2.16.2-r1.ebuild 1211 EBUILD gnome-utils-2.16.2.ebuild 1112 RMD160 7582e1249054870c059af7d6a6fb934cfcbff7c0 SHA1 635d31836a72d888028ec86b70f60a765284a6d2 SHA256 78139c6f4294518a0a267f624f45c29eb0afaf2253416ef718555a83c1ae0242 MD5 b8f876e9ceb97d364bde3082de44a471 gnome-utils-2.16.2.ebuild 1112 RMD160 7582e1249054870c059af7d6a6fb934cfcbff7c0 gnome-utils-2.16.2.ebuild 1112 SHA256 78139c6f4294518a0a267f624f45c29eb0afaf2253416ef718555a83c1ae0242 gnome-utils-2.16.2.ebuild 1112 -MISC ChangeLog 17124 RMD160 4cc57f971405187bf339d79ebd3add792d943b03 SHA1 4112b8cc6c84f4cd3fc842e0bfcd864d69c082af SHA256 732280c52391ddd21f25b49136e4f9e96d6764feec46ed637d79483f97ae506b -MD5 92ee47fc5e521fbb79295be7d0988642 ChangeLog 17124 -RMD160 4cc57f971405187bf339d79ebd3add792d943b03 ChangeLog 17124 -SHA256 732280c52391ddd21f25b49136e4f9e96d6764feec46ed637d79483f97ae506b ChangeLog 17124 +MISC ChangeLog 17338 RMD160 b3395e3c0f9503a0fb94942dd861847933467de9 SHA1 1be9f2ec1d01e9c3018a15aa28a541cf9228736e SHA256 99b77491099f3775e351b06c6e57b64bc7e30ad5aa773cefa464ce2f88f85464 +MD5 d1c06ce9f825dad311fb853a49ab6c68 ChangeLog 17338 +RMD160 b3395e3c0f9503a0fb94942dd861847933467de9 ChangeLog 17338 +SHA256 99b77491099f3775e351b06c6e57b64bc7e30ad5aa773cefa464ce2f88f85464 ChangeLog 17338 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158 @@ -30,3 +38,6 @@ SHA256 24e5ce781072d55fb4a5c33b888adca76d32eae8bd39e46589ba12ddc0e77543 files/di MD5 ea9e73f6606500dbf912fe40605de31c files/digest-gnome-utils-2.16.2 262 RMD160 4e3e423e0d6f654c120163db8a63f3904c52a2de files/digest-gnome-utils-2.16.2 262 SHA256 9aa96116accb3b330eb66069d5accbdd47de9df181b7f17dd4bfeb1e758231a0 files/digest-gnome-utils-2.16.2 262 +MD5 ea9e73f6606500dbf912fe40605de31c files/digest-gnome-utils-2.16.2-r1 262 +RMD160 4e3e423e0d6f654c120163db8a63f3904c52a2de files/digest-gnome-utils-2.16.2-r1 262 +SHA256 9aa96116accb3b330eb66069d5accbdd47de9df181b7f17dd4bfeb1e758231a0 files/digest-gnome-utils-2.16.2-r1 262 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)" +} -- 2.26.2