Committing missing patch, thanks to iamben for noticing.

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

3 files changed, 102 insertions, 5 deletions

diff --git a/sys-apps/gnome-disk-utility/ChangeLog b/sys-apps/gnome-disk-utility/ChangeLog
index a495ac1cf169..f8700fa251e8 100644
--- a/sys-apps/gnome-disk-utility/ChangeLog
+++ b/sys-apps/gnome-disk-utility/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/gnome-disk-utility
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gnome-disk-utility/ChangeLog,v 1.8 2010/06/13 17:04:56 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gnome-disk-utility/ChangeLog,v 1.9 2010/06/13 20:14:43 pacho Exp $
+
+  13 Jun 2010; Pacho Ramos <pacho@gentoo.org>
+  +files/gnome-disk-utility-2.30.1-optional-avahi.patch:
+  Committing missing patch, thanks to iamben for noticing.
 
 *gnome-disk-utility-2.30.1 (13 Jun 2010)
 
diff --git a/sys-apps/gnome-disk-utility/Manifest b/sys-apps/gnome-disk-utility/Manifest
index b09866958a7a..c154f6099dfc 100644
--- a/sys-apps/gnome-disk-utility/Manifest
+++ b/sys-apps/gnome-disk-utility/Manifest
@@ -2,16 +2,17 @@
 Hash: SHA1
 
 AUX gnome-disk-utility-2.28.1-fix-potfiles_skip.patch 316 RMD160 fabe483052e34e6ed89b5a5cc6cee04bda321efb SHA1 2289c9826fb04b657f622878e14d6d3dcde0a165 SHA256 1afc5c0228a725a079fd86f65ffa687f48678c65b72e97468e6d4082428baebc
+AUX gnome-disk-utility-2.30.1-optional-avahi.patch 3265 RMD160 f6e29b0421b5b7feb0fab96d8e0c4cc13785858b SHA1 9bcf767d9da569a9469e364b19776ca80ad4843f SHA256 84fa2f6ed58003b881a8169c2f253ea453afdc7f28beca583a76af8a27fd828d
 DIST gnome-disk-utility-2.28.1.tar.bz2 1539892 RMD160 a8c1586694fe567e759c3c6993b57bbb4d633870 SHA1 9e7951d810493fd3b2cfaf780c009dd8f9d5d718 SHA256 ed7d75f16b84cd251ad24385d57ea73805e3e8f193e517df42b0407004066db8
 DIST gnome-disk-utility-2.30.1.tar.bz2 2004770 RMD160 cfdfc38dd5856ddbf6111c6a861b0e434cbc2180 SHA1 a035a52b7fdc50dc557192b6b6fd2884f35e3a61 SHA256 df9b336c780b5d77ceda54e96f7c37c67645f5e73d48754ba0a8efba7c1836d7
 EBUILD gnome-disk-utility-2.28.1.ebuild 1386 RMD160 20352134939fff71f21e16c20757fdab13b6844a SHA1 11e6b936733a2b329acb82f09f9c01db553fea45 SHA256 85996c4d573950bbfadfdb5432c624c7ca0800721442eca50368461809e96007
 EBUILD gnome-disk-utility-2.30.1.ebuild 1524 RMD160 07ddcbe09c71cb5582182b6a305cea9d60d50eec SHA1 d77fb071cf3a134b1615edfcb59e10182b3815d9 SHA256 61896fb65aafb9ee2c0effe0612555e64c97725418cb3abbd52ad40f56b2ddc0
-MISC ChangeLog 1783 RMD160 17ec6419e3f4ec711f3d1b17fef1094c7c50cd22 SHA1 f574db381dc928ed0ecc68ec795eae6d136c4d7a SHA256 52e94b384e780be122a8e5e88d7190a6a16dd5ca11c3e56676a4dfd7fae89c6f
+MISC ChangeLog 1946 RMD160 49f5c2716fbb809d1a026dafc8c1e23c1471ad52 SHA1 1faf2c75873f3ee4ca4bb5b229492d317b49ac83 SHA256 6669c09ef80748594bd14767314b2358ae9aa301d666a33d1d5e9d9a4888a44b
 MISC metadata.xml 411 RMD160 a1c12c7620efc6350a471ec6dfa23c86603f4a63 SHA1 3a1d45a1c201852a8067b535b214777ad95754ab SHA256 194a3aa8e459cf8efd11f19a1368a0764877a356578aec429100ffd969cd34bf
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkwVD74ACgkQCaWpQKGI+9TJmwCeO9lxBCM/69nqov0QdVLxK/ib
-LggAnAlm34ToZkAGJv37l3FOf36qed5j
-=o0aP
+iEYEARECAAYFAkwVPDgACgkQCaWpQKGI+9Q6oQCeO6Ml6ItjUWfJMPe4eYAESfNj
+HMwAn2bKWak5IIqfyO+9NvKbSeVFibk/
+=uwpu
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/gnome-disk-utility/files/gnome-disk-utility-2.30.1-optional-avahi.patch b/sys-apps/gnome-disk-utility/files/gnome-disk-utility-2.30.1-optional-avahi.patch
new file mode 100644
index 000000000000..65c4726ada0d
--- /dev/null
+++ b/sys-apps/gnome-disk-utility/files/gnome-disk-utility-2.30.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], [disable use of Avahi for server searching]))
++
++if test "x$enable_avahi" != "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
+