From ff70ed76fc1238cf5cdd7be3ef0c6306ff020a87 Mon Sep 17 00:00:00 2001 From: Daiki Ueno Date: Mon, 8 Aug 2011 10:15:01 +0900 Subject: [PATCH] Update to 1.3.2-9. --- ibus-m17n-xkb-options.patch | 295 ++++----------------------------- ibus-m17n-xx-icon-symbol.patch | 40 ++--- ibus-m17n.spec | 8 +- series | 4 - 4 files changed, 60 insertions(+), 287 deletions(-) delete mode 100644 series diff --git a/ibus-m17n-xkb-options.patch b/ibus-m17n-xkb-options.patch index 81e3c9c..6c3d8b9 100644 --- a/ibus-m17n-xkb-options.patch +++ b/ibus-m17n-xkb-options.patch @@ -1,43 +1,4 @@ Patch to set certain XKB options when an m17n IME is set. -Index: ibus-m17n-1.3.2/configure.ac -=================================================================== ---- ibus-m17n-1.3.2.orig/configure.ac -+++ ibus-m17n-1.3.2/configure.ac -@@ -106,6 +106,14 @@ AC_CHECK_FUNCS([ibus_engine_get_surround - CFLAGS="$save_CFLAGS" - LIBS="$save_LIBS" - -+# check libxklavier -+have_libxklavier=no -+PKG_CHECK_MODULES([LIBXKLAVIER], [libxklavier gdk-3.0 x11], -+ have_libxklavier=yes) -+if test x$have_libxklavier != xno; then -+ AC_DEFINE([HAVE_LIBXKLAVIER], [1], [Define if libxklavier is found]) -+fi -+ - # define GETTEXT_* variables - GETTEXT_PACKAGE=ibus-m17n - AC_SUBST(GETTEXT_PACKAGE) -Index: ibus-m17n-1.3.2/src/Makefile.am -=================================================================== ---- ibus-m17n-1.3.2.orig/src/Makefile.am -+++ ibus-m17n-1.3.2/src/Makefile.am -@@ -66,10 +66,15 @@ ibus_engine_m17n_SOURCES = \ - engine.c \ - engine.h \ - $(NULL) -+ibus_engine_m17n_CFLAGS = \ -+ @LIBXKLAVIER_CFLAGS@ \ -+ $(AM_CFLAGS) \ -+ $(NULL) - ibus_engine_m17n_LDADD = \ - libm17ncommon.a \ - @IBUS_LIBS@ \ - @M17N_LIBS@ \ -+ @LIBXKLAVIER_LIBS@ \ - $(NULL) - - if HAVE_GTK Index: ibus-m17n-1.3.2/src/default.xml.in.in =================================================================== --- ibus-m17n-1.3.2.orig/src/default.xml.in.in @@ -50,21 +11,21 @@ Index: ibus-m17n-1.3.2/src/default.xml.in.in + m17n:bn:inscript* 2 FALSE -+ lv3:ralt_switch ++ default[lv3:ralt_switch] - m17n:gu:inscript + m17n:gu:inscript* 2 FALSE -+ lv3:ralt_switch ++ default[lv3:ralt_switch] - m17n:hi:inscript + m17n:hi:inscript* 2 FALSE -+ lv3:ralt_switch ++ default[lv3:ralt_switch] m17n:kn:kgp @@ -76,21 +37,21 @@ Index: ibus-m17n-1.3.2/src/default.xml.in.in + m17n:mai:inscript* 2 FALSE -+ lv3:ralt_switch ++ default[lv3:ralt_switch] - m17n:ml:inscript + m17n:ml:inscript* 2 FALSE -+ lv3:ralt_switch ++ default[lv3:ralt_switch] - m17n:mr:inscript + m17n:mr:inscript* 2 FALSE -+ lv3:ralt_switch ++ default[lv3:ralt_switch] m17n:ne:rom @@ -102,14 +63,14 @@ Index: ibus-m17n-1.3.2/src/default.xml.in.in + m17n:or:inscript* 2 FALSE -+ lv3:ralt_switch ++ default[lv3:ralt_switch] - m17n:pa:inscript + m17n:pa:inscript* 2 FALSE -+ lv3:ralt_switch ++ default[lv3:ralt_switch] m17n:sa:harvard-kyoto @@ -121,13 +82,13 @@ Index: ibus-m17n-1.3.2/src/default.xml.in.in + m17n:sd:inscript* 2 FALSE -+ lv3:ralt_switch ++ default[lv3:ralt_switch] m17n:si:wijesekera 2 FALSE -+ lv3:ralt_switch ++ default[lv3:ralt_switch] m17n:ta:tamil99 @@ -139,7 +100,7 @@ Index: ibus-m17n-1.3.2/src/default.xml.in.in + m17n:te:inscript* 2 FALSE -+ lv3:ralt_switch ++ default[lv3:ralt_switch]