Remove uim-scim.

* configure.ac - Remove the "--with-scim" option. - Remove lines for uim-scim. * make-dist.sh - Remove "--without-scim" and relevant comments. * po/POTFILES.in - Remove scim.scm. * po/fr.po * po/ja.po * po/ko.po - Remove lines for uim-scim. * scm/Makefile.am - (SCM_FILES): Remove scim.scm. - Remove lines for uim-scim. * scm/event.scm - Remove uim-scim from the comment. * scm/im.scm - Remove the comment on uim-scim. * scm/scim.scm - Remove. * test/util/test-misc.scm - (test-try-load, test-try-require): Remove codes for scim.scm. * uim/Makefile.am - (CXXFLAGS): Don't add SCIM_CFLAGS. - Remove lines for uim-scim. * uim/scim.cpp - Remove.
mnogu · Nov 10, 2012 · 6f16ac2 · 6f16ac2
1 parent 27cc3d0
commit 6f16ac2
Show file tree

Hide file tree

Showing 13 changed files with 8 additions and 1,128 deletions.
diff --git a/configure.ac b/configure.ac
@@ -87,23 +87,6 @@ AC_ARG_WITH(m17nlib,
 AC_SUBST(M17NLIB_LIBS)
 AC_SUBST(m17n_db_dir)
 
-
-AC_ARG_WITH(scim,
-  AC_HELP_STRING([--with-scim],
-                 [build against SCIM (broken)
-		  @<:@default=no@:>@]),
-  [
-    case $with_scim in
-      no)
-        use_scim="no"
-      ;;
-      yes|*)
-        PKG_CHECK_MODULES(SCIM, scim >= 1.3.0, use_scim="yes",use_scim="no")
-      ;;
-    esac
-  ],
-  [use_scim="no"] )
-
 # ***********************
 # *** Tests for Anthy ***
 # ***********************
@@ -1297,7 +1280,6 @@ AC_SUBST(UI_XML_CANNA_END)
 
 
 AM_CONDITIONAL(M17NLIB, test x$use_m17nlib = xyes)
-AM_CONDITIONAL(SCIM, test x$use_scim = xyes)
 AM_CONDITIONAL(ANTHY, test x$use_anthy = xyes)
 AM_CONDITIONAL(ANTHY_UTF8, test x$use_anthy_utf8 = xyes)
 AM_CONDITIONAL(CANNA, test x$use_canna = xyes)
@@ -1862,13 +1844,6 @@ else
   AX_CFLAGS_GCC_OPTION([-Wno-unused-function], [UIM_SCM_CFLAGS])
   AX_LANG_WNOERROR  # end AC_LANG_WERROR
 
-  # Suppress the warnings of libuim-scim
-  AC_LANG_WERROR  # Turn warning-only unknown options into error.
-  AX_CFLAGS_GCC_OPTION([-Wno-unused-function],  [SCIM_CFLAGS])
-  AX_CFLAGS_GCC_OPTION([-Wno-unused-parameter], [SCIM_CFLAGS])
-  AX_CFLAGS_GCC_OPTION([-Wno-unused-variable],  [SCIM_CFLAGS])
-  AX_LANG_WNOERROR  # end AC_LANG_WERROR
-
   QT_CONFIG_OPTS="release"
 fi
 
@@ -1892,11 +1867,9 @@ AC_ARG_ENABLE(warnings-into-error,
 	      AX_CFLAGS_GCC_OPTION([-Werror])
 	      AX_CXXFLAGS_GCC_OPTION([-Werror])
   	      AX_CFLAGS_GCC_OPTION([-Wno-error], [UIM_SCM_CFLAGS])
-  	      AX_CFLAGS_GCC_OPTION([-Wno-error], [SCIM_CFLAGS])
 	    fi
     ])
 AC_SUBST(UIM_SCM_CFLAGS)
-AC_SUBST(SCIM_CFLAGS)
 AC_SUBST(QT_CONFIG_OPTS)
 
 dnl *************************
@@ -2161,7 +2134,6 @@ Configure Result :
    SKK             : ${use_skk}
    Wnn             : ${use_wnn}
    m17n-lib        : ${use_m17nlib}
-   SCIM            : ${use_scim}
    cURL            : ${use_curl}
    expat           : ${expat_found}
    OpenSSL         : ${use_openssl}

diff --git a/make-dist.sh b/make-dist.sh
@@ -8,7 +8,7 @@ LIBGCROOTS_TAG="libgcroots-0.2.3"
 CONF_MAINT="--enable-maintainer-mode"
 CONF_NOWERROR="--disable-warnings-into-error"
 CONF_COMMON="$CONF_MAINT $CONF_NOWERROR"
