Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Remove <symbol> and <hotkeys> checks, as we support only ibus 1.4 or …

…later.
  • Loading branch information...
commit 40adc3e1849167d2f93d4562ed7c39489122bf96 1 parent 2500ac6
Daiki Ueno authored
Showing with 2 additions and 58 deletions.
  1. +0 −12 configure.ac
  2. +0 −43 m4/ibus.m4
  3. +2 −3 skk.xml.in.in
12 configure.ac
View
@@ -82,18 +82,6 @@ AC_SUBST(GETTEXT_PACKAGE)
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Define to the read-only architecture-independent data directory.])
AM_GLIB_GNU_GETTEXT
-save_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS $IBUS_CFLAGS"
-
-save_LIBS="$LIBS"
-LIBS="$LIBS $IBUS_LIBS"
-
-IBUS_WITH_HOTKEYS
-IBUS_SET_SYMBOL([&#x3042;])
-
-CFLAGS="$save_CFLAGS"
-LIBS="$save_LIBS"
-
# OUTPUT files
AC_CONFIG_FILES([ po/Makefile.in
Makefile
43 m4/ibus.m4
View
@@ -1,43 +0,0 @@
-# IBUS_WITH_HOTKEYS([DEFAULT])
-AC_DEFUN([IBUS_WITH_HOTKEYS], [
- IBUS_HOTKEYS_DEFAULT=m4_default([$1], [Control+space,Zenkaku_Hankaku])
- AC_ARG_WITH(hotkeys,
- [AC_HELP_STRING([--with-hotkeys=HOTKEYS],
- [Use hotkeys for ibus bridge mode. (available value: yes/no/keys)])],
- [with_hotkeys="$withval"],
- [with_hotkeys="no"])
- if test x$with_hotkeys = xno; then
- IBUS_HOTKEYS_XML="<!-- <hotkeys>${IBUS_HOTKEYS_DEFAULT}</hotkeys> -->"
- elif test x$with_hotkeys = xyes -o x$with_hotkeys = x; then
- IBUS_HOTKEYS="$IBUS_HOTKEYS_DEFAULT"
- IBUS_HOTKEYS_XML="<hotkeys>${IBUS_HOTKEYS}</hotkeys>"
- else
- IBUS_HOTKEYS="$with_hotkeys"
- IBUS_HOTKEYS_XML="<hotkeys>${IBUS_HOTKEYS}</hotkeys>"
- fi
- if test x$IBUS_HOTKEYS != x; then
- AC_DEFINE_UNQUOTED(IBUS_IBUS_HOTKEYS, ["$IBUS_HOTKEYS"],
- [IME specific hotkeys for IBus])
- AC_SUBST(IBUS_HOTKEYS)
- fi
- AC_SUBST(IBUS_HOTKEYS_XML)
-])
-
-# IBUS_SET_SYMBOL(SYMBOL)
-AC_DEFUN([IBUS_SET_SYMBOL], [
- IBUS_SYMBOL="$1"
- embed_symbol=no
- AC_CHECK_FUNC(ibus_engine_desc_get_symbol, embed_symbol=yes)
- if test x$embed_symbol = xyes; then
- IBUS_SYMBOL_XML="<symbol>${IBUS_SYMBOL}</symbol>"
- else
- IBUS_SYMBOL_XML="<!-- <symbol>${IBUS_SYMBOL}</symbol> -->"
- IBUS_SYMBOL=
- fi
- if test x$IBUS_SYMBOL != x; then
- AC_DEFINE_UNQUOTED([IBUS_SYMBOL], ["$IBUS_SYMBOL"],
- [Icon symbol string for IBus])
- AC_SUBST(IBUS_SYMBOL)
- fi
- AC_SUBST(IBUS_SYMBOL_XML)
-])
5 skk.xml.in.in
View
@@ -18,12 +18,11 @@
<license>GPL</license>
<author>Daiki Ueno &lt;ueno@unixuser.org&gt;</author>
<icon>${pkgdatadir}/icons/ibus-skk.svg</icon>
- <layout>jp</layout>
+ <layout>us</layout>
<longname>SKK</longname>
<description>SKK Input Method</description>
<rank>70</rank>
- @IBUS_HOTKEYS_XML@
- @IBUS_SYMBOL_XML@
+ <symbol>&#x3042;</symbol>
</engine>
</engines>
</component>
Please sign in to comment.
Something went wrong with that request. Please try again.