- added gtk3 patch (fixes avahi-ui-gtk3 build with recent gtk+3)

diff --git a/avahi-gtk3.patch b/avahi-gtk3.patch
new file mode 100644 (file)
index 0000000..ede84d2
--- /dev/null
+++ b/avahi-gtk3.patch
@@ -0,0 +1,95 @@
+--- avahi-0.6.31/avahi-ui/avahi-ui.c.orig      2011-02-18 19:04:10.251546734 +0100
++++ avahi-0.6.31/avahi-ui/avahi-ui.c   2013-11-22 23:15:26.702181607 +0100
+@@ -991,7 +991,11 @@
+     gtk_dialog_set_has_separator(GTK_DIALOG(p->domain_dialog), FALSE);
+ #endif
+ 
++#if GTK_CHECK_VERSION(3,0,0)
++    vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 8);
++#else
+     vbox = gtk_vbox_new(FALSE, 8);
++#endif
+     gtk_container_set_border_width(GTK_CONTAINER(vbox), 8);
+     gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(p->domain_dialog))), vbox, TRUE, TRUE, 0);
+ 
+@@ -1002,7 +1006,11 @@
+     g_signal_connect(p->domain_entry, "changed", G_CALLBACK(domain_entry_changed_callback), d);
+     gtk_box_pack_start(GTK_BOX(vbox), p->domain_entry, FALSE, FALSE, 0);
+ 
++#if GTK_CHECK_VERSION(3,0,0)
++    vbox2 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 8);
++#else
+     vbox2 = gtk_vbox_new(FALSE, 8);
++#endif
+     gtk_box_pack_start(GTK_BOX(vbox), vbox2, TRUE, TRUE, 0);
+ 
+     scrolled_window = gtk_scrolled_window_new(NULL, NULL);
+@@ -1032,8 +1040,8 @@
+     gtk_progress_bar_set_pulse_step(GTK_PROGRESS_BAR(p->domain_progress_bar), 0.1);
+     gtk_box_pack_end(GTK_BOX(vbox2), p->domain_progress_bar, FALSE, FALSE, 0);
+ 
+-    gtk_dialog_add_button(GTK_DIALOG(p->domain_dialog), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
+-    p->domain_ok_button = GTK_WIDGET(gtk_dialog_add_button(GTK_DIALOG(p->domain_dialog), GTK_STOCK_OK, GTK_RESPONSE_ACCEPT));
++    gtk_dialog_add_button(GTK_DIALOG(p->domain_dialog), _("_Cancel"), GTK_RESPONSE_CANCEL);
++    p->domain_ok_button = GTK_WIDGET(gtk_dialog_add_button(GTK_DIALOG(p->domain_dialog), _("_OK"), GTK_RESPONSE_ACCEPT));
+     gtk_dialog_set_default_response(GTK_DIALOG(p->domain_dialog), GTK_RESPONSE_ACCEPT);
+     gtk_widget_set_sensitive(p->domain_ok_button, is_valid_domain_suffix(gtk_entry_get_text(GTK_ENTRY(p->domain_entry))));
+ 
+@@ -1113,7 +1121,11 @@
+ 
+     gtk_container_set_border_width(GTK_CONTAINER(d), 5);
+ 
++#if GTK_CHECK_VERSION(3,0,0)
++    vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 8);
++#else
+     vbox = gtk_vbox_new(FALSE, 8);
++#endif
+     gtk_container_set_border_width(GTK_CONTAINER(vbox), 8);
+     gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(d))), vbox, TRUE, TRUE, 0);
+ 
+@@ -1123,7 +1135,11 @@
+     gtk_box_pack_start(GTK_BOX(vbox), p->domain_label, FALSE, FALSE, 0);
+ 
+ 
++#if GTK_CHECK_VERSION(3,0,0)
++    vbox2 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 8);
++#else
+     vbox2 = gtk_vbox_new(FALSE, 8);
++#endif
+     gtk_box_pack_start(GTK_BOX(vbox), vbox2, TRUE, TRUE, 0);
+ 
+     scrolled_window = gtk_scrolled_window_new(NULL, NULL);
+@@ -1164,7 +1180,7 @@
+     gtk_box_pack_end(GTK_BOX(vbox2), p->service_progress_bar, FALSE, FALSE, 0);
+ 
+     p->domain_button = gtk_button_new_with_mnemonic(_("_Domain..."));
+-    gtk_button_set_image(GTK_BUTTON(p->domain_button), gtk_image_new_from_stock(GTK_STOCK_NETWORK, GTK_ICON_SIZE_BUTTON));
++    gtk_button_set_image(GTK_BUTTON(p->domain_button), gtk_image_new_from_icon_name("network-workgroup", GTK_ICON_SIZE_BUTTON));
+     g_signal_connect(p->domain_button, "clicked", G_CALLBACK(domain_button_clicked), d);
+     gtk_box_pack_start(GTK_BOX(gtk_dialog_get_action_area(GTK_DIALOG(d))), p->domain_button, FALSE, TRUE, 0);
+     gtk_button_box_set_child_secondary(GTK_BUTTON_BOX(gtk_dialog_get_action_area(GTK_DIALOG(d))), p->domain_button, TRUE);
+--- avahi-0.6.31/avahi-ui/bssh.c.orig  2010-08-26 02:51:39.023153001 +0200
++++ avahi-0.6.31/avahi-ui/bssh.c       2013-11-22 23:17:41.635509278 +0100
+@@ -146,19 +146,19 @@
+             break;
+ 
+         case COMMAND_SHELL:
+-            d = aui_service_dialog_new(_("Choose Shell Server"), NULL, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_CONNECT, GTK_RESPONSE_ACCEPT, NULL);
++            d = aui_service_dialog_new(_("Choose Shell Server"), NULL, _("_Cancel"), GTK_RESPONSE_CANCEL, gtk_image_new_from_icon_name("network-workgroup", GTK_ICON_SIZE_BUTTON), GTK_RESPONSE_ACCEPT, NULL);
+             aui_service_dialog_set_browse_service_types(AUI_SERVICE_DIALOG(d), "_rfb._tcp", "_ssh._tcp", NULL);
+             aui_service_dialog_set_service_type_name(AUI_SERVICE_DIALOG(d), "_rfb._tcp", _("Desktop"));
+             aui_service_dialog_set_service_type_name(AUI_SERVICE_DIALOG(d), "_ssh._tcp", _("Terminal"));
+             break;
+ 
+         case COMMAND_VNC:
+-            d = aui_service_dialog_new(_("Choose VNC server"), NULL, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_CONNECT, GTK_RESPONSE_ACCEPT, NULL);
++            d = aui_service_dialog_new(_("Choose VNC server"), NULL, _("_Cancel"), GTK_RESPONSE_CANCEL, gtk_image_new_from_icon_name("network-workgroup", GTK_ICON_SIZE_BUTTON), GTK_RESPONSE_ACCEPT, NULL);
+             aui_service_dialog_set_browse_service_types(AUI_SERVICE_DIALOG(d), "_rfb._tcp", NULL);
+             break;
+ 
+         case COMMAND_SSH:
+-            d = aui_service_dialog_new(_("Choose SSH server"), NULL, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_CONNECT, GTK_RESPONSE_ACCEPT, NULL);
++            d = aui_service_dialog_new(_("Choose SSH server"), NULL, _("_Cancel"), GTK_RESPONSE_CANCEL, gtk_image_new_from_icon_name("network-workgroup", GTK_ICON_SIZE_BUTTON), GTK_RESPONSE_ACCEPT, NULL);
+             aui_service_dialog_set_browse_service_types(AUI_SERVICE_DIALOG(d), "_ssh._tcp", NULL);
+             break;
+     }

diff --git a/avahi.spec b/avahi.spec
index 5adc81be4a0a0ee27c8dc5cf8fda697576f2ad99..1fe627bdc78836b7871dc1bd2b6de2eec904b3d3 100644 (file)
--- a/avahi.spec
+++ b/avahi.spec
@@ -52,6 +52,7 @@ Patch5:               %{name}-dhclient_hooks.patch
 Patch6:                %{name}-autoipd-sbin_ip.patch
 Patch7:                01_%{name}-daemon.conf.patch
 Patch8:                %{name}-core-reserve-space-for-record-data-when-size-estimate.patch
+Patch9:                %{name}-gtk3.patch
 URL:           http://avahi.org/
 BuildRequires: autoconf >= 2.63
 BuildRequires: automake >= 1:1.11
@@ -656,6 +657,7 @@ Narzędzia linii poleceń korzystające z avahi-client.
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
+%patch9 -p1
 
 %build
 %{__intltoolize}