-CONF_NONE="$CONF_COMMON --disable-debug --disable-fep --disable-emacs --disable-gnome-applet --disable-kde-applet --disable-pref --disable-dict --without-anthy --without-canna --without-mana --without-prime --without-skk --without-x --without-xft --without-m17nlib --without-scim --without-gtk2 --without-qt --without-qt-immodule --disable-compat-scm --without-eb --without-libedit"
+CONF_NONE="$CONF_COMMON --disable-debug --disable-fep --disable-emacs --disable-gnome-applet --disable-kde-applet --disable-pref --disable-dict --without-anthy --without-canna --without-mana --without-prime --without-skk --without-x --without-xft --without-m17nlib --without-gtk2 --without-qt --without-qt-immodule --disable-compat-scm --without-eb --without-libedit"
 CONF_DEFAULT="$CONF_COMMON"
 
 for file in "/etc/eb.conf" "/usr/lib64/eb.conf" "/usr/lib/eb.conf" \
@@ -24,9 +24,8 @@ if test -z "$EB_CONF"; then
     exit 1
 fi
 
-# --without-scim since it is broken
 # --without-qt
-CONF_FULL_WO_MAINT="$CONF_NOWERROR --enable-debug --enable-fep --enable-emacs --enable-gnome-applet --enable-gnome3-applet --enable-kde-applet --enable-kde4-applet --enable-pref --enable-dict --enable-notify=libnotify,knotify4 --with-anthy --with-canna --with-wnn --with-sj3 --with-mana --with-prime --with-m17nlib --without-scim --with-gtk2 --with-gtk3 --without-qt --without-qt-immodule --enable-compat-scm --with-eb --with-eb-conf=$EB_CONF --with-libedit --with-qt4 --with-qt4-immodule --with-qt5 --with-qt5-immodule"
+CONF_FULL_WO_MAINT="$CONF_NOWERROR --enable-debug --enable-fep --enable-emacs --enable-gnome-applet --enable-gnome3-applet --enable-kde-applet --enable-kde4-applet --enable-pref --enable-dict --enable-notify=libnotify,knotify4 --with-anthy --with-canna --with-wnn --with-sj3 --with-mana --with-prime --with-m17nlib --with-gtk2 --with-gtk3 --without-qt --without-qt-immodule --enable-compat-scm --with-eb --with-eb-conf=$EB_CONF --with-libedit --with-qt4 --with-qt4-immodule --with-qt5 --with-qt5-immodule"
 CONF_FULL="$CONF_MAINT $CONF_FULL_WO_MAINT"
 
 git submodule update --init --recursive

diff --git a/po/POTFILES.in b/po/POTFILES.in
@@ -87,7 +87,6 @@ scm/prime-key-custom.scm
 scm/prime.scm
 scm/process.scm
 scm/pyload.scm
-scm/scim.scm
 scm/sj3-custom.scm
 scm/sj3-key-custom.scm
 scm/sj3.scm

diff --git a/po/fr.po b/po/fr.po
@@ -4273,7 +4273,6 @@ msgid "direct"
 msgstr ""
 
 #: ../scm/direct.scm:54 ../scm/generic.scm:72 ../scm/m17nlib.scm:50
-#: ../scm/scim.scm:63
 msgid "Direct Input Mode"
 msgstr ""
 
@@ -4728,16 +4727,14 @@ msgid "unknown prediction method"
 msgstr ""
 
 #: ../scm/generic.scm:71 ../scm/m17nlib-custom.scm:48 ../scm/m17nlib.scm:49
-#: ../scm/scim.scm:62
 msgid "off"
 msgstr "Désactivée"
 
 #: ../scm/generic.scm:86 ../scm/m17nlib-custom.scm:53 ../scm/m17nlib.scm:63
-#: ../scm/scim.scm:76
 msgid "on"
 msgstr "Activée"
 
-#: ../scm/generic.scm:87 ../scm/m17nlib.scm:64 ../scm/scim.scm:77
+#: ../scm/generic.scm:87 ../scm/m17nlib.scm:64
 msgid " Mode"
 msgstr ""
 
@@ -6651,10 +6648,6 @@ msgstr "Pinyin (traditionnel)"
 msgid "Pinyin input method (Traditional Chinese version)"
 msgstr ""
 
-#: ../scm/scim.scm:338
-msgid "An input method provided by the scim library"
-msgstr ""
-
 #: ../scm/sj3-custom.scm:35
 msgid "SJ3"
 msgstr ""

diff --git a/po/ja.po b/po/ja.po
@@ -4399,7 +4399,6 @@ msgid "direct"
 msgstr "直接入力"
 
 #: ../scm/direct.scm:54 ../scm/generic.scm:72 ../scm/m17nlib.scm:50
-#: ../scm/scim.scm:63
 msgid "Direct Input Mode"
 msgstr "直接入力モード"
 
