[ibus-skk/f16] Update to 1.3.7-2.
Daiki Ueno
ueno at fedoraproject.org
Thu Aug 4 03:12:38 UTC 2011
commit 3b45568d43a0ce920bb97d351d813aa45a0c3a4a
Author: Daiki Ueno <ueno at unixuser.org>
Date: Thu Aug 4 12:12:21 2011 +0900
Update to 1.3.7-2.
ibus-skk-xx-icon-symbol.patch | 100 +++++++++++++++++++++++++++++++++++++++++
ibus-skk.spec | 13 +++--
2 files changed, 108 insertions(+), 5 deletions(-)
---
diff --git a/ibus-skk-xx-icon-symbol.patch b/ibus-skk-xx-icon-symbol.patch
new file mode 100644
index 0000000..1f10e99
--- /dev/null
+++ b/ibus-skk-xx-icon-symbol.patch
@@ -0,0 +1,100 @@
+From 548ff9d448f3ecca7aa6c009f3f55e1dd481ea5b Mon Sep 17 00:00:00 2001
+From: Daiki Ueno <ueno at unixuser.org>
+Date: Thu, 4 Aug 2011 10:56:03 +0900
+Subject: [PATCH] Supply hotkeys and symbol in engine desc.
+
+---
+ configure.ac | 3 ++
+ engine/skk.xml.in.in | 2 +
+ m4/ibus.m4 | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++
+ 3 files changed, 57 insertions(+), 0 deletions(-)
+ create mode 100644 m4/ibus.m4
+
+diff --git a/configure.ac b/configure.ac
+index 861e15d..87f4c14 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -80,6 +80,9 @@ AC_SUBST(GETTEXT_PACKAGE)
+ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Define to the read-only architecture-independent data directory.])
+ AM_GLIB_GNU_GETTEXT
+
++IBUS_WITH_HOTKEYS
++IBUS_SET_SYMBOL([あ])
++
+ # OUTPUT files
+ AC_CONFIG_FILES([ po/Makefile.in
+ Makefile
+diff --git a/engine/skk.xml.in.in b/engine/skk.xml.in.in
+index 759eec5..5a519fc 100644
+--- a/engine/skk.xml.in.in
++++ b/engine/skk.xml.in.in
+@@ -22,6 +22,8 @@
+ <longname>SKK</longname>
+ <description>SKK Input Method</description>
+ <rank>70</rank>
++ @IBUS_HOTKEYS_XML@
++ @IBUS_SYMBOL_XML@
+ </engine>
+ </engines>
+ </component>
+diff --git a/m4/ibus.m4 b/m4/ibus.m4
+new file mode 100644
+index 0000000..f8f074a
+--- /dev/null
++++ b/m4/ibus.m4
+@@ -0,0 +1,52 @@
++# 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"
++ if test x$PYTHON = x; then
++ AM_PATH_PYTHON([2.5])
++ fi
++ AC_MSG_CHECKING([if ibus supports icon symbol])
++ $PYTHON <<_IBUS_SYMBOL_TEST
++import ibus
++engine = ibus.EngineDesc('test')
++exit(not hasattr(engine, 'symbol'))
++_IBUS_SYMBOL_TEST
++ if test $? -eq 0; then
++ IBUS_SYMBOL_XML="<symbol>${IBUS_SYMBOL}</symbol>"
++ AC_MSG_RESULT([yes])
++ else
++ IBUS_SYMBOL_XML="<!-- <symbol>${IBUS_SYMBOL}</symbol> -->"
++ IBUS_SYMBOL=
++ AC_MSG_RESULT([no])
++ 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)
++])
+--
+1.7.6
+
diff --git a/ibus-skk.spec b/ibus-skk.spec
index 98ce6d2..9c043c2 100644
--- a/ibus-skk.spec
+++ b/ibus-skk.spec
@@ -1,18 +1,18 @@
Name: ibus-skk
Version: 1.3.7
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Japanese SKK input method for ibus
Group: System Environment/Libraries
License: GPLv2+
URL: http://github.com/ueno/ibus-skk
Source0: http://cloud.github.com/downloads/ueno/ibus-skk/%{name}-%{version}.tar.gz
-#Patch0: ibus-skk-vkbd.patch
+Patch0: ibus-skk-xx-icon-symbol.patch
BuildArch: noarch
BuildRequires: python-devel, pkgconfig, intltool
-#BuildRequires: gnome-common, glib2-devel
+BuildRequires: gnome-common, glib2-devel
Requires: ibus, skkdic
%description
@@ -20,8 +20,8 @@ A Japanese Simple Kana Kanji Input Method Engine for ibus.
%prep
%setup -q
-#patch0 -p1 -b .vkbd
-#NOCONFIGURE=1 ./autogen.sh
+%patch0 -p1 -b .xx-icon-symbol
+NOCONFIGURE=1 ./autogen.sh
%build
%configure
@@ -44,6 +44,9 @@ make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
%changelog
+* Thu Aug 4 2011 Daiki Ueno <dueno at redhat.com> - 1.3.7-2
+- add ibus-skk-xx-icon-symbol.patch (closes #727020)
+
* Wed Jun 15 2011 Daiki Ueno <dueno at redhat.com> - 1.3.7-1
- new upstream release
More information about the scm-commits
mailing list