From 76b6ce853d9c2f3c38edc3340510fb58f77cb290 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 19 Sep 2013 12:20:01 -0500 Subject: [PATCH] Fix/workaround gtkstock.h deprecation (#1001676) --- avahi-0.6.31-gtkstock_deprecated.patch | 49 ++++++++++++++++++++++++++ avahi.spec | 9 ++++- 2 files changed, 57 insertions(+), 1 deletion(-) create mode 100644 avahi-0.6.31-gtkstock_deprecated.patch diff --git a/avahi-0.6.31-gtkstock_deprecated.patch b/avahi-0.6.31-gtkstock_deprecated.patch new file mode 100644 index 0000000..624827b --- /dev/null +++ b/avahi-0.6.31-gtkstock_deprecated.patch @@ -0,0 +1,49 @@ +diff -up avahi-0.6.31/avahi-ui/avahi-ui.c.gtk3 avahi-0.6.31/avahi-ui/avahi-ui.c +--- avahi-0.6.31/avahi-ui/avahi-ui.c.gtk3 2011-02-18 12:04:10.251546734 -0600 ++++ avahi-0.6.31/avahi-ui/avahi-ui.c 2013-09-19 12:06:45.103980125 -0500 +@@ -1032,8 +1032,8 @@ static void domain_button_clicked(GtkBut + 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)))); + +@@ -1164,7 +1164,7 @@ static void aui_service_dialog_init(AuiS + 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); +diff -up avahi-0.6.31/avahi-ui/bssh.c.gtk3 avahi-0.6.31/avahi-ui/bssh.c +--- avahi-0.6.31/avahi-ui/bssh.c.gtk3 2010-08-25 19:51:39.023153001 -0500 ++++ avahi-0.6.31/avahi-ui/bssh.c 2013-09-19 12:14:00.264372035 -0500 +@@ -146,19 +146,19 @@ int main(int argc, char*argv[]) { + 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 5b9064c..f49575a 100644 --- a/avahi.spec +++ b/avahi.spec @@ -10,7 +10,7 @@ Name: avahi Version: 0.6.31 -Release: 14%{?dist} +Release: 15%{?dist} Summary: Local network service discovery License: LGPLv2+ URL: http://avahi.org @@ -59,6 +59,9 @@ Requires(post): systemd-sysv Source0: http://avahi.org/download/%{name}-%{version}.tar.gz Patch0: avahi-0.6.30-mono-libdir.patch +# Fix/workaround gtkstock.h deprecation +Patch1: avahi-0.6.31-gtkstock_deprecated.patch + %description Avahi is a system which facilitates service discovery on a local network -- this means that you can plug your laptop or @@ -339,6 +342,7 @@ fashion with mDNS. %prep %setup -q %patch0 -p1 -b .mono-libdir +%patch1 -p1 -b .gtkstock_deprecated %build %configure \ @@ -646,6 +650,9 @@ fi %endif %changelog +* Thu Sep 19 2013 Rex Dieter 0.6.31-15 +- Fix/workaround gtkstock.h deprecation (#1001676) + * Mon Aug 26 2013 Jon Ciesla - 0.6.31-14 - libmng rebuild.