Hello community, here is the log from the commit of package fcitx-rime for openSUSE:12.3 checked in at 2013-02-05 11:07:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.3/fcitx-rime (Old) and /work/SRC/openSUSE:12.3/.fcitx-rime.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "fcitx-rime", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:12.3/fcitx-rime/fcitx-rime.changes 2013-01-31 01:16:08.000000000 +0100 +++ /work/SRC/openSUSE:12.3/.fcitx-rime.new/fcitx-rime.changes 2013-02-05 11:07:29.000000000 +0100 @@ -1,0 +2,12 @@ +Fri Feb 1 17:06:07 UTC 2013 - i...@marguerite.su + +- explicitly requires: brise. + it is librime's data file, without it, fcitx-rime is a skeleton. + +------------------------------------------------------------------- +Sat Jan 26 18:52:47 UTC 2013 - i...@marguerite.su + +- update version 0.2.0 + * re-deploy support + +------------------------------------------------------------------- Old: ---- fcitx-rime-0.1.2.tar.bz2 New: ---- fcitx-rime-0.2.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fcitx-rime.spec ++++++ --- /var/tmp/diff_new_pack.Ztefys/_old 2013-02-05 11:07:29.000000000 +0100 +++ /var/tmp/diff_new_pack.Ztefys/_new 2013-02-05 11:07:29.000000000 +0100 @@ -16,7 +16,7 @@ # Name: fcitx-rime -Version: 0.1.2 +Version: 0.2.0 Release: 0 License: GPL-2.0+ Summary: Rime input engine support for Fcitx @@ -39,6 +39,8 @@ # resolve "have choice" BuildRequires: libyaml-cpp0_3 %endif +# explicitly requires brise (rime-data) +Requires: brise BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -63,6 +65,8 @@ %make_install popd +%find_lang %{name} + %if 0%{?suse_version} %fdupes %{buildroot} %else @@ -73,16 +77,15 @@ %postun -p /sbin/ldconfig -%files +%files -f %{name}.lang %defattr(-,root,root) %doc README.md COPYING %dir %{_datadir}/fcitx/inputmethod/ +%dir %{_datadir}/fcitx/imicon/ %{_libdir}/fcitx/%{name}.so %{_datadir}/fcitx/addon/%{name}.conf %{_datadir}/fcitx/inputmethod/rime.conf -%{_datadir}/fcitx/skin/classic/rime.png -%{_datadir}/fcitx/skin/dark/rime.png -%{_datadir}/fcitx/skin/default/rime.png +%{_datadir}/fcitx/imicon/rime.png %{_datadir}/icons/hicolor/48x48/apps/%{name}.png %changelog ++++++ fcitx-rime-0.1.2.tar.bz2 -> fcitx-rime-0.2.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx-rime-0.1.2/CMakeLists.txt new/fcitx-rime-0.2.0/CMakeLists.txt --- old/fcitx-rime-0.1.2/CMakeLists.txt 2012-10-04 14:34:39.000000000 +0200 +++ new/fcitx-rime-0.2.0/CMakeLists.txt 2012-12-24 20:25:32.000000000 +0100 @@ -5,7 +5,7 @@ set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake) include(FindPkgConfig) -find_package(Fcitx 4.2.0 REQUIRED) +find_package(Fcitx 4.2.7 REQUIRED) find_package(Rime REQUIRED) if(NOT DEFINED RIME_DATA_DIR) @@ -29,6 +29,6 @@ add_custom_target(uninstall COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake) +add_subdirectory(po) add_subdirectory(src) - add_subdirectory(data) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx-rime-0.1.2/data/CMakeLists.txt new/fcitx-rime-0.2.0/data/CMakeLists.txt --- old/fcitx-rime-0.1.2/data/CMakeLists.txt 2012-10-04 14:34:39.000000000 +0200 +++ new/fcitx-rime-0.2.0/data/CMakeLists.txt 2012-12-24 20:25:32.000000000 +0100 @@ -1,4 +1,2 @@ -install(FILES zhung.png RENAME rime.png DESTINATION ${FCITX4_PREFIX}/share/fcitx/skin/default) -install(FILES zhung.png RENAME rime.png DESTINATION ${FCITX4_PREFIX}/share/fcitx/skin/dark) -install(FILES zhung.png RENAME rime.png DESTINATION ${FCITX4_PREFIX}/share/fcitx/skin/classic) +install(FILES zhung.png RENAME rime.png DESTINATION ${FCITX4_PREFIX}/share/fcitx/imicon) install(FILES zhung.png RENAME fcitx-rime.png DESTINATION share/icons/hicolor/48x48/apps) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx-rime-0.1.2/po/CMakeLists.txt new/fcitx-rime-0.2.0/po/CMakeLists.txt --- old/fcitx-rime-0.1.2/po/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/fcitx-rime-0.2.0/po/CMakeLists.txt 2012-12-24 20:25:32.000000000 +0100 @@ -0,0 +1,7 @@ +set(PO_LANGS zh_CN) +foreach(lang ${PO_LANGS}) + fcitx_translate_add_po_file("${lang}" "${lang}.po") +endforeach() +fcitx_translate_set_pot_target(pot fcitx-rime fcitx-rime.pot) + + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx-rime-0.1.2/po/fcitx-rime.pot new/fcitx-rime-0.2.0/po/fcitx-rime.pot --- old/fcitx-rime-0.1.2/po/fcitx-rime.pot 1970-01-01 01:00:00.000000000 +0100 +++ new/fcitx-rime-0.2.0/po/fcitx-rime.pot 2012-12-24 20:25:32.000000000 +0100 @@ -0,0 +1,26 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: fcitx-...@googlegroups.com\n" +"POT-Creation-Date: 2012-12-24 14:16-0500\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: LANGUAGE <l...@li.org>\n" +"Language: LANG\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: src/fcitx-rime.c:74 src/fcitx-rime.conf.in:3 src/rime.conf.in:3 +msgid "Rime" +msgstr "" + +#: src/fcitx-rime.conf.in:4 +msgid "Rime Wrapper For Fcitx" +msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx-rime-0.1.2/po/zh_CN.po new/fcitx-rime-0.2.0/po/zh_CN.po --- old/fcitx-rime-0.1.2/po/zh_CN.po 1970-01-01 01:00:00.000000000 +0100 +++ new/fcitx-rime-0.2.0/po/zh_CN.po 2012-12-24 20:25:32.000000000 +0100 @@ -0,0 +1,27 @@ +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Weng Xuetian <wen...@gmail.com>, 2012. +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: fcitx-...@googlegroups.com\n" +"POT-Creation-Date: 2012-12-24 14:16-0500\n" +"PO-Revision-Date: 2012-12-24 14:17-0500\n" +"Last-Translator: Weng Xuetian <wen...@gmail.com>\n" +"Language-Team: Chinese Simplified <kde-ch...@kde.org>\n" +"Language: LANG\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Lokalize 1.5\n" + +#: src/fcitx-rime.c:74 src/fcitx-rime.conf.in:3 src/rime.conf.in:3 +msgid "Rime" +msgstr "中州韻" + +#: src/fcitx-rime.conf.in:4 +msgid "Rime Wrapper For Fcitx" +msgstr "Fcitx 的中州韻封装" + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx-rime-0.1.2/src/CMakeLists.txt new/fcitx-rime-0.2.0/src/CMakeLists.txt --- old/fcitx-rime-0.1.2/src/CMakeLists.txt 2012-10-04 14:34:39.000000000 +0200 +++ new/fcitx-rime-0.2.0/src/CMakeLists.txt 2012-12-24 20:25:32.000000000 +0100 @@ -6,8 +6,8 @@ include_directories(${Rime_INCLUDE_DIR}) set(FCITX_RIME_SRC fcitx-rime.c) -fcitx_add_addon(fcitx-rime ${FCITX_RIME_SRC}) -target_link_libraries(fcitx-rime ${Rime_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}) -fcitx_add_addon_conf_file(fcitx-rime.conf) -fcitx_add_inputmethod_conf_file(rime.conf) +fcitx_add_addon_full(rime + SOURCES ${FCITX_RIME_SRC} + IM_CONFIG rime.conf + LINK_LIBS ${Rime_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx-rime-0.1.2/src/fcitx-rime.c new/fcitx-rime-0.2.0/src/fcitx-rime.c --- old/fcitx-rime-0.1.2/src/fcitx-rime.c 2012-10-04 14:34:39.000000000 +0200 +++ new/fcitx-rime-0.2.0/src/fcitx-rime.c 2012-12-24 20:25:32.000000000 +0100 @@ -16,6 +16,7 @@ static void FcitxRimeDestroy(void* arg); static boolean FcitxRimeInit(void* arg); static void FcitxRimeReset(void* arg); +static void FcitxRimeReloadConfig(void* arg); static INPUT_RETURN_VALUE FcitxRimeDoInput(void* arg, FcitxKeySym sym, unsigned int state); static INPUT_RETURN_VALUE FcitxRimeGetCandWords(void* arg); @@ -28,10 +29,7 @@ FCITX_EXPORT_API int ABI_VERSION = FCITX_ABI_VERSION; -static void* FcitxRimeCreate(FcitxInstance* instance) -{ - FcitxRime* rime = (FcitxRime*) fcitx_utils_malloc0(sizeof(FcitxRime)); - rime->owner = instance; +static void FcitxRimeStart(FcitxRime* rime) { char* user_path = NULL; FILE* fp = FcitxXDGGetFileUserWithPrefix("rime", ".place_holder", "w", NULL); @@ -53,6 +51,13 @@ } rime->session_id = RimeCreateSession(); +} + +static void* FcitxRimeCreate(FcitxInstance* instance) +{ + FcitxRime* rime = (FcitxRime*) fcitx_utils_malloc0(sizeof(FcitxRime)); + rime->owner = instance; + FcitxRimeStart(rime); FcitxIMIFace iface; memset(&iface, 0, sizeof(FcitxIMIFace)); @@ -60,6 +65,7 @@ iface.ResetIM = FcitxRimeReset; iface.DoInput = FcitxRimeDoInput; iface.GetCandWords = FcitxRimeGetCandWords; + iface.ReloadConfig = FcitxRimeReloadConfig; FcitxInstanceRegisterIMv2( instance, @@ -157,7 +163,7 @@ int i = *(int*) candWord->priv; const char* digit = DIGIT_STR_CHOOSE; int num_select_keys = strlen(context.menu.select_keys); - FcitxKeySym sym; + FcitxKeySym sym = FcitxKey_None; if (i < 10) { if (i < num_select_keys) sym = context.menu.select_keys[i]; @@ -272,8 +278,22 @@ } } FcitxCandidateWordSetChoose(candList, strChoose); + + FcitxCandidateWordSetOverridePaging(candList, context.menu.page_no != 0, !context.menu.is_last_page, NULL, NULL, NULL); } RimeFreeContext(&context); return IRV_DISPLAY_CANDWORDS; } + +void FcitxRimeReloadConfig(void* arg) +{ + FcitxRime* rime = (FcitxRime*) arg; + if (rime->session_id) { + RimeDestroySession(rime->session_id); + rime->session_id = 0; + } + RimeFinalize(); + FcitxRimeStart(rime); +} + -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org