Package: gwaei Version: 3.0.2-1 Severity: important Tags: patch User: ubuntu-de...@lists.ubuntu.com Usertags: origin-ubuntu ubuntu-patch oneiric
As reported in this Ubuntu bug: https://bugs.launchpad.net/ubuntu/+source/gwaei/+bug/831227 ... gwaei uses the gtk_hbox_new and gtk_vbox_new functions, which are deprecated in GTK+ 3.2. This causes a problem on 64-bit architectures due to the implicit conversion to int: http://wiki.debian.org/ImplicitPointerConversions Patch follows. * Avoid functions deprecated in GTK+ 3.2 (LP: #831227). diff -Nru gwaei-3.0.2/debian/patches/gtk-3.2.patch gwaei-3.0.2/debian/patches/gtk-3.2.patch --- gwaei-3.0.2/debian/patches/gtk-3.2.patch 1970-01-01 01:00:00.000000000 +0100 +++ gwaei-3.0.2/debian/patches/gtk-3.2.patch 2011-09-16 13:04:25.000000000 +0100 @@ -0,0 +1,175 @@ +Description: Avoid functions deprecated in GTK+ 3.2 +Author: Colin Watson <cjwat...@ubuntu.com> +Bug-Ubuntu: https://bugs.launchpad.net/bugs/831227 +Forwarded: no +Last-Update: 2011-09-16 + +Index: b/src/gwaei/dictionaryinstall.c +=================================================================== +--- a/src/gwaei/dictionaryinstall.c ++++ b/src/gwaei/dictionaryinstall.c +@@ -64,7 +64,7 @@ + editable = !di->builtin; + + //First row +- hbox = GTK_WIDGET (gtk_hbox_new (FALSE, 0)); ++ hbox = GTK_WIDGET (gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0)); + markup = g_strdup_printf(gettext("<b>%s Install Details</b>"), di->longname); + label = gtk_label_new (NULL); + gtk_label_set_markup (GTK_LABEL (label), markup); +@@ -74,7 +74,7 @@ + gtk_widget_show_all (GTK_WIDGET (hbox)); + + //Second row +- hbox = GTK_WIDGET (gtk_hbox_new (FALSE, 0)); ++ hbox = GTK_WIDGET (gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0)); + markup = g_strdup_printf("%s", di->description); + label = gtk_label_new (NULL); + gtk_widget_set_size_request (GTK_WIDGET (label), 300, -1); +@@ -88,7 +88,7 @@ + + //Third row + label = gtk_label_new (gettext("Filename: ")); +- hbox = GTK_WIDGET (gtk_hbox_new (FALSE, 0)); ++ hbox = GTK_WIDGET (gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0)); + gtk_box_pack_start (GTK_BOX (hbox), GTK_WIDGET (label), FALSE, FALSE, 0); + gtk_table_attach_defaults (GTK_TABLE (table), hbox, 0, 1, 0, 1); + entry = gtk_entry_new (); +@@ -100,7 +100,7 @@ + + //Forth row + label = gtk_label_new (gettext("Engine: ")); +- hbox = GTK_WIDGET (gtk_hbox_new (FALSE, 0)); ++ hbox = GTK_WIDGET (gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0)); + gtk_box_pack_start (GTK_BOX (hbox), GTK_WIDGET (label), FALSE, FALSE, 0); + gtk_table_attach_defaults (GTK_TABLE (table), hbox, 0, 1, 1, 2); + combobox = gtk_combo_box_new (); +@@ -118,11 +118,11 @@ + + //Fifth row + label = gtk_label_new (gettext("Source: ")); +- hbox = GTK_WIDGET (gtk_hbox_new (FALSE, 0)); ++ hbox = GTK_WIDGET (gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0)); + gtk_box_pack_start (GTK_BOX (hbox), GTK_WIDGET (label), FALSE, FALSE, 0); + gtk_table_attach_defaults (GTK_TABLE (table), hbox, 0, 1, 2, 3); + +- hbox = GTK_WIDGET (gtk_hbox_new (FALSE, 0)); ++ hbox = GTK_WIDGET (gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0)); + entry = gtk_entry_new (); + gtk_entry_set_text (GTK_ENTRY (entry), di->uri[GW_DICTINST_NEEDS_DOWNLOADING]); + g_signal_connect (G_OBJECT (entry), "changed", G_CALLBACK (gw_dictionaryinstall_source_entry_changed_cb), di); +@@ -142,7 +142,7 @@ + + //Sixth row + label = gtk_label_new (gettext("Encoding: ")); +- hbox = GTK_WIDGET (gtk_hbox_new (FALSE, 0)); ++ hbox = GTK_WIDGET (gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0)); + gtk_box_pack_start (GTK_BOX (hbox), GTK_WIDGET (label), FALSE, FALSE, 0); + gtk_table_attach_defaults (GTK_TABLE (table), hbox, 0, 1, 3, 4); + combobox = gtk_combo_box_new (); +@@ -159,7 +159,7 @@ + + //Seventh row + label = gtk_label_new (gettext("Compression: ")); +- hbox = GTK_WIDGET (gtk_hbox_new (FALSE, 0)); ++ hbox = GTK_WIDGET (gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0)); + gtk_box_pack_start (GTK_BOX (hbox), GTK_WIDGET (label), FALSE, FALSE, 0); + gtk_table_attach_defaults (GTK_TABLE (table), hbox, 0, 1, 4, 5); + combobox = gtk_combo_box_new (); +@@ -178,7 +178,7 @@ + checkbox = gtk_check_button_new_with_label (gettext("Split Places from Names Dictionary")); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (checkbox), di->split); + g_signal_connect (G_OBJECT (checkbox), "toggled", G_CALLBACK (gw_dictionaryinstall_split_checkbox_changed_cb), di); +- hbox = GTK_WIDGET (gtk_hbox_new (FALSE, 0)); ++ hbox = GTK_WIDGET (gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0)); + gtk_box_pack_start (GTK_BOX (hbox), GTK_WIDGET (checkbox), FALSE, FALSE, 0); + gtk_table_attach_defaults (GTK_TABLE (table), hbox, 0, 2, 5, 6); + gtk_widget_set_sensitive (GTK_WIDGET (checkbox), editable); +@@ -188,7 +188,7 @@ + checkbox = gtk_check_button_new_with_label (gettext("Merge Radicals into Kanji Dictionary")); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (checkbox), di->merge); + g_signal_connect (G_OBJECT (checkbox), "toggled", G_CALLBACK (gw_dictionaryinstall_merge_checkbox_changed_cb), di); +- hbox = GTK_WIDGET (gtk_hbox_new (FALSE, 0)); ++ hbox = GTK_WIDGET (gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0)); + gtk_box_pack_start (GTK_BOX (hbox), GTK_WIDGET (checkbox), FALSE, FALSE, 0); + gtk_table_attach_defaults (GTK_TABLE (table), hbox, 0, 2, 6, 7); + gtk_widget_set_sensitive (GTK_WIDGET (checkbox), editable); +Index: b/src/gwaei/main-tabs.c +=================================================================== +--- a/src/gwaei/main-tabs.c ++++ b/src/gwaei/main-tabs.c +@@ -288,7 +288,7 @@ + + //Create create tab label + GtkWidget *vbox; +- GtkWidget *hbox = GTK_WIDGET (gtk_hbox_new(FALSE, 3)); ++ GtkWidget *hbox = GTK_WIDGET (gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3)); + GtkWidget *label = GTK_WIDGET (gtk_label_new(gettext("(Empty)"))); + GtkWidget *close_button = GTK_WIDGET (gtk_button_new ()); + gtk_button_set_relief (GTK_BUTTON (close_button), GTK_RELIEF_NONE); +@@ -321,10 +321,10 @@ + //Put all the elements together + gtk_container_add (GTK_CONTAINER (close_button), button_image); + g_signal_connect (G_OBJECT (close_button), "clicked", G_CALLBACK (gw_tabs_remove_cb), scrolledwindow); +- vbox = GTK_WIDGET (gtk_vbox_new(FALSE, 0)); ++ vbox = GTK_WIDGET (gtk_box_new(GTK_ORIENTATION_VERTICAL, 0)); + gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 1); + gtk_box_pack_start (GTK_BOX (hbox), vbox, TRUE, TRUE, 0); +- vbox = GTK_WIDGET (gtk_vbox_new(FALSE, 0)); ++ vbox = GTK_WIDGET (gtk_box_new(GTK_ORIENTATION_VERTICAL, 0)); + gtk_box_pack_start (GTK_BOX (vbox), close_button, FALSE, FALSE, 1); + gtk_box_pack_start (GTK_BOX (hbox), vbox, TRUE, TRUE, 0); + gtk_widget_show_all (GTK_WIDGET (hbox)); +Index: b/src/gwaei/main.c +=================================================================== +--- a/src/gwaei/main.c ++++ b/src/gwaei/main.c +@@ -741,7 +741,7 @@ + label = gtk_label_new (item->queryline->string); + + GtkWidget *hbox; +- hbox = gtk_hbox_new (FALSE, 0); ++ hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); + + menu_item = gtk_menu_item_new(); + g_signal_connect (GTK_WIDGET (menu_item), +@@ -1656,7 +1656,7 @@ + + + //Set the header message +- hbox = gtk_hbox_new (FALSE, 10); ++ hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10); + gtk_text_buffer_get_end_iter (tb, &iter); + anchor = gtk_text_buffer_create_child_anchor (tb, &iter); + gtk_text_view_add_child_at_anchor (GTK_TEXT_VIEW (tv), hbox, anchor); +@@ -1693,7 +1693,7 @@ + if (lw_dictinfolist_get_total () > 1) + { + //Add label for links +- hbox = gtk_hbox_new (FALSE, 0); ++ hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); + gtk_text_buffer_get_end_iter (tb, &iter); + anchor = gtk_text_buffer_create_child_anchor (tb, &iter); + gtk_text_view_add_child_at_anchor (GTK_TEXT_VIEW (tv), hbox, anchor); +@@ -1732,7 +1732,7 @@ + } + + //Add label for links +- hbox = gtk_hbox_new (FALSE, 0); ++ hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); + gtk_text_buffer_get_end_iter (tb, &iter); + anchor = gtk_text_buffer_create_child_anchor (tb, &iter); + gtk_text_view_add_child_at_anchor (GTK_TEXT_VIEW (tv), hbox, anchor); +Index: b/src/gwaei/output-callbacks.c +=================================================================== +--- a/src/gwaei/output-callbacks.c ++++ b/src/gwaei/output-callbacks.c +@@ -663,7 +663,7 @@ + child = gtk_bin_get_child (window); + if (child != NULL) gtk_widget_destroy (GTK_WIDGET (child)); + +- GtkWidget *hbox = GTK_WIDGET (gtk_hbox_new (FALSE, 3)); ++ GtkWidget *hbox = GTK_WIDGET (gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3)); + gtk_container_set_border_width (GTK_CONTAINER (hbox), 10); + gtk_container_add (GTK_CONTAINER (window), GTK_WIDGET (hbox)); + diff -Nru gwaei-3.0.2/debian/patches/series gwaei-3.0.2/debian/patches/series --- gwaei-3.0.2/debian/patches/series 1970-01-01 01:00:00.000000000 +0100 +++ gwaei-3.0.2/debian/patches/series 2011-09-16 12:53:06.000000000 +0100 @@ -0,0 +1 @@ +gtk-3.2.patch Thanks, -- Colin Watson [cjwat...@ubuntu.com] -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
