--- scim-canna-1.0.0.orig/debian/changelog +++ scim-canna-1.0.0/debian/changelog @@ -0,0 +1,96 @@ +scim-canna (1.0.0-4.2) unstable; urgency=low + + * Non-maintainer upload. + * Supported multiarch and fixed FTBFS. (Closes: #685463) + + -- Nobuhiro Iwamatsu Tue, 21 Aug 2012 08:33:16 +0900 + +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. + (Closes: #590410) + * Urgency medium due to RC bug fix. + * debian/control: add Homepage field. + * debian/control: add ${misc:Depends}. + * debian/control: Standards-Version: 3.9.1.0. + * debian:rules: use "[ ! -f Makefile ] || $(MAKE) distclean". + * debian/compat: set 7. + * debian/control: change debhelper to 7. + * debian/rules: do not use dh_clean -k. + * debian/README.source: added. + + -- Ikuya Awashiro Wed, 18 Aug 2010 18:09:45 +0900 + +scim-canna (1.0.0-3.1) unstable; urgency=low + + * Non-maintainer upload. + * Fix gcc-4.3 FTBFS, patch by KiBi (Closes: #455345) + + -- Marc 'HE' Brockschmidt Sun, 16 Mar 2008 18:32:53 +0100 + +scim-canna (1.0.0-3) unstable; urgency=low + + * removed debian/patches/10_scim-plugin-module-install-dir. + Closes: #422951 + + -- Ikuya Awashiro Sat, 12 May 2007 22:46:00 +0900 + +scim-canna (1.0.0-2) unstable; urgency=low + + * removed im-switch support (Closes: #374157) + * Standards-Version bumped to 3.7.2 (no changes requied) + + -- Ikuya Awashiro Sun, 18 Jun 2006 17:49:22 +0900 + +scim-canna (1.0.0-1) unstable; urgency=low + + * New upstream release + * debian/im-switch/scim-canna: auto-detect for libqscim.so. + + -- Ikuya Awashiro Mon, 27 Feb 2006 22:24:39 +0900 + +scim-canna (0.1.3-1) unstable; urgency=low + + * New upstream release + * close wnpp bug (closes: bug#326631) + + -- Ikuya Awashiro Wed, 31 Aug 2005 00:47:12 +0900 + +scim-canna (0.1.2-1) unstable; urgency=low + + * sync with ubuntu. + * Bump Standards-Version to 3.6.2 (no changes required). + * Add im-swich support. + * debian/rules: enable dh_strip. + * debian/control: changed Depends and Build-Depends for SCIM 1.3.x. + + -- Ikuya Awashiro Tue, 30 Aug 2005 13:16:44 +0000 + +scim-canna (0.1.2-0ubuntu1) hoary-ja; urgency=low + + * New upstream release + + -- Ikuya Awashiro Mon, 29 Aug 2005 18:18:29 +0900 + +scim-canna (0.1.1-0ubuntu1) hoary-ja; urgency=low + + * New upstream release + + -- Ikuya Awashiro Fri, 29 Jul 2005 15:45:27 +0900 + +scim-canna (0.1.0-1ubuntu1) hoary-ja; urgency=low + + * Initial Release. + + -- Ikuya Awashiro Thu, 26 May 2005 17:34:58 +0900 + --- scim-canna-1.0.0.orig/debian/docs +++ scim-canna-1.0.0/debian/docs @@ -0,0 +1,2 @@ +NEWS +README --- scim-canna-1.0.0.orig/debian/README.source +++ scim-canna-1.0.0/debian/README.source @@ -0,0 +1,38 @@ +This package uses dpatch to manage all modifications to the upstream +source. Changes are stored in the source package as diffs in +debian/patches and applied during the build. + +To get the fully patched source after unpacking the source package, cd +to the root level of the source package and run: + + debian/rules patch + +Removing a patch is as simple as removing its entry from the +debian/patches/00list file, and please also remove the patch file +itself. + +Creating a new patch is done with "dpatch-edit-patch patch XX_patchname" +where you should replace XX with a new number and patchname with a +descriptive shortname of the patch. You can then simply edit all the +files your patch wants to edit, and then simply "exit 0" from the shell +to actually create the patch file. + +To tweak an already existing patch, call "dpatch-edit-patch XX_patchname" +and replace XX_patchname with the actual filename from debian/patches +you want to use. + +To clean up afterwards again, "debian/rules unpatch" will do the +work for you - or you can of course choose to call +"fakeroot debian/rules clean" all together. + + +--- + +this documentation is part of dpatch package, and may be used by +packages using dpatch to comply with policy on README.source. This +documentation is meant to be useful to users who are not proficient in +dpatch in doing work with dpatch-based packages. Please send any +improvements to the BTS of dpatch package. + +original text by Gerfried Fuchs, edited by Junichi Uekawa +10 Aug 2008. --- scim-canna-1.0.0.orig/debian/copyright +++ scim-canna-1.0.0/debian/copyright @@ -0,0 +1,17 @@ +This package was debianized by Ikuya Awashiro on +Thu, 26 May 2005 17:34:58 +0900. + +It was downloaded from http://sourceforge.jp/projects/scim-imengine/ + +Copyright: + +Upstream Author: + Hiroyuki Ikezoe + Takuro Ashie + +License: + + You are free to distribute this software under the terms of + the GNU General Public License. + On Debian systems, the complete text of the GNU General Public + License can be found in the file `/usr/share/common-licenses/GPL'. --- scim-canna-1.0.0.orig/debian/compat +++ scim-canna-1.0.0/debian/compat @@ -0,0 +1 @@ +7 --- scim-canna-1.0.0.orig/debian/control +++ scim-canna-1.0.0/debian/control @@ -0,0 +1,20 @@ +Source: scim-canna +Section: utils +Priority: optional +Maintainer: Ikuya Awashiro +Uploaders: Yukiharu YABUKI +Build-Depends: debhelper (>= 7.0.0), dpatch, libcanna1g-dev, scim (>= 1.4.6), libscim-dev (>= 1.4.6), autotools-dev, pkg-config, libltdl-dev +Standards-Version: 3.9.1.0 +Homepage: http://scim-imengine.sourceforge.jp/ + +Package: scim-canna +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, scim (<< 1.5.0) +Description: SCIM IMEngine module for Canna + Smart Common Input Method platform (SCIM) is an input method server + and a development platform to make Input Method developers' lives + easier. + Canna is a Japanese input system available in Free Software. + Canna provides a unified user interface for inputting Japanese. + Canna converts kana to kanji based on a client-server model and + supports automatic kana-to-kanji conversion. --- scim-canna-1.0.0.orig/debian/rules +++ scim-canna-1.0.0/debian/rules @@ -0,0 +1,114 @@ +#!/usr/bin/make -f +# -*- makefile -*- +# Sample debian/rules that uses debhelper. +# This file was originally written by Joey Hess and Craig Small. +# As a special exception, when this file is copied by dh-make into a +# dh-make output file, you may use that output file without restriction. +# This special exception was added by Craig Small in version 0.37 of dh-make. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +include /usr/share/dpatch/dpatch.make + +# These are used for cross-compiling and for saving the configure script +# from having to guess our platform (since we know it already) +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) + +SCIM_MOD_PATH ?= $(shell pkg-config --variable=moduledir scim) + +CFLAGS = -Wall -g + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif + +config.status: configure +configure: configure-stamp +configure-stamp: patch-stamp + dh_testdir + # Add here commands to configure the package. + CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --libdir=/usr/lib/$(DEB_HOST_MULTIARCH) + + +build: build-stamp + +build-stamp: config.status + dh_testdir + + # Add here commands to compile the package. + $(MAKE) + cd po; make update-gmo; cd ../ + #docbook-to-man debian/scim-canna.sgml > scim-canna.1 + + touch build-stamp + +clean: unpatch + dh_testdir + dh_testroot + rm -f build-stamp + + # Add here commands to clean up after the build process. + [ ! -f Makefile ] || $(MAKE) distclean + + dh_clean + +#install: build +install: + dh_testdir + dh_testroot + dh_clean + dh_installdirs + + # Add here commands to install the package into debian/scim-canna. + $(MAKE) install DESTDIR=$(CURDIR)/debian/scim-canna + mv $(CURDIR)/debian/scim-canna/$(SCIM_MOD_PATH)/IMEngine/canna.a \ + $(CURDIR)/debian/scim-canna/$(SCIM_MOD_PATH)/IMEngine/libcanna.a + mv $(CURDIR)/debian/scim-canna/$(SCIM_MOD_PATH)/SetupUI/canna-imengine-setup.a \ + $(CURDIR)/debian/scim-canna/$(SCIM_MOD_PATH)/SetupUI/libcanna-imengine-setup.a + + # rm .la files + rm -rf $(CURDIR)/debian/scim-canna/$(SCIM_MOD_PATH)/IMEngine/*.la + rm -rf $(CURDIR)/debian/scim-canna/$(SCIM_MOD_PATH)/SetupUI/*.la + +# Build architecture-independent files here. +binary-indep: build install +# We have nothing to do by default. + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir + dh_testroot + dh_installchangelogs ChangeLog + dh_installdocs + dh_installexamples +# dh_install +# dh_installmenu +# dh_installdebconf +# dh_installlogrotate +# dh_installemacsen +# dh_installpam +# dh_installmime +# dh_installinit +# dh_installcron +# dh_installinfo + dh_installman + dh_link + dh_strip + dh_compress + dh_fixperms +# dh_perl +# dh_python +# dh_makeshlibs + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install --- scim-canna-1.0.0.orig/debian/im-switch/scim-canna +++ scim-canna-1.0.0/debian/im-switch/scim-canna @@ -0,0 +1,14 @@ +libqscim="/usr/lib/qt3/plugins/inputmethods/libqscim.so" + +if [ -e "$libqscim" ]; then + im="scim" +else + im="xim" +fi + +XIM=SCIM +XIM_PROGRAM=/usr/bin/scim +XIM_ARGS="-d" +GTK_IM_MODULE=scim +QT_IM_MODULE="$im" +DEPENDS="scim,canna,scim-gtk2-immodule" --- scim-canna-1.0.0.orig/debian/patches/10_scim-plugin-module-install-dir.dpatch +++ scim-canna-1.0.0/debian/patches/10_scim-plugin-module-install-dir.dpatch @@ -0,0 +1,49 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 10_scim-plugin-module-install-dir.dpatch by Ikuya Awashiro +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad scim-canna-0.1.0/src/Makefile.am /tmp/dpep.earBSf/scim-canna-0.1.0/src/Makefile.am +--- scim-canna-0.1.0/src/Makefile.am 2005-03-20 09:22:11.000000000 +0900 ++++ /tmp/dpep.earBSf/scim-canna-0.1.0/src/Makefile.am 2005-05-26 17:46:22.857928712 +0900 +@@ -14,7 +14,7 @@ + scim_canna_imengine.h \ + scim_canna_prefs.h + +-moduledir = @SCIM_MODULEDIR@/IMEngine ++moduledir = @SCIM_MODULEDIR@/`pkg-config --variable=scim_binary_version scim`/IMEngine + module_LTLIBRARIES = canna.la + + canna_la_SOURCES = \ +@@ -38,7 +38,7 @@ + SETUP_MODULE = canna-imengine-setup.la + endif + +-setupmoduledir = @SCIM_MODULEDIR@/SetupUI ++setupmoduledir = @SCIM_MODULEDIR@/`pkg-config --variable=scim_binary_version scim`/SetupUI + setupmodule_LTLIBRARIES = $(SETUP_MODULE) + + canna_imengine_setup_la_SOURCES = scim_canna_imengine_setup.cpp +diff -urNad scim-canna-0.1.0/src/Makefile.in /tmp/dpep.earBSf/scim-canna-0.1.0/src/Makefile.in +--- scim-canna-0.1.0/src/Makefile.in 2005-04-28 12:49:02.000000000 +0900 ++++ /tmp/dpep.earBSf/scim-canna-0.1.0/src/Makefile.in 2005-05-26 17:47:04.856543952 +0900 +@@ -264,7 +264,7 @@ + scim_canna_imengine.h \ + scim_canna_prefs.h + +-moduledir = @SCIM_MODULEDIR@/IMEngine ++moduledir = @SCIM_MODULEDIR@/`pkg-config --variable=scim_binary_version scim`/IMEngine + module_LTLIBRARIES = canna.la + canna_la_SOURCES = \ + canna_jrkanji.cpp \ +@@ -283,7 +283,7 @@ + @CANNA_LIBS@ + + @SCIM_BUILD_SETUP_TRUE@SETUP_MODULE = canna-imengine-setup.la +-setupmoduledir = @SCIM_MODULEDIR@/SetupUI ++setupmoduledir = @SCIM_MODULEDIR@/`pkg-config --variable=scim_binary_version scim`/SetupUI + setupmodule_LTLIBRARIES = $(SETUP_MODULE) + canna_imengine_setup_la_SOURCES = scim_canna_imengine_setup.cpp + canna_imengine_setup_la_CFLAGS = @SCIM_GTKUTILS_CFLAGS@ @SCIM_CFLAGS@ @SCIM_DEBUG_FLAGS@ --- scim-canna-1.0.0.orig/debian/patches/00list +++ scim-canna-1.0.0/debian/patches/00list @@ -0,0 +1,2 @@ +30-fix_gcc-4.3_ftbfs.dpatch +40_fix_ftbfs_gtk3.dpatch --- 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 ()); --- scim-canna-1.0.0.orig/debian/patches/30-fix_gcc-4.3_ftbfs.dpatch +++ scim-canna-1.0.0/debian/patches/30-fix_gcc-4.3_ftbfs.dpatch @@ -0,0 +1,29 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 30-fix_gcc-4.3_ftbfs.dpatch by Cyril Brulebois +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +--- a/src/canna_jrkanji.cpp ++++ b/src/canna_jrkanji.cpp +@@ -29,6 +29,8 @@ + #include "scim_canna_imengine_factory.h" + #include "intl.h" + ++#include ++ + #define SCIM_PROP_INPUT_MODE "/IMEngine/Canna/InputMode" + #define SCIM_PROP_INPUT_MODE_OFF "/IMEngine/Canna/InputMode/Off" + #define SCIM_PROP_INPUT_MODE_HIRAGANA "/IMEngine/Canna/InputMode/Hiragana" +--- a/src/scim_canna_imengine_setup.cpp ++++ b/src/scim_canna_imengine_setup.cpp +@@ -38,6 +38,8 @@ + #include "scim_canna_prefs.h" + #include "intl.h" + ++#include ++ + using namespace scim; + + #define scim_module_init canna_imengine_setup_LTX_scim_module_init