Fix build with new gobject-introspection and gtk.

Obtained from:	Avahi git


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@14646 df743ca5-7f9a-e211-a948-0013205c9059

3 files changed, 46 insertions, 4 deletions

diff --git a/net/avahi-app/Makefile b/net/avahi-app/Makefile
index c5aa11c63..9c658c882 100644
--- a/net/avahi-app/Makefile
+++ b/net/avahi-app/Makefile
@@ -3,7 +3,7 @@
 # Whom:			Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/net/avahi-app/Makefile,v 1.11 2010/08/14 16:50:16 kwm Exp $
+#   $MCom: ports/net/avahi-app/Makefile,v 1.12 2010/09/19 20:18:45 kwm Exp $
 #
 
 PORTNAME=	avahi
@@ -127,9 +127,6 @@ avahi-post-patch:
 		${WRKSRC}/avahi-daemon/dbus-protocol.c
 	@${REINPLACE_CMD} -e 's|^_||g' \
 		${WRKSRC}/avahi-ui/*.desktop.in.in
-# Fix pre-generated gir file with new gobject-introspection
-	@${REINPLACE_CMD} -e 's|<repository version="1.0"|<repository version="1.2"|g' \
-		${WRKSRC}/avahi-gobject/AvahiCore-0.6.gir
 
 post-build: avahi-post-build
 
diff --git a/net/avahi-app/files/patch-avahi-gobject_AvahiCore-0.6.gir b/net/avahi-app/files/patch-avahi-gobject_AvahiCore-0.6.gir
new file mode 100644
index 000000000..2ee06f05d
--- /dev/null
+++ b/net/avahi-app/files/patch-avahi-gobject_AvahiCore-0.6.gir
@@ -0,0 +1,17 @@
+--- avahi-gobject/AvahiCore-0.6.gir.orig
++++ avahi-gobject/AvahiCore-0.6.gir
+@@ -1,10 +1,12 @@
+ <?xml version="1.0"?>
+-<repository version="1.0"
++<repository version="1.2"
+             xmlns="http://www.gtk.org/introspection/core/1.0"
+             xmlns:c="http://www.gtk.org/introspection/c/1.0"
+             xmlns:glib="http://www.gtk.org/introspection/glib/1.0">
+   <namespace name="AvahiCore" version="0.6" shared-library="avahi-core">
+-    <alias name="IfIndex" target="int" c:type="AvahiIfIndex"/>
++    <alias name="IfIndex" c:type="AvahiIfIndex">
++      <type name="gint" c:type="int"/>
++    </alias>
+     <enumeration name="Protocol" c:type="AvahiProtocol">
+       <member name="inet"
+               value="0"
diff --git a/net/avahi-app/files/patch-avahi-ui_avahi-ui.c b/net/avahi-app/files/patch-avahi-ui_avahi-ui.c
new file mode 100644
index 000000000..6b331dc9f
--- /dev/null
+++ b/net/avahi-app/files/patch-avahi-ui_avahi-ui.c
@@ -0,0 +1,28 @@
+--- avahi-ui/avahi-ui.c.orig
++++ avahi-ui/avahi-ui.c
+@@ -254,11 +254,13 @@ GtkWidget *aui_service_dialog_new_valist(
+     const gchar *button_text;
+     gint dr;
+ 
+-    GtkWidget *w = GTK_WIDGET(g_object_new(
++    GtkWidget *w = (GtkWidget*)g_object_new(
+                                       AUI_TYPE_SERVICE_DIALOG,
++#if !GTK_CHECK_VERSION (2,21,8)
+                                       "has-separator", FALSE,
++#endif
+                                       "title", title,
+-                                      NULL));
++                                      NULL);
+ 
+     if (parent)
+         gtk_window_set_transient_for(GTK_WINDOW(w), parent);
+@@ -985,7 +987,9 @@ static void domain_button_clicked(GtkButton *button G_GNUC_UNUSED, gpointer user
+     p->domain_dialog = gtk_dialog_new();
+     gtk_container_set_border_width(GTK_CONTAINER(p->domain_dialog), 5);
+     gtk_window_set_title(GTK_WINDOW(p->domain_dialog), _("Change domain"));
++#if !GTK_CHECK_VERSION(2,21,8)
+     gtk_dialog_set_has_separator(GTK_DIALOG(p->domain_dialog), FALSE);
++#endif
+ 
+     vbox = gtk_vbox_new(FALSE, 8);
+     gtk_container_set_border_width(GTK_CONTAINER(vbox), 8);