Hello community, here is the log from the commit of package fcitx-chewing for openSUSE:Factory checked in at 2014-06-10 14:39:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/fcitx-chewing (Old) and /work/SRC/openSUSE:Factory/.fcitx-chewing.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "fcitx-chewing" Changes: -------- --- /work/SRC/openSUSE:Factory/fcitx-chewing/fcitx-chewing.changes 2013-06-26 20:28:07.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.fcitx-chewing.new/fcitx-chewing.changes 2014-06-10 14:39:13.000000000 +0200 @@ -1,0 +2,7 @@ +Mon Jun 9 04:57:58 UTC 2014 - [email protected] + +- update version 0.2.2 + * add libchewing 0.4.0 compatibility +- add patch: fcitx-chewing-openSUSE-12.3.patch + +------------------------------------------------------------------- Old: ---- fcitx-chewing-0.2.1.tar.xz New: ---- fcitx-chewing-0.2.2.tar.xz fcitx-chewing-openSUSE-12.3.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fcitx-chewing.spec ++++++ --- /var/tmp/diff_new_pack.OfKEeC/_old 2014-06-10 14:39:14.000000000 +0200 +++ /var/tmp/diff_new_pack.OfKEeC/_new 2014-06-10 14:39:14.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package fcitx-chewing # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,13 +17,15 @@ Name: fcitx-chewing -Version: 0.2.1 +Version: 0.2.2 Release: 0 Summary: Chewing Wrapper for Fcitx License: GPL-2.0+ Group: System/I18n/Chinese Url: https://github.com/fcitx/fcitx-chewing -Source: https://fcitx.googlecode.com/files/%{name}-%{version}.tar.xz +Source: http://download.fcitx-im.org/%{name}/%{name}-%{version}.tar.xz +#PATCH-FIX-OPENSUSE [email protected] build for 12.3 +Patch: %{name}-openSUSE-12.3.patch BuildRequires: cmake BuildRequires: fcitx-devel BuildRequires: fdupes @@ -43,6 +45,7 @@ %prep %setup -q +%patch -p1 %build mkdir -pv build ++++++ fcitx-chewing-0.2.1.tar.xz -> fcitx-chewing-0.2.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx-chewing-0.2.1/CMakeLists.txt new/fcitx-chewing-0.2.2/CMakeLists.txt --- old/fcitx-chewing-0.2.1/CMakeLists.txt 2013-06-03 20:02:38.000000000 +0200 +++ new/fcitx-chewing-0.2.2/CMakeLists.txt 2014-04-22 00:01:08.000000000 +0200 @@ -4,7 +4,7 @@ set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH}) -FIND_PACKAGE(Chewing REQUIRED) +FIND_PACKAGE(Chewing 0.4.0 REQUIRED) FIND_PACKAGE(Fcitx 4.2.7 REQUIRED) _fcitx_add_uninstall_target() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx-chewing-0.2.1/cmake/FindChewing.cmake new/fcitx-chewing-0.2.2/cmake/FindChewing.cmake --- old/fcitx-chewing-0.2.1/cmake/FindChewing.cmake 2013-06-03 20:02:38.000000000 +0200 +++ new/fcitx-chewing-0.2.2/cmake/FindChewing.cmake 2014-04-22 00:01:08.000000000 +0200 @@ -27,11 +27,12 @@ NAMES chewing HINTS ${PC_LIBCHEWING_LIBDIR}) -_pkgconfig_invoke("chewing" CHEWING DATADIR "" "--variable=datadir") - set(CHEWING_INCLUDE_DIR "${CHEWING_MAIN_INCLUDE_DIR}") +set(CHEWING_FOUND ${PC_LIBCHEWING_FOUND}) include(FindPackageHandleStandardArgs) -find_package_handle_standard_args(Chewing DEFAULT_MSG CHEWING_LIBRARIES CHEWING_MAIN_INCLUDE_DIR CHEWING_DATADIR) +find_package_handle_standard_args(Chewing FOUND_VAR CHEWING_FOUND + REQUIRED_VARS CHEWING_LIBRARIES CHEWING_MAIN_INCLUDE_DIR + VERSION_VAR PC_LIBCHEWING_VERSION) mark_as_advanced(CHEWING_INCLUDE_DIR CHEWING_LIBRARIES) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx-chewing-0.2.1/po/de.po new/fcitx-chewing-0.2.2/po/de.po --- old/fcitx-chewing-0.2.1/po/de.po 2013-06-03 20:02:38.000000000 +0200 +++ new/fcitx-chewing-0.2.2/po/de.po 2014-04-22 00:01:08.000000000 +0200 @@ -1,28 +1,58 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# +# # Translators: -# mar well <[email protected]>, 2013 +# mar well <[email protected]>, 2013 msgid "" msgstr "" "Project-Id-Version: fcitx\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2013-06-03 14:02-0400\n" +"POT-Creation-Date: 2013-04-25 00:01-0400\n" "PO-Revision-Date: 2013-05-22 06:07+0000\n" -"Last-Translator: mar well <[email protected]>\n" -"Language-Team: German (http://www.transifex.com/projects/p/fcitx/language/"; -"de/)\n" -"Language: de\n" +"Last-Translator: mar well <[email protected]>\n" +"Language-Team: German (http://www.transifex.com/projects/p/fcitx/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: de\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +#: src/eim.c:143 src/chewing.conf.in:3 src/fcitx-chewing.conf.in:3 +#: src/fcitx-chewing.desc:1 src/fcitx-chewing.desc:13 +#: src/fcitx-chewing.desc:18 src/fcitx-chewing.desc:23 +#: src/fcitx-chewing.desc:28 src/fcitx-chewing.desc:33 +msgid "Chewing" +msgstr "Chewing" + +#: src/fcitx-chewing.conf.in:4 +msgid "Chewing Wrapper For Fcitx" +msgstr "Chewing Wrapper für Fcitx" + +#: src/fcitx-chewing.desc:3 +msgid "Selection Key" +msgstr "Auswahltaste" + #: src/fcitx-chewing.desc:6 msgid "1234567890" msgstr "1234567890" +#: src/fcitx-chewing.desc:7 +msgid "asdfghjkl;" +msgstr "asdfghjkl;" + +#: src/fcitx-chewing.desc:8 +msgid "asdfzxcv89" +msgstr "asdfzxcv89" + +#: src/fcitx-chewing.desc:9 +msgid "asdfjkl789" +msgstr "asdfjkl789" + +#: src/fcitx-chewing.desc:10 +msgid "aoeuhtn789" +msgstr "aoeuhtn789" + #: src/fcitx-chewing.desc:11 msgid "1234qweras" msgstr "1234qweras" @@ -31,57 +61,26 @@ msgid "Add Phrase Forward" msgstr "" -#: src/fcitx-chewing.desc:25 -msgid "Automatically shift cursor" -msgstr "Cursor automatisch anheben" - #: src/fcitx-chewing.desc:20 msgid "Backward phrase choice" msgstr "" -#: src/eim.c:143 src/chewing.conf.in:3 src/fcitx-chewing.conf.in:3 -#: src/fcitx-chewing.desc:1 src/fcitx-chewing.desc:13 -#: src/fcitx-chewing.desc:18 src/fcitx-chewing.desc:23 -#: src/fcitx-chewing.desc:28 src/fcitx-chewing.desc:33 -msgid "Chewing" -msgstr "Chewing" +#: src/fcitx-chewing.desc:25 +msgid "Automatically shift cursor" +msgstr "Cursor automatisch anheben" -#: src/fcitx-chewing.conf.in:4 -msgid "Chewing Wrapper For Fcitx" -msgstr "Chewing Wrapper für Fcitx" +#: src/fcitx-chewing.desc:30 +msgid "Space as selection key" +msgstr "SPACE als Auswahltaste" -#: src/fcitx-chewing.desc:46 -msgid "DACHEN_CP26 Keyboard" -msgstr "DACHEN_CP26 Tastatur" +#: src/fcitx-chewing.desc:35 +msgid "Keyboard Layout" +msgstr "Tastaturlayout" #: src/fcitx-chewing.desc:38 msgid "Default Keyboard" msgstr "Standard Tastatur" -#: src/fcitx-chewing.desc:44 -msgid "Dvorak Keyboard" -msgstr "Dvorak Tastatur" - -#: src/fcitx-chewing.desc:45 -msgid "Dvorak Keyboard with Hsu's support" -msgstr "Dvorak Keyboard mit Hsu's Unterstützung" - -#: src/fcitx-chewing.desc:42 -msgid "ETen Keyboard" -msgstr "ETen Tastatur" - -#: src/fcitx-chewing.desc:43 -msgid "ETen26 Keyboard" -msgstr "ETen26 Tastatur" - -#: src/fcitx-chewing.desc:41 -msgid "Gin-Yieh Keyboard" -msgstr "Gin-Yieh Tastatur" - -#: src/fcitx-chewing.desc:47 -msgid "Han-Yu PinYin Keyboard" -msgstr "Han-Yu PinYin Tastatur" - #: src/fcitx-chewing.desc:39 msgid "Hsu's Keyboard" msgstr "Hsu's Tastatur" @@ -90,30 +89,30 @@ msgid "IBM Keyboard" msgstr "IBM Tastatur" -#: src/fcitx-chewing.desc:35 -msgid "Keyboard Layout" -msgstr "Tastaturlayout" +#: src/fcitx-chewing.desc:41 +msgid "Gin-Yieh Keyboard" +msgstr "Gin-Yieh Tastatur" -#: src/fcitx-chewing.desc:3 -msgid "Selection Key" -msgstr "Auswahltaste" +#: src/fcitx-chewing.desc:42 +msgid "ETen Keyboard" +msgstr "ETen Tastatur" -#: src/fcitx-chewing.desc:30 -msgid "Space as selection key" -msgstr "SPACE als Auswahltaste" +#: src/fcitx-chewing.desc:43 +msgid "ETen26 Keyboard" +msgstr "ETen26 Tastatur" -#: src/fcitx-chewing.desc:10 -msgid "aoeuhtn789" -msgstr "aoeuhtn789" +#: src/fcitx-chewing.desc:44 +msgid "Dvorak Keyboard" +msgstr "Dvorak Tastatur" -#: src/fcitx-chewing.desc:7 -msgid "asdfghjkl;" -msgstr "asdfghjkl;" +#: src/fcitx-chewing.desc:45 +msgid "Dvorak Keyboard with Hsu's support" +msgstr "Dvorak Keyboard mit Hsu's Unterstützung" -#: src/fcitx-chewing.desc:9 -msgid "asdfjkl789" -msgstr "asdfjkl789" +#: src/fcitx-chewing.desc:46 +msgid "DACHEN_CP26 Keyboard" +msgstr "DACHEN_CP26 Tastatur" -#: src/fcitx-chewing.desc:8 -msgid "asdfzxcv89" -msgstr "asdfzxcv89" +#: src/fcitx-chewing.desc:47 +msgid "Han-Yu PinYin Keyboard" +msgstr "Han-Yu PinYin Tastatur" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx-chewing-0.2.1/po/ja.po new/fcitx-chewing-0.2.2/po/ja.po --- old/fcitx-chewing-0.2.1/po/ja.po 2013-06-03 20:02:38.000000000 +0200 +++ new/fcitx-chewing-0.2.2/po/ja.po 2014-04-22 00:01:08.000000000 +0200 @@ -1,28 +1,59 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# +# # Translators: -# しろう <>, 2013 +# shirou - しろう <[email protected]>, 2013 +# shirou - しろう <[email protected]>, 2013 msgid "" msgstr "" "Project-Id-Version: fcitx\n" "Report-Msgid-Bugs-To: [email protected]\n" "POT-Creation-Date: 2013-04-25 00:01-0400\n" -"PO-Revision-Date: 2013-04-14 13:46+0000\n" -"Last-Translator: しろう <>\n" -"Language-Team: Japanese (http://www.transifex.com/projects/p/fcitx/language/"; -"ja/)\n" -"Language: ja\n" +"PO-Revision-Date: 2013-08-07 15:08+0000\n" +"Last-Translator: shirou - しろう <[email protected]>\n" +"Language-Team: Japanese (http://www.transifex.com/projects/p/fcitx/language/ja/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: ja\n" "Plural-Forms: nplurals=1; plural=0;\n" +#: src/eim.c:143 src/chewing.conf.in:3 src/fcitx-chewing.conf.in:3 +#: src/fcitx-chewing.desc:1 src/fcitx-chewing.desc:13 +#: src/fcitx-chewing.desc:18 src/fcitx-chewing.desc:23 +#: src/fcitx-chewing.desc:28 src/fcitx-chewing.desc:33 +msgid "Chewing" +msgstr "" + +#: src/fcitx-chewing.conf.in:4 +msgid "Chewing Wrapper For Fcitx" +msgstr "" + +#: src/fcitx-chewing.desc:3 +msgid "Selection Key" +msgstr "選択キー" + #: src/fcitx-chewing.desc:6 msgid "1234567890" msgstr "1234567890" +#: src/fcitx-chewing.desc:7 +msgid "asdfghjkl;" +msgstr "asdfghjkl;" + +#: src/fcitx-chewing.desc:8 +msgid "asdfzxcv89" +msgstr "asdfzxcv89" + +#: src/fcitx-chewing.desc:9 +msgid "asdfjkl789" +msgstr "asdfjkl789" + +#: src/fcitx-chewing.desc:10 +msgid "aoeuhtn789" +msgstr "aoeuhtn789" + #: src/fcitx-chewing.desc:11 msgid "1234qweras" msgstr "1234qweras" @@ -31,57 +62,26 @@ msgid "Add Phrase Forward" msgstr "" -#: src/fcitx-chewing.desc:25 -msgid "Automatically shift cursor" -msgstr "" - #: src/fcitx-chewing.desc:20 msgid "Backward phrase choice" msgstr "" -#: src/eim.c:143 src/chewing.conf.in:3 src/fcitx-chewing.conf.in:3 -#: src/fcitx-chewing.desc:1 src/fcitx-chewing.desc:13 -#: src/fcitx-chewing.desc:18 src/fcitx-chewing.desc:23 -#: src/fcitx-chewing.desc:28 src/fcitx-chewing.desc:33 -msgid "Chewing" +#: src/fcitx-chewing.desc:25 +msgid "Automatically shift cursor" msgstr "" -#: src/fcitx-chewing.conf.in:4 -msgid "Chewing Wrapper For Fcitx" -msgstr "" +#: src/fcitx-chewing.desc:30 +msgid "Space as selection key" +msgstr "スペースを選択キーとして使う" -#: src/fcitx-chewing.desc:46 -msgid "DACHEN_CP26 Keyboard" -msgstr "DACHEN_CP26 キーボード" +#: src/fcitx-chewing.desc:35 +msgid "Keyboard Layout" +msgstr "キーボードレイアウト" #: src/fcitx-chewing.desc:38 msgid "Default Keyboard" msgstr "既定のキーボード" -#: src/fcitx-chewing.desc:44 -msgid "Dvorak Keyboard" -msgstr "Dvorak キーボード" - -#: src/fcitx-chewing.desc:45 -msgid "Dvorak Keyboard with Hsu's support" -msgstr "Hsu サポートの Dvorak キーボード" - -#: src/fcitx-chewing.desc:42 -msgid "ETen Keyboard" -msgstr "Eten キーボード" - -#: src/fcitx-chewing.desc:43 -msgid "ETen26 Keyboard" -msgstr "Eten26 キーボード" - -#: src/fcitx-chewing.desc:41 -msgid "Gin-Yieh Keyboard" -msgstr "Gin-Yieh キーボード" - -#: src/fcitx-chewing.desc:47 -msgid "Han-Yu PinYin Keyboard" -msgstr "Han-Yu PinYin キーボード" - #: src/fcitx-chewing.desc:39 msgid "Hsu's Keyboard" msgstr "Hsu キーボード" @@ -90,30 +90,30 @@ msgid "IBM Keyboard" msgstr "IBM キーボード" -#: src/fcitx-chewing.desc:35 -msgid "Keyboard Layout" -msgstr "キーボードレイアウト" +#: src/fcitx-chewing.desc:41 +msgid "Gin-Yieh Keyboard" +msgstr "Gin-Yieh キーボード" -#: src/fcitx-chewing.desc:3 -msgid "Selection Key" -msgstr "選択キー" +#: src/fcitx-chewing.desc:42 +msgid "ETen Keyboard" +msgstr "Eten キーボード" -#: src/fcitx-chewing.desc:30 -msgid "Space as selection key" -msgstr "" +#: src/fcitx-chewing.desc:43 +msgid "ETen26 Keyboard" +msgstr "Eten26 キーボード" -#: src/fcitx-chewing.desc:10 -msgid "aoeuhtn789" -msgstr "aoeuhtn789" +#: src/fcitx-chewing.desc:44 +msgid "Dvorak Keyboard" +msgstr "Dvorak キーボード" -#: src/fcitx-chewing.desc:7 -msgid "asdfghjkl;" -msgstr "asdfghjkl;" +#: src/fcitx-chewing.desc:45 +msgid "Dvorak Keyboard with Hsu's support" +msgstr "Hsu サポートの Dvorak キーボード" -#: src/fcitx-chewing.desc:9 -msgid "asdfjkl789" -msgstr "asdfjkl789" +#: src/fcitx-chewing.desc:46 +msgid "DACHEN_CP26 Keyboard" +msgstr "DACHEN_CP26 キーボード" -#: src/fcitx-chewing.desc:8 -msgid "asdfzxcv89" -msgstr "asdfzxcv89" +#: src/fcitx-chewing.desc:47 +msgid "Han-Yu PinYin Keyboard" +msgstr "Han-Yu PinYin キーボード" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx-chewing-0.2.1/po/zh_CN.po new/fcitx-chewing-0.2.2/po/zh_CN.po --- old/fcitx-chewing-0.2.1/po/zh_CN.po 2013-06-03 20:02:38.000000000 +0200 +++ new/fcitx-chewing-0.2.2/po/zh_CN.po 2014-04-22 00:01:08.000000000 +0200 @@ -1,7 +1,7 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# +# # Translators: # Xuetian Weng <[email protected]>, 2010-2012 # Xuetian Weng <[email protected]>, 2013 @@ -10,19 +10,50 @@ "Project-Id-Version: fcitx\n" "Report-Msgid-Bugs-To: [email protected]\n" "POT-Creation-Date: 2013-04-25 00:01-0400\n" -"PO-Revision-Date: 2013-04-11 19:01+0000\n" +"PO-Revision-Date: 2013-04-29 10:04+0000\n" "Last-Translator: Xuetian Weng <[email protected]>\n" -"Language-Team: Chinese (China) <[email protected]>\n" -"Language: zh_CN\n" +"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/fcitx/language/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: zh_CN\n" "Plural-Forms: nplurals=1; plural=0;\n" +#: src/eim.c:143 src/chewing.conf.in:3 src/fcitx-chewing.conf.in:3 +#: src/fcitx-chewing.desc:1 src/fcitx-chewing.desc:13 +#: src/fcitx-chewing.desc:18 src/fcitx-chewing.desc:23 +#: src/fcitx-chewing.desc:28 src/fcitx-chewing.desc:33 +msgid "Chewing" +msgstr "新酷音" + +#: src/fcitx-chewing.conf.in:4 +msgid "Chewing Wrapper For Fcitx" +msgstr "Fcitx 的 新酷音封装" + +#: src/fcitx-chewing.desc:3 +msgid "Selection Key" +msgstr "选词键" + #: src/fcitx-chewing.desc:6 msgid "1234567890" msgstr "1234567890" +#: src/fcitx-chewing.desc:7 +msgid "asdfghjkl;" +msgstr "asdfghjkl;" + +#: src/fcitx-chewing.desc:8 +msgid "asdfzxcv89" +msgstr "asdfzxcv89" + +#: src/fcitx-chewing.desc:9 +msgid "asdfjkl789" +msgstr "asdfjkl789" + +#: src/fcitx-chewing.desc:10 +msgid "aoeuhtn789" +msgstr "aoeuhtn789" + #: src/fcitx-chewing.desc:11 msgid "1234qweras" msgstr "1234qweras" @@ -31,57 +62,26 @@ msgid "Add Phrase Forward" msgstr "前方加词" -#: src/fcitx-chewing.desc:25 -msgid "Automatically shift cursor" -msgstr "选词完毕自动移到下一个词" - #: src/fcitx-chewing.desc:20 msgid "Backward phrase choice" msgstr "后方选择字词" -#: src/eim.c:143 src/chewing.conf.in:3 src/fcitx-chewing.conf.in:3 -#: src/fcitx-chewing.desc:1 src/fcitx-chewing.desc:13 -#: src/fcitx-chewing.desc:18 src/fcitx-chewing.desc:23 -#: src/fcitx-chewing.desc:28 src/fcitx-chewing.desc:33 -msgid "Chewing" -msgstr "新酷音" +#: src/fcitx-chewing.desc:25 +msgid "Automatically shift cursor" +msgstr "选词完毕自动移到下一个词" -#: src/fcitx-chewing.conf.in:4 -msgid "Chewing Wrapper For Fcitx" -msgstr "Fcitx 的 新酷音封装" +#: src/fcitx-chewing.desc:30 +msgid "Space as selection key" +msgstr "空格键选词" -#: src/fcitx-chewing.desc:46 -msgid "DACHEN_CP26 Keyboard" -msgstr "大千26键键盘" +#: src/fcitx-chewing.desc:35 +msgid "Keyboard Layout" +msgstr "键盘布局" #: src/fcitx-chewing.desc:38 msgid "Default Keyboard" msgstr "默认键盘" -#: src/fcitx-chewing.desc:44 -msgid "Dvorak Keyboard" -msgstr "Dvorak键盘" - -#: src/fcitx-chewing.desc:45 -msgid "Dvorak Keyboard with Hsu's support" -msgstr "Dvorak键盘 + 许氏注音" - -#: src/fcitx-chewing.desc:42 -msgid "ETen Keyboard" -msgstr "倚天键盘" - -#: src/fcitx-chewing.desc:43 -msgid "ETen26 Keyboard" -msgstr "倚天26键键盘" - -#: src/fcitx-chewing.desc:41 -msgid "Gin-Yieh Keyboard" -msgstr "精业键盘" - -#: src/fcitx-chewing.desc:47 -msgid "Han-Yu PinYin Keyboard" -msgstr "汉语拼音键盘" - #: src/fcitx-chewing.desc:39 msgid "Hsu's Keyboard" msgstr "许氏键盘" @@ -90,30 +90,30 @@ msgid "IBM Keyboard" msgstr "IBM键盘" -#: src/fcitx-chewing.desc:35 -msgid "Keyboard Layout" -msgstr "键盘布局" +#: src/fcitx-chewing.desc:41 +msgid "Gin-Yieh Keyboard" +msgstr "精业键盘" -#: src/fcitx-chewing.desc:3 -msgid "Selection Key" -msgstr "选词键" +#: src/fcitx-chewing.desc:42 +msgid "ETen Keyboard" +msgstr "倚天键盘" -#: src/fcitx-chewing.desc:30 -msgid "Space as selection key" -msgstr "空格键选词" +#: src/fcitx-chewing.desc:43 +msgid "ETen26 Keyboard" +msgstr "倚天26键键盘" -#: src/fcitx-chewing.desc:10 -msgid "aoeuhtn789" -msgstr "aoeuhtn789" +#: src/fcitx-chewing.desc:44 +msgid "Dvorak Keyboard" +msgstr "Dvorak键盘" -#: src/fcitx-chewing.desc:7 -msgid "asdfghjkl;" -msgstr "asdfghjkl;" +#: src/fcitx-chewing.desc:45 +msgid "Dvorak Keyboard with Hsu's support" +msgstr "Dvorak键盘 + 许氏注音" -#: src/fcitx-chewing.desc:9 -msgid "asdfjkl789" -msgstr "asdfjkl789" +#: src/fcitx-chewing.desc:46 +msgid "DACHEN_CP26 Keyboard" +msgstr "大千26键键盘" -#: src/fcitx-chewing.desc:8 -msgid "asdfzxcv89" -msgstr "asdfzxcv89" +#: src/fcitx-chewing.desc:47 +msgid "Han-Yu PinYin Keyboard" +msgstr "汉语拼音键盘" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx-chewing-0.2.1/po/zh_TW.po new/fcitx-chewing-0.2.2/po/zh_TW.po --- old/fcitx-chewing-0.2.1/po/zh_TW.po 2013-06-03 20:02:38.000000000 +0200 +++ new/fcitx-chewing-0.2.2/po/zh_TW.po 2014-04-22 00:01:08.000000000 +0200 @@ -1,7 +1,7 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# +# # Translators: # Alisha <[email protected]>, 2012 # Cheng-Chia Tseng <[email protected]>, 2012 @@ -12,20 +12,50 @@ "Project-Id-Version: fcitx\n" "Report-Msgid-Bugs-To: [email protected]\n" "POT-Creation-Date: 2013-04-25 00:01-0400\n" -"PO-Revision-Date: 2013-04-11 19:01+0000\n" +"PO-Revision-Date: 2013-04-29 10:04+0000\n" "Last-Translator: Xuetian Weng <[email protected]>\n" -"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/fcitx/"; -"language/zh_TW/)\n" -"Language: zh_TW\n" +"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/fcitx/language/zh_TW/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: zh_TW\n" "Plural-Forms: nplurals=1; plural=0;\n" +#: src/eim.c:143 src/chewing.conf.in:3 src/fcitx-chewing.conf.in:3 +#: src/fcitx-chewing.desc:1 src/fcitx-chewing.desc:13 +#: src/fcitx-chewing.desc:18 src/fcitx-chewing.desc:23 +#: src/fcitx-chewing.desc:28 src/fcitx-chewing.desc:33 +msgid "Chewing" +msgstr "新酷音" + +#: src/fcitx-chewing.conf.in:4 +msgid "Chewing Wrapper For Fcitx" +msgstr "Fcitx 的新酷音封装" + +#: src/fcitx-chewing.desc:3 +msgid "Selection Key" +msgstr "選詞鍵" + #: src/fcitx-chewing.desc:6 msgid "1234567890" msgstr "1234567890" +#: src/fcitx-chewing.desc:7 +msgid "asdfghjkl;" +msgstr "asdfghjkl;" + +#: src/fcitx-chewing.desc:8 +msgid "asdfzxcv89" +msgstr "asdfzxcv89" + +#: src/fcitx-chewing.desc:9 +msgid "asdfjkl789" +msgstr "asdfjkl789" + +#: src/fcitx-chewing.desc:10 +msgid "aoeuhtn789" +msgstr "aoeuhtn789" + #: src/fcitx-chewing.desc:11 msgid "1234qweras" msgstr "1234qweras" @@ -34,57 +64,26 @@ msgid "Add Phrase Forward" msgstr "前方加詞" -#: src/fcitx-chewing.desc:25 -msgid "Automatically shift cursor" -msgstr "選字完畢自動移到下一個字" - #: src/fcitx-chewing.desc:20 msgid "Backward phrase choice" msgstr "後方選擇字詞" -#: src/eim.c:143 src/chewing.conf.in:3 src/fcitx-chewing.conf.in:3 -#: src/fcitx-chewing.desc:1 src/fcitx-chewing.desc:13 -#: src/fcitx-chewing.desc:18 src/fcitx-chewing.desc:23 -#: src/fcitx-chewing.desc:28 src/fcitx-chewing.desc:33 -msgid "Chewing" -msgstr "新酷音" +#: src/fcitx-chewing.desc:25 +msgid "Automatically shift cursor" +msgstr "選字完畢自動移到下一個字" -#: src/fcitx-chewing.conf.in:4 -msgid "Chewing Wrapper For Fcitx" -msgstr "Fcitx 的新酷音封装" +#: src/fcitx-chewing.desc:30 +msgid "Space as selection key" +msgstr "使用空白鍵選擇候選字詞" -#: src/fcitx-chewing.desc:46 -msgid "DACHEN_CP26 Keyboard" -msgstr "大千26鍵" +#: src/fcitx-chewing.desc:35 +msgid "Keyboard Layout" +msgstr "鍵盤配置" #: src/fcitx-chewing.desc:38 msgid "Default Keyboard" msgstr "預設鍵盤" -#: src/fcitx-chewing.desc:44 -msgid "Dvorak Keyboard" -msgstr "Dvorak 鍵盤" - -#: src/fcitx-chewing.desc:45 -msgid "Dvorak Keyboard with Hsu's support" -msgstr "Dvorak 鍵盤 + 許氏注音" - -#: src/fcitx-chewing.desc:42 -msgid "ETen Keyboard" -msgstr "倚天鍵盤" - -#: src/fcitx-chewing.desc:43 -msgid "ETen26 Keyboard" -msgstr "倚天26鍵鍵盤" - -#: src/fcitx-chewing.desc:41 -msgid "Gin-Yieh Keyboard" -msgstr "精業鍵盤" - -#: src/fcitx-chewing.desc:47 -msgid "Han-Yu PinYin Keyboard" -msgstr "漢語拼音排列" - #: src/fcitx-chewing.desc:39 msgid "Hsu's Keyboard" msgstr "許氏鍵盤" @@ -93,30 +92,30 @@ msgid "IBM Keyboard" msgstr "IBM 鍵盤" -#: src/fcitx-chewing.desc:35 -msgid "Keyboard Layout" -msgstr "鍵盤配置" +#: src/fcitx-chewing.desc:41 +msgid "Gin-Yieh Keyboard" +msgstr "精業鍵盤" -#: src/fcitx-chewing.desc:3 -msgid "Selection Key" -msgstr "選詞鍵" +#: src/fcitx-chewing.desc:42 +msgid "ETen Keyboard" +msgstr "倚天鍵盤" -#: src/fcitx-chewing.desc:30 -msgid "Space as selection key" -msgstr "使用空白鍵選擇候選字詞" +#: src/fcitx-chewing.desc:43 +msgid "ETen26 Keyboard" +msgstr "倚天26鍵鍵盤" -#: src/fcitx-chewing.desc:10 -msgid "aoeuhtn789" -msgstr "aoeuhtn789" +#: src/fcitx-chewing.desc:44 +msgid "Dvorak Keyboard" +msgstr "Dvorak 鍵盤" -#: src/fcitx-chewing.desc:7 -msgid "asdfghjkl;" -msgstr "asdfghjkl;" +#: src/fcitx-chewing.desc:45 +msgid "Dvorak Keyboard with Hsu's support" +msgstr "Dvorak 鍵盤 + 許氏注音" -#: src/fcitx-chewing.desc:9 -msgid "asdfjkl789" -msgstr "asdfjkl789" +#: src/fcitx-chewing.desc:46 +msgid "DACHEN_CP26 Keyboard" +msgstr "大千26鍵" -#: src/fcitx-chewing.desc:8 -msgid "asdfzxcv89" -msgstr "asdfzxcv89" +#: src/fcitx-chewing.desc:47 +msgid "Han-Yu PinYin Keyboard" +msgstr "漢語拼音排列" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx-chewing-0.2.1/src/eim.c new/fcitx-chewing-0.2.2/src/eim.c --- old/fcitx-chewing-0.2.1/src/eim.c 2013-06-03 20:02:38.000000000 +0200 +++ new/fcitx-chewing-0.2.2/src/eim.c 2014-04-22 00:01:08.000000000 +0200 @@ -102,21 +102,25 @@ fclose(fp); FcitxXDGGetFileUserWithPrefix("chewing", "", NULL, &user_path); FcitxLog(INFO, "Chewing storage path %s", user_path); - if (0 == chewing_Init(CHEWING_DATADIR, user_path)) { - FcitxLog(DEBUG, "chewing init ok"); - } else { - FcitxLog(DEBUG, "chewing init failed"); - return NULL; - } FcitxChewing* chewing = (FcitxChewing*) fcitx_utils_malloc0(sizeof(FcitxChewing)); FcitxGlobalConfig* config = FcitxInstanceGetGlobalConfig(instance); FcitxInputState *input = FcitxInstanceGetInputState(instance); bindtextdomain("fcitx-chewing", LOCALEDIR); + bind_textdomain_codeset("fcitx-chewing", "UTF-8"); chewing->context = chewing_new(); ChewingContext * ctx = chewing->context; + + if (NULL == chewing->context) { + FcitxLog(DEBUG, "chewing init failed"); + free(chewing); + return NULL; + } else { + FcitxLog(DEBUG, "chewing init ok"); + } + chewing->owner = instance; chewing_set_maxChiSymbolLen(ctx, CHEWING_MAX_LEN); // chewing will crash without set page @@ -127,6 +131,7 @@ FcitxIMIFace iface; memset(&iface, 0, sizeof(FcitxIMIFace)); + iface.Init = FcitxChewingInit; iface.ResetIM = FcitxChewingReset; iface.DoInput = FcitxChewingDoInput; @@ -146,6 +151,7 @@ 1, "zh_TW" ); + return chewing; } @@ -160,8 +166,7 @@ INPUT_RETURN_VALUE FcitxChewingDoInput(void* arg, FcitxKeySym sym, unsigned int state) { FcitxChewing* chewing = (FcitxChewing*) arg; - ChewingContext * ctx = chewing->context; - int zuin_len; + ChewingContext* ctx = chewing->context; if (FcitxHotkeyIsHotKey(sym, state, FCITX_SPACE)) { chewing_handle_Space(ctx); @@ -171,22 +176,20 @@ int scan_code = (int) sym & 0xff; chewing_handle_Default(ctx, scan_code); } else if (FcitxHotkeyIsHotKey(sym, state, FCITX_BACKSPACE)) { - char * zuin_str = chewing_zuin_String(ctx, &zuin_len); - chewing_free(zuin_str); - if (chewing_buffer_Len(ctx) + zuin_len == 0) + const char* zuin_str = chewing_bopomofo_String_static(ctx); + if (chewing_buffer_Len(ctx) == 0 && !zuin_str[0]) return IRV_TO_PROCESS; chewing_handle_Backspace(ctx); - if (chewing_buffer_Len(ctx) + zuin_len == 0) + if (chewing_buffer_Len(ctx) == 0 && !zuin_str[0]) return IRV_CLEAN; } else if (FcitxHotkeyIsHotKey(sym, state, FCITX_ESCAPE)) { chewing_handle_Esc(ctx); } else if (FcitxHotkeyIsHotKey(sym, state, FCITX_DELETE)) { - char * zuin_str = chewing_zuin_String(ctx, &zuin_len); - chewing_free(zuin_str); - if (chewing_buffer_Len(ctx) + zuin_len == 0) + const char* zuin_str = chewing_bopomofo_String_static(ctx); + if (chewing_buffer_Len(ctx) == 0 && !zuin_str[0]) return IRV_TO_PROCESS; chewing_handle_Del(ctx); - if (chewing_buffer_Len(ctx) + zuin_len == 0) + if (chewing_buffer_Len(ctx) == 0 && !zuin_str[0]) return IRV_CLEAN; } else if (FcitxHotkeyIsHotKey(sym, state, FCITX_CHEWING_UP)) { chewing_handle_Up(ctx); @@ -218,6 +221,7 @@ // to do: more chewing_handle return IRV_TO_PROCESS; } + if (chewing_keystroke_CheckAbsorb(ctx)) { return IRV_DISPLAY_CANDWORDS; } else if (chewing_keystroke_CheckIgnore(ctx)) { @@ -228,8 +232,9 @@ FcitxInstanceCommitString(chewing->owner, ic, str); chewing_free(str); return IRV_DISPLAY_CANDWORDS; - } else + } else { return IRV_DISPLAY_CANDWORDS; + } } boolean FcitxChewingInit(void* arg) @@ -323,7 +328,7 @@ FcitxInstanceCleanInputWindow(chewing->owner); char * buf_str = chewing_buffer_String(ctx); - char * zuin_str = chewing_zuin_String(ctx, NULL); + const char* zuin_str = chewing_bopomofo_String_static(ctx); ConfigChewing(chewing); FcitxLog(DEBUG, "%s %s", buf_str, zuin_str); @@ -389,7 +394,6 @@ } while(0); chewing_free(buf_str); - chewing_free(zuin_str); return IRV_DISPLAY_CANDWORDS; } @@ -457,7 +461,6 @@ { FcitxChewing* chewing = (FcitxChewing*) arg; chewing_delete(chewing->context); - chewing_Terminate(); free(arg); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx-chewing-0.2.1/src/eim.h new/fcitx-chewing-0.2.2/src/eim.h --- old/fcitx-chewing-0.2.1/src/eim.h 2013-06-03 20:02:38.000000000 +0200 +++ new/fcitx-chewing-0.2.2/src/eim.h 2014-04-22 00:01:08.000000000 +0200 @@ -38,7 +38,7 @@ __EXPORT_API void* FcitxChewingCreate(FcitxInstance* instance); __EXPORT_API void FcitxChewingDestroy(void* arg); __EXPORT_API INPUT_RETURN_VALUE FcitxChewingDoInput(void* arg, FcitxKeySym sym, unsigned int state); -__EXPORT_API INPUT_RETURN_VALUE FcitxChewingGetCandWords(void *arg); +__EXPORT_API INPUT_RETURN_VALUE FcitxChewingGetCandWords(void* arg); __EXPORT_API boolean FcitxChewingInit(void*); __EXPORT_API void FcitxChewingReset(void* arg); @@ -56,7 +56,7 @@ typedef struct _FcitxChewing { FcitxChewingConfig config; FcitxInstance* owner; - ChewingContext * context; + ChewingContext* context; } FcitxChewing; CONFIG_BINDING_DECLARE(FcitxChewingConfig); ++++++ fcitx-chewing-openSUSE-12.3.patch ++++++ Index: fcitx-chewing-0.2.2/cmake/FindChewing.cmake =================================================================== --- fcitx-chewing-0.2.2.orig/cmake/FindChewing.cmake +++ fcitx-chewing-0.2.2/cmake/FindChewing.cmake @@ -31,8 +31,8 @@ set(CHEWING_INCLUDE_DIR "${CHEWING_MAIN_ set(CHEWING_FOUND ${PC_LIBCHEWING_FOUND}) include(FindPackageHandleStandardArgs) -find_package_handle_standard_args(Chewing FOUND_VAR CHEWING_FOUND +find_package_handle_standard_args(Chewing REQUIRED_VARS CHEWING_LIBRARIES CHEWING_MAIN_INCLUDE_DIR - VERSION_VAR PC_LIBCHEWING_VERSION) + VERSION_VAR PC_LIBCHEWING_VERSION) mark_as_advanced(CHEWING_INCLUDE_DIR CHEWING_LIBRARIES) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
