[packages/scim-prime] - new

qboosh qboosh at pld-linux.org
Sat Apr 9 20:59:30 CEST 2016


commit 4546a18ab6a06d931a0781f9d17cb7bdbe23cc55
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Apr 9 20:59:22 2016 +0200

    - new

 scim-prime-gtk3.patch     | 506 ++++++++++++++++++++++++++++++++++++++++++++++
 scim-prime-no-rpath.patch |  18 ++
 scim-prime-nobr.patch     |  15 ++
 scim-prime.spec           |  73 +++++++
 4 files changed, 612 insertions(+)
---
diff --git a/scim-prime.spec b/scim-prime.spec
new file mode 100644
index 0000000..e7e1b8d
--- /dev/null
+++ b/scim-prime.spec
@@ -0,0 +1,73 @@
+Summary:	SCIM IMEngine module using PRIME for Japanese input
+Summary(pl.UTF-8):	Silnik IM SCIM dla metody wprowadzania znaków japońskich PRIME
+Name:		scim-prime
+Version:	1.0.1
+Release:	1
+License:	GPL v2+
+Group:		Libraries
+#Source0Download: https://osdn.jp/projects/scim-imengine/releases/p3523
+Source0:	http://dl.osdn.jp/scim-imengine/29156/%{name}-%{version}.tar.gz
+# Source0-md5:	12eae8334f73c70408b2f60c0ea0c82c
+Patch0:		%{name}-no-rpath.patch
+Patch1:		%{name}-gtk3.patch
+Patch2:		%{name}-nobr.patch
+URL:		https://osdn.jp/projects/scim-imengine/
+BuildRequires:	autoconf >= 2.59
+BuildRequires:	automake >= 1:1.9
+BuildRequires:	gettext-devel
+BuildRequires:	libstdc++-devel
+BuildRequires:	libtool >= 2:1.5
+BuildRequires:	pkgconfig
+BuildRequires:	scim-devel >= 1.0
+Requires:	prime >= 1.0.0
+Requires:	scim >= 1.0
+BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+
+%description
+scim-prime is a SCIM IMEngine module using PRIME.
+
+PRIME is a predictive Japanese conversion engine written in Ruby.
+
+%description -l pl.UTF-8
+scim-prime to moduł silnika IM SCIM wykorzystujący metodę PRIME.
+
+PRIME to silnik przewidującej konwersji dla języka japońskiego
+napisany w języku Ruby.
+
+%prep
+%setup -q
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+
+%build
+%{__gettextize}
+%{__libtoolize}
+%{__aclocal} -I m4
+%{__autoconf}
+%{__autoheader}
+%{__automake}
+%configure \
+	--disable-static
+
+%{__make}
+
+%install
+rm -rf $RPM_BUILD_ROOT
+
+%{__make} install \
+	DESTDIR=$RPM_BUILD_ROOT
+
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/scim-1.0/*/*/*.la
+
+%find_lang %{name}
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files -f %{name}.lang
+%defattr(644,root,root,755)
+%doc AUTHORS ChangeLog NEWS README TODO
+%attr(755,root,root) %{_libdir}/scim-1.0/*/IMEngine/prime.so
+%attr(755,root,root) %{_libdir}/scim-1.0/*/SetupUI/prime-imengine-setup.so
+%{_datadir}/scim/icons/scim-prime.png
diff --git a/scim-prime-gtk3.patch b/scim-prime-gtk3.patch
new file mode 100644
index 0000000..838176a
--- /dev/null
+++ b/scim-prime-gtk3.patch
@@ -0,0 +1,506 @@
+--- scim-prime-1.0.1/src/scim_prime_imengine_setup.cpp.orig	2008-01-23 07:15:29.000000000 +0100
++++ scim-prime-1.0.1/src/scim_prime_imengine_setup.cpp	2016-04-09 20:30:59.307525448 +0200
+@@ -127,7 +127,10 @@
+ static GtkWidget   * __widget_key_filter_button   = NULL;
+ static GtkWidget   * __widget_key_list_view       = NULL;
+ static GtkWidget   * __widget_choose_keys_button  = NULL;
++#if GTK_CHECK_VERSION(3, 0, 0)
++#else
+ static GtkTooltips * __widget_tooltips            = NULL;
++#endif
+ 
+ static struct KeyboardConfigPage __key_conf_pages[] =
+ {
+@@ -181,7 +184,7 @@
+ 
+ static void     on_key_filter_selection_clicked   (GtkButton       *button,
+                                                    gpointer         user_data);
+-static void     on_key_category_menu_changed      (GtkOptionMenu   *omenu,
++static void     on_key_category_menu_changed      (GtkWidget       *omenu,
+                                                    gpointer         user_data);
+ static gboolean on_key_list_view_key_press        (GtkWidget       *widget,
+                                                    GdkEventKey     *event,
+@@ -270,11 +273,19 @@
+                       entry);
+     gtk_widget_show (GTK_WIDGET (entry->widget));
+ 
++#if GTK_CHECK_VERSION(3, 0, 0)
++#else
+     if (!__widget_tooltips)
+         __widget_tooltips = gtk_tooltips_new();
++#endif
+     if (entry->tooltip)
++#if GTK_CHECK_VERSION(3, 0, 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);
+ }
+@@ -295,7 +306,11 @@
+                       4, 4);
+     gtk_widget_show (GTK_WIDGET (label));
+ 
++#if GTK_CHECK_VERSION(3, 0, 0)
++    GtkWidget *hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
++#else
+     GtkWidget *hbox = gtk_hbox_new (FALSE, 0);
++#endif
+     gtk_table_attach (GTK_TABLE (table), GTK_WIDGET (hbox),
+                       1, 2, idx, idx + 1,
+                       (GtkAttachOptions) GTK_FILL,
+@@ -323,11 +338,19 @@
+         gtk_widget_show (GTK_WIDGET (label));
+     }
+ 
++#if GTK_CHECK_VERSION(3, 0, 0)
++#else
+     if (!__widget_tooltips)
+         __widget_tooltips = gtk_tooltips_new();
++#endif
+     if (entry->tooltip)
++#if GTK_CHECK_VERSION(3, 0, 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);
+ }
+@@ -367,11 +390,19 @@
+                       (GtkAttachOptions) (GTK_FILL|GTK_EXPAND),
+                       (GtkAttachOptions) (GTK_FILL), 4, 4);
+ 
++#if GTK_CHECK_VERSION(3, 0, 0)
++#else
+     if (!__widget_tooltips)
+         __widget_tooltips = gtk_tooltips_new();
++#endif
+     if (data->tooltip)
++#if GTK_CHECK_VERSION(3, 0, 0)
++        gtk_widget_set_tooltip_text (GTK_WIDGET (data->widget),
++                              _(data->tooltip));
++#else
+         gtk_tooltips_set_tip (__widget_tooltips, GTK_WIDGET (data->widget),
+                               _(data->tooltip), NULL);
++#endif
+ }
+ 
+ static GtkWidget *
+@@ -392,12 +423,31 @@
+                       (GtkAttachOptions) (GTK_FILL), 4, 4);
+     gtk_widget_show (label);
+ 
++#if GTK_CHECK_VERSION(2, 24, 0)
++    entry->widget = gtk_combo_box_text_new_with_entry ();
++    GtkWidget *combo_box_entry = gtk_bin_get_child (GTK_BIN (entry->widget));
++    gtk_label_set_mnemonic_widget (GTK_LABEL (label), combo_box_entry);
++    gtk_editable_set_editable (GTK_EDITABLE (combo_box_entry), FALSE);
++
++    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);
++    g_object_set_data (G_OBJECT (combo_box_entry),
++                       DATA_POINTER_KEY,
++                       (gpointer) candidates_p);
++
++    g_signal_connect (G_OBJECT (combo_box_entry), "changed",
++                      G_CALLBACK (on_default_combo_changed),
++                      entry);
++#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);
+     gtk_widget_show (GTK_WIDGET (entry->widget));
+     gtk_table_attach (GTK_TABLE (table), GTK_WIDGET (entry->widget), 1, 2, idx, idx + 1,
+@@ -410,12 +460,21 @@
+     g_signal_connect ((gpointer) GTK_COMBO (entry->widget)->entry, "changed",
+                       G_CALLBACK (on_default_combo_changed),
+                       entry);
++#endif
+ 
++#if GTK_CHECK_VERSION(3, 0, 0)
++#else
+     if (!__widget_tooltips)
+         __widget_tooltips = gtk_tooltips_new();
++#endif
+     if (entry->tooltip)
++#if GTK_CHECK_VERSION(3, 0, 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);
+ }
+@@ -427,7 +486,11 @@
+     if (!entry)
+         return NULL;
+ 
++#if GTK_CHECK_VERSION(3, 0, 0)
++    GtkWidget *hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
++#else
+     GtkWidget *hbox = gtk_hbox_new (FALSE, 0);
++#endif
+     gtk_widget_show (hbox);
+ 
+     GtkWidget *label = NULL;
+@@ -449,11 +512,19 @@
+     if (label)
+         gtk_label_set_mnemonic_widget (GTK_LABEL (label), GTK_WIDGET (entry->widget));
+ 
++#if GTK_CHECK_VERSION(3, 0, 0)
++#else
+     if (!__widget_tooltips)
+         __widget_tooltips = gtk_tooltips_new();
++#endif
+     if (entry->tooltip)
++#if GTK_CHECK_VERSION(3, 0, 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 hbox;
+ }
+@@ -550,7 +621,11 @@
+     GtkWidget *vbox, *table, *widget;
+     StringConfigData *entry;
+ 
++#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 (3, 2, FALSE);
+@@ -583,7 +658,11 @@
+ {
+     GtkWidget *vbox, *table, *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);
+ 
+     /* predict on preedition */
+@@ -613,7 +692,11 @@
+ {
+     GtkWidget *vbox, *hbox, *table, *widget, *widget2;
+ 
++#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);
+ 
+     /* page size */
+@@ -632,7 +715,11 @@
+     gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE, 2);
+ 
+     /* show annotation */
++#if GTK_CHECK_VERSION(3, 0, 0)
++    hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
++#else
+     hbox = gtk_hbox_new (FALSE, 0);
++#endif
+     gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 2);
+     gtk_widget_show (hbox);
+     widget = create_check_button (SCIM_PRIME_CONFIG_SHOW_ANNOTATION);
+@@ -646,7 +733,11 @@
+                       widget);
+ 
+     /* show usage */
++#if GTK_CHECK_VERSION(3, 0, 0)
++    hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
++#else
+     hbox = gtk_hbox_new (FALSE, 0);
++#endif
+     gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 2);
+     gtk_widget_show (hbox);
+     widget = create_check_button (SCIM_PRIME_CONFIG_SHOW_USAGE);
+@@ -660,7 +751,11 @@
+                       widget);
+ 
+     /* show comment */
++#if GTK_CHECK_VERSION(3, 0, 0)
++    hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
++#else
+     hbox = gtk_hbox_new (FALSE, 0);
++#endif
+     gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 2);
+     gtk_widget_show (hbox);
+     widget = create_check_button (SCIM_PRIME_CONFIG_SHOW_COMMENT);
+@@ -682,7 +777,11 @@
+ {
+     GtkWidget *vbox, *hbox, *label;
+ 
++#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);
+ 
+     return vbox;
+@@ -708,10 +807,18 @@
+ {
+     GtkWidget *vbox, *hbox;
+ 
++#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(3, 0, 0)
++    hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
++#else
+     hbox = gtk_hbox_new (FALSE, 0);
++#endif
+     gtk_container_set_border_width (GTK_CONTAINER (hbox), 4);
+     gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
+     gtk_widget_show(hbox);
+@@ -721,6 +828,28 @@
+     gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 2);
+     gtk_widget_show (label);
+ 
++#if GTK_CHECK_VERSION(2, 24, 0)
++    GtkWidget *omenu = gtk_combo_box_text_new ();
++    __widget_key_categories_menu = omenu;
++    gtk_box_pack_start (GTK_BOX (hbox), omenu, FALSE, FALSE, 2);
++    gtk_widget_show (omenu);
++
++    gtk_label_set_mnemonic_widget (GTK_LABEL (label), omenu);
++
++    gtk_combo_box_text_append_text
++        (GTK_COMBO_BOX_TEXT (omenu),
++        _("All"));
++
++    for (unsigned int i = 0; i < __key_conf_pages_num; i++) {
++        gtk_combo_box_text_append_text
++            (GTK_COMBO_BOX_TEXT (omenu),
++            _(__key_conf_pages[i].label));
++    }
++
++    gtk_combo_box_text_append_text
++        (GTK_COMBO_BOX_TEXT (omenu),
++        _("Search by key"));
++#else
+     GtkWidget *omenu = gtk_option_menu_new ();
+     __widget_key_categories_menu = omenu;
+     gtk_box_pack_start (GTK_BOX (hbox), omenu, FALSE, FALSE, 2);
+@@ -748,10 +877,11 @@
+ 
+     gtk_option_menu_set_menu (GTK_OPTION_MENU (omenu), menu);
+     gtk_widget_show (menu);
++#endif
+ 
+     GtkWidget *entry = gtk_entry_new ();
+     __widget_key_filter = entry;
+-    gtk_entry_set_editable (GTK_ENTRY (entry), FALSE);
++    gtk_editable_set_editable (GTK_EDITABLE (entry), FALSE);
+     gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE, 2);
+     gtk_widget_show(entry);
+ 
+@@ -809,7 +939,11 @@
+ 	gtk_tree_view_append_column(GTK_TREE_VIEW(treeview), column);
+ 
+     // for key bind theme
++#if GTK_CHECK_VERSION(3, 0, 0)
++    hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
++#else
+     hbox = gtk_hbox_new (FALSE, 0);
++#endif
+     gtk_container_set_border_width (GTK_CONTAINER (hbox), 4);
+     gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
+     gtk_widget_show(hbox);
+@@ -845,7 +979,11 @@
+     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 (
+@@ -939,8 +1077,24 @@
+ }
+ 
+ static void
+-setup_combo_value (GtkCombo *combo, const String & str)
++setup_combo_value (GtkWidget *combo, const String & str)
+ {
++#if GTK_CHECK_VERSION(2, 24, 0)
++    ComboConfigCandidate *data
++        = static_cast<ComboConfigCandidate*>
++        (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;
+ 
+@@ -955,11 +1109,12 @@
+             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
+@@ -981,20 +1136,35 @@
+ 
+     for (unsigned int i = 0; __config_string_common[i].key; i++) {
+         StringConfigData &entry = __config_string_common[i];
++#if GTK_CHECK_VERSION(2, 24, 0)
++        if (entry.widget && GTK_IS_COMBO_BOX (entry.widget))
++            setup_combo_value (GTK_WIDGET (entry.widget), entry.value);
++        else if (entry.widget && GTK_IS_ENTRY (entry.widget))
++            gtk_entry_set_text (GTK_ENTRY (entry.widget),
++                                entry.value.c_str ());
++#else
+         if (entry.widget && GTK_IS_COMBO (entry.widget))
+-            setup_combo_value (GTK_COMBO (entry.widget), entry.value);
++            setup_combo_value (GTK_WIDGET (entry.widget), entry.value);
+         else if (entry.widget && GTK_IS_ENTRY (entry.widget))
+             gtk_entry_set_text (GTK_ENTRY (entry.widget),
+                                 entry.value.c_str ());
++#endif
+     }
+ 
+     for (unsigned int i = 0; __config_color_common[i].key; i++) {
+         ColorConfigData &entry = __config_color_common[i];
+         if (entry.widget) {
++#if GTK_CHECK_VERSION(3, 0, 0)
++            GdkRGBA color;
++            gdk_rgba_parse (&color, entry.value.c_str ());
++            gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (entry.widget),
++                                        &color);
++#else
+             GdkColor color;
+             gdk_color_parse (entry.value.c_str (), &color);
+             gtk_color_button_set_color (GTK_COLOR_BUTTON (entry.widget),
+                                         &color);
++#endif
+         }
+     }
+ 
+@@ -1008,8 +1178,13 @@
+         }
+     }
+ 
++#if GTK_CHECK_VERSION(2, 24, 0)
++    gtk_combo_box_set_active (GTK_COMBO_BOX (__widget_key_categories_menu),
++                              KEY_CATEGORY_INDEX_ALL);
++#else
+     gtk_option_menu_set_history (GTK_OPTION_MENU (__widget_key_categories_menu),
+                                  KEY_CATEGORY_INDEX_ALL);
++#endif
+     GtkTreeView *treeview = GTK_TREE_VIEW (__widget_key_list_view);
+     GtkListStore *store = GTK_LIST_STORE (gtk_tree_view_get_model (treeview));
+     gtk_list_store_clear (store);
+@@ -1239,14 +1414,26 @@
+     ColorConfigData *entry = static_cast<ColorConfigData*> (user_data);
+ 
+     if (entry) {
+-        GdkColor color;
+         gchar color_str[8];
++#if GTK_CHECK_VERSION(3, 0, 0)
++        GdkRGBA color;
++        gtk_color_chooser_get_rgba (GTK_COLOR_CHOOSER (colorbutton), &color);
++#else
++        GdkColor color;
+         gtk_color_button_get_color (colorbutton, &color);
++#endif
+         g_snprintf (color_str, G_N_ELEMENTS (color_str),
+                     "#%02X%02X%02X", 
++#if GTK_CHECK_VERSION(3, 0, 0)
++                    static_cast<unsigned>(255*color.red),
++                    static_cast<unsigned>(255*color.green),
++                    static_cast<unsigned>(255*color.blue)
++#else
+                     (color.red>>8),
+                     (color.green>>8),
+-                    (color.blue>>8));
++                    (color.blue>>8)
++#endif
++                   );
+         entry->value = String (color_str);
+         entry->changed = true;
+         __have_changed = true;
+@@ -1254,14 +1441,18 @@
+ }
+ 
+ static void
+-on_key_category_menu_changed (GtkOptionMenu *omenu, gpointer user_data)
++on_key_category_menu_changed (GtkWidget *omenu, gpointer user_data)
+ {
+     GtkTreeView *treeview = GTK_TREE_VIEW (user_data);
+     GtkListStore *store = GTK_LIST_STORE (gtk_tree_view_get_model (treeview));
+ 
+     gtk_list_store_clear (store);
+ 
+-    gint idx = gtk_option_menu_get_history (omenu);
++#if GTK_CHECK_VERSION(2, 24, 0)
++    gint idx = gtk_combo_box_get_active (GTK_COMBO_BOX (omenu));
++#else
++    gint idx = gtk_option_menu_get_history (GTK_OPTION_MENU (omenu));
++#endif
+ 
+     bool use_filter = false;
+ 
+@@ -1329,8 +1520,13 @@
+     GtkTreeView *treeview = GTK_TREE_VIEW (widget);
+ 
+     switch (event->keyval) {
++#if GTK_CHECK_VERSION(3, 0, 0)
++    case GDK_KEY_Return:
++    case GDK_KEY_KP_Enter:
++#else
+     case GDK_Return:
+     case GDK_KP_Enter:
++#endif
+         key_list_view_popup_key_selection (treeview);
+         break;
+     }
diff --git a/scim-prime-no-rpath.patch b/scim-prime-no-rpath.patch
new file mode 100644
index 0000000..f6e67a7
--- /dev/null
+++ b/scim-prime-no-rpath.patch
@@ -0,0 +1,18 @@
+--- scim-prime-1.0.1/src/Makefile.am.orig	2005-10-13 13:41:14.000000000 +0200
++++ scim-prime-1.0.1/src/Makefile.am	2016-04-09 20:38:55.240838807 +0200
+@@ -31,7 +31,6 @@
+ 
+ prime_la_LDFLAGS = \
+ 	-avoid-version \
+-	-rpath $(moduledir) \
+ 	-module \
+ 	@LIBTOOL_EXPORT_OPTIONS@ \
+ 	@SCIM_LIBS@
+@@ -52,7 +51,6 @@
+ prime_imengine_setup_la_CXXFLAGS= @SCIM_GTKUTILS_CFLAGS@ @SCIM_CFLAGS@ @SCIM_DEBUG_FLAGS@
+ 
+ prime_imengine_setup_la_LDFLAGS = -avoid-version \
+-                                   -rpath $(setupmoduledir) \
+                                    -module \
+                                    @LIBTOOL_EXPORT_OPTIONS@ \
+                                    @SCIM_GTKUTILS_LIBS@ \
diff --git a/scim-prime-nobr.patch b/scim-prime-nobr.patch
new file mode 100644
index 0000000..12a9ece
--- /dev/null
+++ b/scim-prime-nobr.patch
@@ -0,0 +1,15 @@
+PRIME is required at runtime, not build time.
+--- scim-prime-1.0.1/configure.ac.orig	2008-01-29 03:46:11.000000000 +0100
++++ scim-prime-1.0.1/configure.ac	2016-04-09 09:16:14.045891119 +0200
+@@ -118,11 +118,6 @@
+ # Checks for PRIME
+ PRIME_VERSION=1.0.0
+ 
+-PKG_CHECK_MODULES(PRIME,
+-	[prime >= $PRIME_VERSION],
+-	[],
+-	[AC_MSG_ERROR(Please install PRIME-1.0.0 or later.)])
+-
+ 
+ AC_CONFIG_FILES([
+ Makefile
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/scim-prime.git/commitdiff/4546a18ab6a06d931a0781f9d17cb7bdbe23cc55



More information about the pld-cvs-commit mailing list