@@ -4856,16 +4855,14 @@ msgid "unknown prediction method"
 msgstr "不明な予測方法"
 
 #: ../scm/generic.scm:71 ../scm/m17nlib-custom.scm:48 ../scm/m17nlib.scm:49
-#: ../scm/scim.scm:62
 msgid "off"
 msgstr "オフ"
 
 #: ../scm/generic.scm:86 ../scm/m17nlib-custom.scm:53 ../scm/m17nlib.scm:63
-#: ../scm/scim.scm:76
 msgid "on"
 msgstr "オン"
 
-#: ../scm/generic.scm:87 ../scm/m17nlib.scm:64 ../scm/scim.scm:77
+#: ../scm/generic.scm:87 ../scm/m17nlib.scm:64
 msgid " Mode"
 msgstr " モード"
 
@@ -6788,10 +6785,6 @@ msgstr "ピンイン (繁体字)"
 msgid "Pinyin input method (Traditional Chinese version)"
 msgstr "ピンイン入力方式 (繁体字版)"
 
-#: ../scm/scim.scm:338
-msgid "An input method provided by the scim library"
-msgstr "SCIMライブラリが提供する入力方式"
-
 #: ../scm/sj3-custom.scm:35
 msgid "SJ3"
 msgstr "SJ3"

diff --git a/po/ko.po b/po/ko.po
@@ -4290,7 +4290,6 @@ msgid "direct"
 msgstr "직접"
 
 #: ../scm/direct.scm:54 ../scm/generic.scm:72 ../scm/m17nlib.scm:50
-#: ../scm/scim.scm:63
 msgid "Direct Input Mode"
 msgstr "직접 입력 모드"
 
@@ -4745,16 +4744,14 @@ msgid "unknown prediction method"
 msgstr ""
 
 #: ../scm/generic.scm:71 ../scm/m17nlib-custom.scm:48 ../scm/m17nlib.scm:49
-#: ../scm/scim.scm:62
 msgid "off"
 msgstr "끄기"
 
 #: ../scm/generic.scm:86 ../scm/m17nlib-custom.scm:53 ../scm/m17nlib.scm:63
-#: ../scm/scim.scm:76
 msgid "on"
 msgstr "켜기"
 
-#: ../scm/generic.scm:87 ../scm/m17nlib.scm:64 ../scm/scim.scm:77
+#: ../scm/generic.scm:87 ../scm/m17nlib.scm:64
 msgid " Mode"
 msgstr " 모드"
 
@@ -6668,10 +6665,6 @@ msgstr ""
 msgid "Pinyin input method (Traditional Chinese version)"
 msgstr ""
 
-#: ../scm/scim.scm:338
-msgid "An input method provided by the scim library"
-msgstr ""
-
 #: ../scm/sj3-custom.scm:35
 msgid "SJ3"
 msgstr ""

diff --git a/scm/Makefile.am b/scm/Makefile.am
@@ -46,7 +46,6 @@ SCM_FILES = plugin.scm im.scm im-custom.scm lazy-load.scm init.scm \
  look.scm look-custom.scm \
  m17nlib.scm m17nlib-custom.scm \
  zaurus.scm \
- scim.scm \
  social-ime.scm social-ime-custom.scm social-ime-key-custom.scm \
  ajax-ime.scm ajax-ime-custom.scm ajax-ime-key-custom.scm \
  yahoo-jp.scm yahoo-jp-custom.scm yahoo-jp-key-custom.scm \
@@ -110,9 +109,6 @@ module_names += "xmload"
 # less preferable IMs
 module_names += "pyload" "viqr" "ipa-x-sampa"  "look"
 #"hangul"
-if SCIM
-  module_names += "scim"
-endif
 # web based IMs
   module_names += "ajax-ime" "social-ime" "google-cgiapi-jp" "baidu-olime-jp"
 if EXPAT

diff --git a/scm/event.scm b/scm/event.scm
@@ -116,7 +116,7 @@
 (define-event 'client-info
   downward-event-rec-spec
   '((locale      #f)
-    (bridge      "")    ;; "gtk", "uim-xim", "macuim", "scim-uim", ...
+    (bridge      "")    ;; "gtk", "uim-xim", "macuim", ...
     (application "")    ;; acquire via bridge-dependent methods such as basename `echo $0`
     (expected    "")))  ;; "direct", "number", "upper-alphabet", "ja-hiragana", ...
 

diff --git a/scm/im.scm b/scm/im.scm
@@ -131,7 +131,7 @@
 		get-candidate set-candidate-index prop input-string
 		focus-in focus-out place displace)
     ;; Rejects symbols that cannot be valid external representation such
-    ;; as "scim-Probhat(phonetic)", "3foo", "#foo", ...
+    ;; as "3foo", "#foo", ...
     (if (guard (err (else #t))
 	  (not (eq? name
 		    (read (open-input-string (symbol->string name))))))