[gentoo-commits] gentoo-x86 commit in sys-apps/gnome-disk-utility/files: gnome-disk-utility-2.91.6-optional-avahi.patch

[gentoo-commits] gentoo-x86 commit in sys-apps/gnome-disk-utility/files: gnome-disk-utility-2.91.6-optional-avahi.patch

[Nirbheek Chauhan (nirbheek)]

nirbheek    11/08/15 12:26:09

  Added:                gnome-disk-utility-2.91.6-optional-avahi.patch
  Log:
  Bump to 3.0.2, from gnome overlay for GNOME 3
  
  (Portage version: 2.2.0_alpha39_p14/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  sys-apps/gnome-disk-utility/files/gnome-disk-utility-2.91.6-optional-avahi.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/gnome-disk-utility/files/gnome-disk-utility-2.91.6-optional-avahi.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/gnome-disk-utility/files/gnome-disk-utility-2.91.6-optional-avahi.patch?rev=1.1&content-type=text/plain

Index: gnome-disk-utility-2.91.6-optional-avahi.patch
===================================================================
--- 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-gtk3 >= $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-gtk3 >= $AVAHI_UI_REQUIRED,
+			  [AC_DEFINE(HAVE_AVAHI_UI, 1, [Define if avahi-ui-gtk3 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-gtk3 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
--- 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));