diff -u scim-canna-1.0.0/debian/changelog scim-canna-1.0.0/debian/changelog --- scim-canna-1.0.0/debian/changelog +++ scim-canna-1.0.0/debian/changelog @@ -1,3 +1,13 @@ +scim-canna (1.0.0-4.1) unstable; urgency=low + + * Non-maintainer upload. + * Fix FTBFS with GTK3. (Closes: #676021) + Add patches/40_fix_ftbfs_gtk3.dpatch. + * Udate debian/rules. + Remove .la files. (Closes: #633214) + + -- Nobuhiro Iwamatsu Thu, 12 Jul 2012 23:54:31 +0900 + scim-canna (1.0.0-4) unstable; urgency=medium * debian/control: add pkg-config, libltdl-dev to Depends. diff -u scim-canna-1.0.0/debian/rules scim-canna-1.0.0/debian/rules --- scim-canna-1.0.0/debian/rules +++ scim-canna-1.0.0/debian/rules @@ -69,6 +69,10 @@ mv $(CURDIR)/debian/scim-canna/usr/lib/scim-1.0/`pkg-config --variable=scim_binary_version scim`/SetupUI/canna-imengine-setup.a \ $(CURDIR)/debian/scim-canna/usr/lib/scim-1.0/`pkg-config --variable=scim_binary_version scim`/SetupUI/libcanna-imengine-setup.a + # rm .la files + rm -rf $(CURDIR)/debian/scim-canna/usr/lib/scim-1.0/`pkg-config --variable=scim_binary_version scim`/IMEngine/*.la + rm -rf $(CURDIR)/debian/scim-canna/usr/lib/scim-1.0/`pkg-config --variable=scim_binary_version scim`/SetupUI/*.la + # Build architecture-independent files here. binary-indep: build install # We have nothing to do by default. diff -u scim-canna-1.0.0/debian/patches/00list scim-canna-1.0.0/debian/patches/00list --- scim-canna-1.0.0/debian/patches/00list +++ scim-canna-1.0.0/debian/patches/00list @@ -1,0 +2 @@ +40_fix_ftbfs_gtk3.dpatch only in patch2: unchanged: --- scim-canna-1.0.0.orig/debian/patches/40_fix_ftbfs_gtk3.dpatch +++ scim-canna-1.0.0/debian/patches/40_fix_ftbfs_gtk3.dpatch @@ -0,0 +1,211 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## +## Description: Fix FTBFS with GTK3 +## Forwarded: Nonea +## Bug-Debian: http://bugs.debian.org/676021 +## Author: Nobuhiro Iwamatsu +## Last-Update: 2012-07-13 + +diff --git a/src/scim_canna_imengine_setup.cpp b/src/scim_canna_imengine_setup.cpp +index eaca35c..e182f1b 100644 +--- a/src/scim_canna_imengine_setup.cpp ++++ b/src/scim_canna_imengine_setup.cpp +@@ -151,7 +151,9 @@ struct ComboConfigCandidate + // Internal data declaration. + static bool __have_changed = true; + ++#if !GTK_CHECK_VERSION(2, 12, 0) + static GtkTooltips * __widget_tooltips = 0; ++#endif + + static BoolConfigData __config_bool_common [] = + { +@@ -283,11 +285,17 @@ create_check_button (const char *config_key) + entry); + gtk_widget_show (entry->widget); + ++#if !GTK_CHECK_VERSION(2, 12, 0) + if (!__widget_tooltips) + __widget_tooltips = gtk_tooltips_new(); ++#endif + if (entry->tooltip) ++#if GTK_CHECK_VERSION(2, 12, 0) ++ gtk_widget_set_tooltip_text (entry->widget, _(entry->tooltip)); ++#else + gtk_tooltips_set_tip (__widget_tooltips, entry->widget, + _(entry->tooltip), NULL); ++#endif + + return entry->widget; + } +@@ -323,11 +331,17 @@ create_entry (const char *config_key, GtkTable *table, int idx) + (GtkAttachOptions) (GTK_FILL|GTK_EXPAND), + (GtkAttachOptions) (GTK_FILL), 4, 4); + ++#if !GTK_CHECK_VERSION(2, 12, 0) + if (!__widget_tooltips) + __widget_tooltips = gtk_tooltips_new(); ++#endif + if (entry->tooltip) ++#if GTK_CHECK_VERSION(2, 12, 0) ++ gtk_widget_set_tooltip_text (GTK_WIDGET (entry->widget), _(entry->tooltip)); ++#else + gtk_tooltips_set_tip (__widget_tooltips, GTK_WIDGET (entry->widget), + _(entry->tooltip), NULL); ++#endif + + return GTK_WIDGET (entry->widget); + } +@@ -350,31 +364,53 @@ create_combo (const char *config_key, gpointer candidates_p, + (GtkAttachOptions) (GTK_FILL), 4, 4); + gtk_widget_show (label); + ++#if GTK_CHECK_VERSION(2, 4, 0) ++ entry->widget = gtk_combo_box_text_new_with_entry (); ++ gtk_label_set_mnemonic_widget (GTK_LABEL (label), ++ gtk_bin_get_child (GTK_BIN (entry->widget))); ++ gtk_editable_set_editable (GTK_EDITABLE (gtk_bin_get_child (GTK_BIN (entry->widget))), FALSE); ++#else + entry->widget = gtk_combo_new (); + gtk_label_set_mnemonic_widget (GTK_LABEL (label), + GTK_COMBO (entry->widget)->entry); + gtk_combo_set_value_in_list (GTK_COMBO (entry->widget), TRUE, FALSE); + gtk_combo_set_case_sensitive (GTK_COMBO (entry->widget), TRUE); +- gtk_entry_set_editable (GTK_ENTRY (GTK_COMBO (entry->widget)->entry), ++ gtk_editable_set_editable (GTK_EDITABLE (GTK_COMBO (entry->widget)->entry), + FALSE); ++#endif + gtk_widget_show (GTK_WIDGET (entry->widget)); + gtk_table_attach (GTK_TABLE (table), GTK_WIDGET (entry->widget), + 1, 2, idx, idx + 1, + (GtkAttachOptions) (GTK_FILL|GTK_EXPAND), + (GtkAttachOptions) (GTK_FILL), 4, 4); ++#if GTK_CHECK_VERSION(2, 4, 0) ++ g_object_set_data (G_OBJECT (gtk_bin_get_child (GTK_BIN (entry->widget))), ++ DATA_POINTER_KEY, ++ (gpointer) candidates_p); ++ g_signal_connect ((gpointer) gtk_bin_get_child (GTK_BIN (entry->widget)), "changed", ++ G_CALLBACK (on_default_combo_changed), ++ entry); ++#else + g_object_set_data (G_OBJECT (GTK_COMBO (entry->widget)->entry), + DATA_POINTER_KEY, + (gpointer) candidates_p); +- + g_signal_connect ((gpointer) GTK_COMBO (entry->widget)->entry, "changed", + G_CALLBACK (on_default_combo_changed), + entry); ++#endif ++ + ++#if !GTK_CHECK_VERSION(2, 12, 0) + if (!__widget_tooltips) + __widget_tooltips = gtk_tooltips_new(); ++#endif + if (entry->tooltip) ++#if GTK_CHECK_VERSION(2, 12, 0) ++ gtk_widget_set_tooltip_text (GTK_WIDGET (entry->widget), _(entry->tooltip)); ++#else + gtk_tooltips_set_tip (__widget_tooltips, GTK_WIDGET (entry->widget), + _(entry->tooltip), NULL); ++#endif + + return GTK_WIDGET (entry->widget); + } +@@ -402,11 +438,17 @@ create_common_page () + { + GtkWidget *vbox, *frame, *table, *check, *widget; + ++#if GTK_CHECK_VERSION(3, 0, 0) ++ vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); ++#else + vbox = gtk_vbox_new (FALSE, 0); ++#endif + gtk_widget_show (vbox); + ++#if !GTK_CHECK_VERSION(2, 12, 0) + if (!__widget_tooltips) + __widget_tooltips = gtk_tooltips_new(); ++#endif + + /* specify initialize file name */ + frame = gtk_frame_new (""); +@@ -454,7 +496,11 @@ create_mode_page () + { + GtkWidget *vbox, *table; + ++#if GTK_CHECK_VERSION(3, 0, 0) ++ vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); ++#else + vbox = gtk_vbox_new (FALSE, 0); ++#endif + gtk_widget_show (vbox); + + table = gtk_table_new (2, 2, FALSE); +@@ -479,7 +525,11 @@ create_about_page () + GtkWidget *vbox, *label; + gchar str[256]; + ++#if GTK_CHECK_VERSION(3, 0, 0) ++ vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); ++#else + vbox = gtk_vbox_new (FALSE, 0); ++#endif + gtk_widget_show (vbox); + + g_snprintf ( +@@ -546,8 +596,23 @@ create_setup_window () + } + + static void +-setup_combo_value (GtkCombo *combo, const String & str) ++setup_combo_value (GtkWidget *combo, const String & str) + { ++#if GTK_CHECK_VERSION(2, 4, 0) ++ ComboConfigCandidate *data ++ = static_cast ++ (g_object_get_data (G_OBJECT (gtk_bin_get_child (GTK_BIN (combo))), ++ DATA_POINTER_KEY)); ++ ++ gint default_index = -1; ++ for (unsigned int i = 0; data[i].label; i++) { ++ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), _(data[i].label)); ++ if (!strcmp (data[i].data, str.c_str ())) ++ default_index = i; ++ } ++ if (default_index != -1) ++ gtk_combo_box_set_active (GTK_COMBO_BOX (combo), default_index); ++#else + GList *list = NULL; + const char *defval = NULL; + +@@ -562,11 +627,12 @@ setup_combo_value (GtkCombo *combo, const String & str) + defval = _(data[i].label); + } + +- gtk_combo_set_popdown_strings (combo, list); ++ gtk_combo_set_popdown_strings (GTK_COMBO (combo), list); + g_list_free (list); + + if (defval) +- gtk_entry_set_text (GTK_ENTRY (combo->entry), defval); ++ gtk_entry_set_text (GTK_ENTRY (GTK_COMBO (combo)->entry), defval); ++#endif + } + + static void +@@ -581,8 +647,13 @@ setup_widget_value () + + for (unsigned int i = 0; i < __config_string_common_num; i++) { + StringConfigData &entry = __config_string_common[i]; ++#if GTK_CHECK_VERSION(2, 12, 0) ++ if (entry.widget && GTK_IS_COMBO_BOX (entry.widget)) ++ setup_combo_value (entry.widget, entry.value); ++#else + if (entry.widget && GTK_IS_COMBO (entry.widget)) +- setup_combo_value (GTK_COMBO (entry.widget), entry.value); ++ setup_combo_value (entry.widget, entry.value); ++#endif + else if (entry.widget && GTK_IS_ENTRY (entry.widget)) + gtk_entry_set_text (GTK_ENTRY (entry.widget), + entry.value.c_str ());