[packages/ibus-pinyin] - updated to 1.4.99.20120808 - phrase databases are now provided by pyzy
baggins
baggins at pld-linux.org
Tue Nov 6 13:35:17 CET 2012
commit 860ec198cf5d308cacb90caf46c0dc75776b70e1
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Tue Nov 6 13:34:25 2012 +0100
- updated to 1.4.99.20120808
- phrase databases are now provided by pyzy
ibus-pinyin-boost.patch | 60 ---------------------------------
ibus-pinyin-xx-icon-symbol.patch | 72 ++++++++++++++++++++++++++++++++++++++++
2 files changed, 72 insertions(+), 60 deletions(-)
---
diff --git a/ibus-pinyin-boost.patch b/ibus-pinyin-boost.patch
deleted file mode 100644
index 00ada3f..0000000
--- a/ibus-pinyin-boost.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-diff -ur ibus-pinyin-1.3.99.20110706/src/PYDatabase.h ibus-pinyin-1.3.99.20110706.boost/src/PYDatabase.h
---- ibus-pinyin-1.3.99.20110706/src/PYDatabase.h 2011-02-07 17:33:37.000000000 +0100
-+++ ibus-pinyin-1.3.99.20110706.boost/src/PYDatabase.h 2011-07-20 13:31:54.360627955 +0200
-@@ -34,7 +34,7 @@
- struct Phrase;
-
- class SQLStmt;
--typedef std::shared_ptr<SQLStmt> SQLStmtPtr;
-+typedef boost::shared_ptr<SQLStmt> SQLStmtPtr;
-
- class Database;
-
-diff -ur ibus-pinyin-1.3.99.20110706/src/PYEditor.h ibus-pinyin-1.3.99.20110706.boost/src/PYEditor.h
---- ibus-pinyin-1.3.99.20110706/src/PYEditor.h 2011-01-15 01:32:10.000000000 +0100
-+++ ibus-pinyin-1.3.99.20110706.boost/src/PYEditor.h 2011-07-20 13:31:27.927627960 +0200
-@@ -34,7 +34,7 @@
- class Config;
-
- class Editor;
--typedef std::shared_ptr<Editor> EditorPtr;
-+typedef boost::shared_ptr<Editor> EditorPtr;
-
- class Editor {
- public:
-diff -ur ibus-pinyin-1.3.99.20110706/src/PYPhraseEditor.h ibus-pinyin-1.3.99.20110706.boost/src/PYPhraseEditor.h
---- ibus-pinyin-1.3.99.20110706/src/PYPhraseEditor.h 2011-01-15 01:32:10.000000000 +0100
-+++ ibus-pinyin-1.3.99.20110706.boost/src/PYPhraseEditor.h 2011-07-20 13:30:12.702627978 +0200
-@@ -125,7 +125,7 @@
- PinyinArray m_pinyin;
- guint m_cursor;
- PinyinProperties & m_props;
-- std::shared_ptr<Query> m_query;
-+ boost::shared_ptr<Query> m_query;
- Config & m_config;
- };
-
-diff -ur ibus-pinyin-1.3.99.20110706/src/PYSpecialPhraseTable.h ibus-pinyin-1.3.99.20110706.boost/src/PYSpecialPhraseTable.h
---- ibus-pinyin-1.3.99.20110706/src/PYSpecialPhraseTable.h 2011-01-15 01:32:10.000000000 +0100
-+++ ibus-pinyin-1.3.99.20110706.boost/src/PYSpecialPhraseTable.h 2011-07-20 13:33:22.301627936 +0200
-@@ -30,7 +30,7 @@
- namespace PY {
-
- class SpecialPhrase;
--typedef std::shared_ptr<SpecialPhrase> SpecialPhrasePtr;
-+typedef boost::shared_ptr<SpecialPhrase> SpecialPhrasePtr;
-
- class SpecialPhraseTable {
- private:
-diff -ur ibus-pinyin-1.3.99.20110706/src/PYUtil.h ibus-pinyin-1.3.99.20110706.boost/src/PYUtil.h
---- ibus-pinyin-1.3.99.20110706/src/PYUtil.h 2011-01-15 01:32:10.000000000 +0100
-+++ ibus-pinyin-1.3.99.20110706.boost/src/PYUtil.h 2011-07-20 13:30:01.115627981 +0200
-@@ -43,7 +43,7 @@
-
- namespace std {
- // import boost::shared_ptr to std namespace
-- using boost::shared_ptr;
-+ // using boost::shared_ptr;
- // import boost::scoped_ptr to std namespace, and rename to unique_ptr
- // XXX: the unique_ptr can transfer the pointer ownership,
- // but scoped_ptr cannot.
diff --git a/ibus-pinyin-xx-icon-symbol.patch b/ibus-pinyin-xx-icon-symbol.patch
new file mode 100644
index 0000000..19a9aa0
--- /dev/null
+++ b/ibus-pinyin-xx-icon-symbol.patch
@@ -0,0 +1,72 @@
+Index: ibus-pinyin-1.3.99.20110706/configure.ac
+===================================================================
+--- ibus-pinyin-1.3.99.20110706.orig/configure.ac
++++ ibus-pinyin-1.3.99.20110706/configure.ac
+@@ -146,6 +146,10 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GET
+
+ AM_GLIB_GNU_GETTEXT
+
++# hotkeys and symbol properties in component xml
++IBUS_WITH_HOTKEYS([Control+space,Alt+grave,Alt+Release+Alt_R])
++IBUS_SET_SYMBOL([中])
++
+ # --disable-lua-extension
+ AC_ARG_ENABLE(lua-extension,
+ AS_HELP_STRING([--disable-lua-extension],
+Index: ibus-pinyin-1.3.99.20110706/m4/ibus.m4
+===================================================================
+--- /dev/null
++++ ibus-pinyin-1.3.99.20110706/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)
++])
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ibus-pinyin.git/commitdiff/860ec198cf5d308cacb90caf46c0dc75776b70e1
More information about the pld-cvs-commit
mailing list