Revision bump to fix optional avahi patch (bug #361183 by Fab) and apply Mandriva patch (also used in Arch) to prevent major problems like freezes and crashes on systems without UTF8 locale (upstream bug #616198). Remove old.

(Portage version: 2.1.9.45/cvs/Linux x86_64)

5 files changed, 213 insertions, 10 deletions

diff --git a/sys-apps/gnome-disk-utility/ChangeLog b/sys-apps/gnome-disk-utility/ChangeLog
index 3bec56715073..88e415ba8ae6 100644
--- a/sys-apps/gnome-disk-utility/ChangeLog
+++ b/sys-apps/gnome-disk-utility/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for sys-apps/gnome-disk-utility
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gnome-disk-utility/ChangeLog,v 1.42 2011/03/29 16:13:26 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gnome-disk-utility/ChangeLog,v 1.43 2011/04/03 11:37:27 pacho Exp $
+
+*gnome-disk-utility-2.32.1-r1 (03 Apr 2011)
+
+  03 Apr 2011; Pacho Ramos <pacho@gentoo.org>
+  -files/gnome-disk-utility-2.28.1-fix-potfiles_skip.patch,
+  +gnome-disk-utility-2.32.1-r1.ebuild,
+  +files/gnome-disk-utility-2.32.1-non-utf8-crash.patch,
+  +files/gnome-disk-utility-2.32.1-optional-avahi.patch:
+  Revision bump to fix optional avahi patch (bug #361183 by Fab) and apply
+  Mandriva patch (also used in Arch) to prevent major problems like freezes and
+  crashes on systems without UTF8 locale (upstream bug #616198). Remove old.
 
   29 Mar 2011; Christoph Mende <angelos@gentoo.org>
   gnome-disk-utility-2.32.1.ebuild:
diff --git a/sys-apps/gnome-disk-utility/files/gnome-disk-utility-2.28.1-fix-potfiles_skip.patch b/sys-apps/gnome-disk-utility/files/gnome-disk-utility-2.28.1-fix-potfiles_skip.patch
deleted file mode 100644
index 645933c2fd6e..000000000000
--- a/sys-apps/gnome-disk-utility/files/gnome-disk-utility-2.28.1-fix-potfiles_skip.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-Gentoo bug 313351
-GNOME #616019
---- po/POTFILES.skip~	2009-09-11 17:48:29.000000000 +0200
-+++ po/POTFILES.skip	2010-04-19 19:54:00.000000000 +0200
-@@ -1,4 +1,3 @@
--[encoding: UTF-8]
- # List of files where to skip translations.
- # Please keep this file sorted alphabetically.
- data/gdu-notification-daemon.desktop.in
diff --git a/sys-apps/gnome-disk-utility/files/gnome-disk-utility-2.32.1-non-utf8-crash.patch b/sys-apps/gnome-disk-utility/files/gnome-disk-utility-2.32.1-non-utf8-crash.patch
new file mode 100644
index 000000000000..262748bfb607
--- /dev/null
+++ b/sys-apps/gnome-disk-utility/files/gnome-disk-utility-2.32.1-non-utf8-crash.patch
@@ -0,0 +1,32 @@
+From 82489b51443e1280dfb9fb251ea2693df1809aec Mon Sep 17 00:00:00 2001
+From: Pascal Terjan <pterjan@mandriva.com>
+Date: Mon, 3 May 2010 14:01:22 +0200
+Subject: [PATCH] Force GduPresentable ids to be UTF-8 (#616198)
+
+GduPresentable created in gdu pool include intheir id some strings
+in local encoding like _("Peripheral Devices"). This patch
+enforces them to be UTF-8.
+
+This fixes a crash of gvfs-gdu-volume-monitor when USB devices are
+available on a non UTF-8 system.
+---
+ src/gdu/gdu-pool.c |    3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/src/gdu/gdu-pool.c b/src/gdu/gdu-pool.c
+index bd5eccf..cf6be53 100644
+--- a/src/gdu/gdu-pool.c
++++ b/src/gdu/gdu-pool.c
+@@ -473,6 +473,9 @@ gdu_pool_class_init (GduPoolClass *klass)
+                               g_cclosure_marshal_VOID__OBJECT,
+                               G_TYPE_NONE, 1,
+                               GDU_TYPE_PRESENTABLE);
++#ifdef HAVE_BIND_TEXTDOMAIN_CODESET
++	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
++#endif
+ }
+ 
+ static void
+-- 
+1.7.1
+
diff --git a/sys-apps/gnome-disk-utility/files/gnome-disk-utility-2.32.1-optional-avahi.patch b/sys-apps/gnome-disk-utility/files/gnome-disk-utility-2.32.1-optional-avahi.patch
new file mode 100644
index 000000000000..9caaf18042b9
--- /dev/null
+++ b/sys-apps/gnome-disk-utility/files/gnome-disk-utility-2.32.1-optional-avahi.patch
@@ -0,0 +1,92 @@
+From 674d9284bd09a9378f99ff19b2d2ffb8032ce8ea Mon Sep 17 00:00:00 2001
+From: Nirbheek Chauhan <nirbheek.chauhan@gmail.com>
+Date: Tue, 16 Mar 2010 10:58:55 +0530
+Subject: [PATCH] Make avahi support build-time configureable
+
+---
+ configure.ac                               |   21 ++++++++++++++++++++-
+ src/gdu-gtk/gdu-connect-to-server-dialog.c |    7 +++++++
+ 2 files changed, 27 insertions(+), 1 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 01be5f0..95f2087 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -150,7 +150,26 @@ PKG_CHECK_MODULES(LIBNOTIFY, [libnotify  >= $LIBNOTIFY_REQUIRED])
+ PKG_CHECK_MODULES(UDISKS, [udisks  >= $UDISKS_REQUIRED udisks < $UDISKS_NEXT_ABI_INCOMPATIBLE_VERSION])
+ PKG_CHECK_MODULES(X11, [x11])
+ PKG_CHECK_MODULES(LIBATASMART, [libatasmart >= 0.14])
+-PKG_CHECK_MODULES(AVAHI_UI, [avahi-ui >= $AVAHI_UI_REQUIRED])
++
++# *************
++# Avahi
++# *************
++
++have_avahi_ui=no
++AC_ARG_ENABLE(avahi-ui, AS_HELP_STRING([--disable-avahi-ui], [disable use of Avahi for server searching]))
++
++if test "x$enable_avahi_ui" != "xno"; then
++	PKG_CHECK_MODULES(AVAHI_UI, avahi-ui >= $AVAHI_UI_REQUIRED,
++			  [AC_DEFINE(HAVE_AVAHI_UI, 1, [Define if avahi-ui is available])
++			  have_avahi_ui=yes], have_avahi_ui=no)
++	if test "x$have_avahi_ui" = xno -a "x$enable_avahi_ui" = xyes; then
++		AC_MSG_ERROR([avahi-ui support requested but libraries not found])
++	fi
++fi
++
++AC_SUBST(AVAHI_UI_LIBS)
++AC_SUBST(AVAHI_UI_CFLAGS)
++AM_CONDITIONAL(ENABLE_AVAHI_UI, [test "$have_avahi_ui" = "yes"])
+ 
+ # *************
+ # Remote Access
+diff --git a/src/gdu-gtk/gdu-connect-to-server-dialog.c b/src/gdu-gtk/gdu-connect-to-server-dialog.c
+index 9ecf08c..5ad47bb 100644
+--- a/src/gdu-gtk/gdu-connect-to-server-dialog.c
++++ b/src/gdu-gtk/gdu-connect-to-server-dialog.c
+@@ -24,7 +24,10 @@
+ 
+ #include "config.h"
+ #include <glib/gi18n-lib.h>
++
++#ifdef HAVE_AVAHI_UI
+ #include <avahi-ui/avahi-ui.h>
++#endif
+ 
+ #include "gdu-connect-to-server-dialog.h"
+ 
+@@ -143,6 +146,7 @@ gdu_connect_to_server_dialog_get_address  (GduConnectToServerDialog *dialog)
+ 
+ /* ---------------------------------------------------------------------------------------------------- */
+ 
++#ifdef HAVE_AVAHI_UI
+ static void
+ on_dns_sd_clicked (GtkButton *button,
+                    gpointer   user_data)
+@@ -171,6 +175,7 @@ on_dns_sd_clicked (GtkButton *button,
+ 
+         gtk_widget_destroy (service_dialog);
+ }
++#endif
+ 
+ /* ---------------------------------------------------------------------------------------------------- */
+ 
+@@ -218,6 +223,7 @@ gdu_connect_to_server_dialog_constructed (GObject *object)
+                                         GTK_STOCK_CONNECT,
+                                         GTK_RESPONSE_OK);
+ 
++#ifdef HAVE_AVAHI_UI
+         button = gtk_button_new_with_mnemonic (_("_Browse..."));
+         image = gtk_image_new_from_stock (GTK_STOCK_NETWORK, GTK_ICON_SIZE_BUTTON);
+         gtk_button_set_image (GTK_BUTTON (button), image);
+@@ -235,6 +241,7 @@ gdu_connect_to_server_dialog_constructed (GObject *object)
+                           "clicked",
+                           G_CALLBACK (on_dns_sd_clicked),
+                           dialog);
++#endif
+ 
+         content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
+ 
+-- 
+1.6.4.4
+
diff --git a/sys-apps/gnome-disk-utility/gnome-disk-utility-2.32.1-r1.ebuild b/sys-apps/gnome-disk-utility/gnome-disk-utility-2.32.1-r1.ebuild
new file mode 100644
index 000000000000..cf0c6d9fec12
--- /dev/null
+++ b/sys-apps/gnome-disk-utility/gnome-disk-utility-2.32.1-r1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gnome-disk-utility/gnome-disk-utility-2.32.1-r1.ebuild,v 1.1 2011/04/03 11:37:27 pacho Exp $
+
+EAPI="3"
+GCONF_DEBUG="no"
+
+inherit autotools eutils gnome2
+
+DESCRIPTION="Disk Utility for GNOME using devicekit-disks"
+HOMEPAGE="http://git.gnome.org/browse/gnome-disk-utility"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+IUSE="avahi doc fat gnome-keyring nautilus remote-access"
+
+CDEPEND="
+	>=dev-libs/glib-2.22:2
+	>=dev-libs/dbus-glib-0.74
+	>=dev-libs/libunique-1:1
+	>=x11-libs/gtk+-2.20:2
+	=sys-fs/udisks-1.0*[remote-access?]
+	>=dev-libs/libatasmart-0.14
+	>=x11-libs/libnotify-0.6.1
+	avahi? ( >=net-dns/avahi-0.6.25[gtk] )
+	gnome-keyring? ( || (
+		gnome-base/libgnome-keyring
+		<gnome-base/gnome-keyring-2.29.4 ) )
+	nautilus? ( >=gnome-base/nautilus-2.24 )
+"
+RDEPEND="${CDEPEND}
+	x11-misc/xdg-utils
+	fat? ( sys-fs/dosfstools )
+	!!sys-apps/udisks"
+DEPEND="${CDEPEND}
+	sys-devel/gettext
+	gnome-base/gnome-common
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/scrollkeeper
+	app-text/gnome-doc-utils
+
+	>=dev-util/pkgconfig-0.9
+	>=dev-util/intltool-0.35
+	>=dev-util/gtk-doc-am-1.13
+
+	doc? ( >=dev-util/gtk-doc-1.3 )"
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		--disable-static
+		$(use_enable avahi avahi-ui)
+		$(use_enable nautilus)
+		$(use_enable remote-access)
+		$(use_enable gnome-keyring)"
+	DOCS="AUTHORS NEWS README TODO"
+}
+
+src_prepare() {
+	sed -i \
+		-e '/printf/s:nautilus:xdg-open:' \
+		src/palimpsest/gdu-section-volumes.c || die #350919
+
+	# Keep avahi optional, upstream bug #631986
+	epatch "${FILESDIR}/${PN}-2.32.1-optional-avahi.patch"
+
+	# Force GduPresentable ids to be UTF-8 to solve crashes and freezes, upstream bug #616198
+	epatch "${FILESDIR}/${PN}-2.32.1-non-utf8-crash.patch"
+
+	intltoolize --force --copy --automake || die
+	eautoreconf
+}
+
+src_install() {
+	gnome2_src_install
+	find "${ED}" -name "*.la" -delete || die "remove of la files failed"
+}