Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package fcitx5-chewing for openSUSE:Factory checked in at 2022-07-15 13:52:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/fcitx5-chewing (Old) and /work/SRC/openSUSE:Factory/.fcitx5-chewing.new.1523 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "fcitx5-chewing" Fri Jul 15 13:52:43 2022 rev:3 rq:989330 version:5.0.12 Changes: -------- --- /work/SRC/openSUSE:Factory/fcitx5-chewing/fcitx5-chewing.changes 2022-03-13 20:25:35.735685584 +0100 +++ /work/SRC/openSUSE:Factory/.fcitx5-chewing.new.1523/fcitx5-chewing.changes 2022-07-15 13:52:55.291572020 +0200 @@ -1,0 +2,7 @@ +Tue Jul 5 11:29:31 UTC 2022 - Fusion Future <[email protected]> + +- Update to 5.0.12 + * Fix a bug that the layout is not applied +- chewing.so is renamed to libchewing.so + +------------------------------------------------------------------- Old: ---- fcitx5-chewing-5.0.10.tar.xz New: ---- fcitx5-chewing-5.0.12.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fcitx5-chewing.spec ++++++ --- /var/tmp/diff_new_pack.fFqEZ8/_old 2022-07-15 13:52:55.871572207 +0200 +++ /var/tmp/diff_new_pack.fFqEZ8/_new 2022-07-15 13:52:55.875572208 +0200 @@ -17,7 +17,7 @@ Name: fcitx5-chewing -Version: 5.0.10 +Version: 5.0.12 Release: 0 Summary: Chewing Wrapper for Fcitx5 License: GPL-2.0-or-later @@ -34,7 +34,7 @@ Requires: chewing-utils Requires: fcitx5 Provides: fcitx-chewing = %{version} -Obsoletes: fcitx-chewing >= 0.2.3 +Obsoletes: fcitx-chewing < %{version} %if 0%{?suse_version} <= 1520 BuildRequires: appstream-glib-devel %endif @@ -56,7 +56,7 @@ %files -f %{name}.lang %license LICENSES %doc README.md -%{_fcitx5_libdir}/chewing.so +%{_fcitx5_libdir}/libchewing.so %{_fcitx5_addondir}/chewing.conf %{_fcitx5_imconfdir}/chewing.conf %{_datadir}/icons/hicolor/*/apps/org.fcitx.Fcitx5.fcitx-chewing* ++++++ fcitx5-chewing-5.0.10.tar.xz -> fcitx5-chewing-5.0.12.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx5-chewing-5.0.10/CMakeLists.txt new/fcitx5-chewing-5.0.12/CMakeLists.txt --- old/fcitx5-chewing-5.0.10/CMakeLists.txt 2022-03-09 19:25:45.933412000 +0100 +++ new/fcitx5-chewing-5.0.12/CMakeLists.txt 2022-07-03 19:55:22.853400500 +0200 @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.6) -project(fcitx5-chewing VERSION 5.0.10) +project(fcitx5-chewing VERSION 5.0.12) find_package(ECM REQUIRED 1.0.0) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx5-chewing-5.0.10/org.fcitx.Fcitx5.Addon.Chewing.metainfo.xml.in new/fcitx5-chewing-5.0.12/org.fcitx.Fcitx5.Addon.Chewing.metainfo.xml.in --- old/fcitx5-chewing-5.0.10/org.fcitx.Fcitx5.Addon.Chewing.metainfo.xml.in 2022-03-09 19:25:46.030081000 +0100 +++ new/fcitx5-chewing-5.0.12/org.fcitx.Fcitx5.Addon.Chewing.metainfo.xml.in 2022-07-03 19:55:22.916731000 +0200 @@ -10,6 +10,8 @@ <url type="bugtracker">https://github.com/fcitx/fcitx5-chewing/issues</url> <project_group>Fcitx</project_group> <releases> + <release version="5.0.12" date="2022-07-03"/> + <release version="5.0.11" date="2022-05-22"/> <release version="5.0.10" date="2022-03-09"/> <release version="5.0.9" date="2022-02-01"/> <release version="5.0.8" date="2021-12-04"/> @@ -22,5 +24,6 @@ <release version="5.0.1" date="2020-11-03"/> <release version="5.0.0" date="2020-10-30"/> </releases> + <content_rating type="oars-1.1"/> </component> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx5-chewing-5.0.10/po/ca.po new/fcitx5-chewing-5.0.12/po/ca.po --- old/fcitx5-chewing-5.0.10/po/ca.po 2021-11-30 07:08:17.931782200 +0100 +++ new/fcitx5-chewing-5.0.12/po/ca.po 2022-05-14 07:55:26.359608200 +0200 @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: fcitx5-chewing\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2021-11-25 20:24+0000\n" +"POT-Creation-Date: 2022-05-09 20:24+0000\n" "PO-Revision-Date: 2017-12-08 17:30+0000\n" "Last-Translator: Robert Antoni Buj Gelonch <[email protected]>, 2017\n" "Language-Team: Catalan (https://www.transifex.com/fcitx/teams/12005/ca/)\n" @@ -88,6 +88,10 @@ msgid "ETen26 Keyboard" msgstr "Teclat ETen26" +#: src/eim.h:91 +msgid "Enable easy symbol" +msgstr "" + #: src/eim.h:65 msgid "Gin-Yieh Keyboard" msgstr "Teclat Gin-Yieh" @@ -108,7 +112,7 @@ msgid "IBM Keyboard" msgstr "Teclat IBM" -#: src/eim.h:93 +#: src/eim.h:95 msgid "Keyboard Layout" msgstr "Disposici?? de teclat" @@ -124,7 +128,7 @@ msgid "Selection Key" msgstr "Tecla de selecci??" -#: src/eim.h:91 +#: src/eim.h:93 msgid "Space as selection key" msgstr "Espai com a tecla de selecci??" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx5-chewing-5.0.10/po/da.po new/fcitx5-chewing-5.0.12/po/da.po --- old/fcitx5-chewing-5.0.10/po/da.po 2021-11-30 07:08:17.931782200 +0100 +++ new/fcitx5-chewing-5.0.12/po/da.po 2022-05-14 07:55:26.359608200 +0200 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: fcitx5-chewing\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2021-11-25 20:24+0000\n" +"POT-Creation-Date: 2022-05-09 20:24+0000\n" "PO-Revision-Date: 2017-12-08 17:30+0000\n" "Last-Translator: scootergrisen, 2021\n" "Language-Team: Danish (https://www.transifex.com/fcitx/teams/12005/da/)\n" @@ -87,6 +87,10 @@ msgid "ETen26 Keyboard" msgstr "ETen26-tastatur" +#: src/eim.h:91 +msgid "Enable easy symbol" +msgstr "" + #: src/eim.h:65 msgid "Gin-Yieh Keyboard" msgstr "Gin-Yieh-tastatur" @@ -107,7 +111,7 @@ msgid "IBM Keyboard" msgstr "IBM-tastatur" -#: src/eim.h:93 +#: src/eim.h:95 msgid "Keyboard Layout" msgstr "Tastaturlayout" @@ -123,7 +127,7 @@ msgid "Selection Key" msgstr "Valgtast" -#: src/eim.h:91 +#: src/eim.h:93 msgid "Space as selection key" msgstr "Mellemrum som valgtast" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx5-chewing-5.0.10/po/de.po new/fcitx5-chewing-5.0.12/po/de.po --- old/fcitx5-chewing-5.0.10/po/de.po 2022-01-20 23:22:11.333848700 +0100 +++ new/fcitx5-chewing-5.0.12/po/de.po 2022-05-14 07:55:26.359608200 +0200 @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: fcitx5-chewing\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2022-01-15 20:24+0000\n" +"POT-Creation-Date: 2022-05-09 20:24+0000\n" "PO-Revision-Date: 2017-12-08 17:30+0000\n" "Last-Translator: Ettore Atalan <[email protected]>, 2022\n" "Language-Team: German (https://www.transifex.com/fcitx/teams/12005/de/)\n" @@ -89,6 +89,10 @@ msgid "ETen26 Keyboard" msgstr "ETen26 Tastatur" +#: src/eim.h:91 +msgid "Enable easy symbol" +msgstr "" + #: src/eim.h:65 msgid "Gin-Yieh Keyboard" msgstr "Gin-Yieh Tastatur" @@ -109,7 +113,7 @@ msgid "IBM Keyboard" msgstr "IBM Tastatur" -#: src/eim.h:93 +#: src/eim.h:95 msgid "Keyboard Layout" msgstr "Tastaturlayout" @@ -125,7 +129,7 @@ msgid "Selection Key" msgstr "Auswahltaste" -#: src/eim.h:91 +#: src/eim.h:93 msgid "Space as selection key" msgstr "SPACE als Auswahltaste" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx5-chewing-5.0.10/po/fcitx5-chewing.pot new/fcitx5-chewing-5.0.12/po/fcitx5-chewing.pot --- old/fcitx5-chewing-5.0.10/po/fcitx5-chewing.pot 2021-11-30 07:08:17.931782200 +0100 +++ new/fcitx5-chewing-5.0.12/po/fcitx5-chewing.pot 2022-05-14 07:55:26.359608200 +0200 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: fcitx5-chewing\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2021-11-25 20:24+0000\n" +"POT-Creation-Date: 2022-05-09 20:24+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <[email protected]>\n" @@ -83,6 +83,10 @@ msgid "ETen26 Keyboard" msgstr "" +#: src/eim.h:91 +msgid "Enable easy symbol" +msgstr "" + #: src/eim.h:65 msgid "Gin-Yieh Keyboard" msgstr "" @@ -103,7 +107,7 @@ msgid "IBM Keyboard" msgstr "" -#: src/eim.h:93 +#: src/eim.h:95 msgid "Keyboard Layout" msgstr "" @@ -119,7 +123,7 @@ msgid "Selection Key" msgstr "" -#: src/eim.h:91 +#: src/eim.h:93 msgid "Space as selection key" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx5-chewing-5.0.10/po/he.po new/fcitx5-chewing-5.0.12/po/he.po --- old/fcitx5-chewing-5.0.10/po/he.po 2021-11-30 07:08:17.931782200 +0100 +++ new/fcitx5-chewing-5.0.12/po/he.po 2022-05-14 07:55:26.359608200 +0200 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: fcitx5-chewing\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2021-11-25 20:24+0000\n" +"POT-Creation-Date: 2022-05-09 20:24+0000\n" "PO-Revision-Date: 2017-12-08 17:30+0000\n" "Last-Translator: Omer I.S. <[email protected]>, 2021\n" "Language-Team: Hebrew (https://www.transifex.com/fcitx/teams/12005/he/)\n" @@ -88,6 +88,10 @@ msgid "ETen26 Keyboard" msgstr "" +#: src/eim.h:91 +msgid "Enable easy symbol" +msgstr "" + #: src/eim.h:65 msgid "Gin-Yieh Keyboard" msgstr "" @@ -108,7 +112,7 @@ msgid "IBM Keyboard" msgstr "" -#: src/eim.h:93 +#: src/eim.h:95 msgid "Keyboard Layout" msgstr "?????????? ??????????" @@ -124,7 +128,7 @@ msgid "Selection Key" msgstr "" -#: src/eim.h:91 +#: src/eim.h:93 msgid "Space as selection key" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx5-chewing-5.0.10/po/ja.po new/fcitx5-chewing-5.0.12/po/ja.po --- old/fcitx5-chewing-5.0.10/po/ja.po 2022-03-08 02:54:05.432740700 +0100 +++ new/fcitx5-chewing-5.0.12/po/ja.po 2022-05-14 07:55:26.359608200 +0200 @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: fcitx5-chewing\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2022-02-15 21:59+0000\n" +"POT-Creation-Date: 2022-05-09 20:24+0000\n" "PO-Revision-Date: 2017-12-08 17:30+0000\n" "Last-Translator: Takuro Onoue <[email protected]>, 2022\n" "Language-Team: Japanese (https://www.transifex.com/fcitx/teams/12005/ja/)\n" @@ -89,6 +89,10 @@ msgid "ETen26 Keyboard" msgstr "Eten26 ???????????????" +#: src/eim.h:91 +msgid "Enable easy symbol" +msgstr "" + #: src/eim.h:65 msgid "Gin-Yieh Keyboard" msgstr "Gin-Yieh ???????????????" @@ -109,7 +113,7 @@ msgid "IBM Keyboard" msgstr "IBM ???????????????" -#: src/eim.h:93 +#: src/eim.h:95 msgid "Keyboard Layout" msgstr "??????????????????????????????" @@ -125,7 +129,7 @@ msgid "Selection Key" msgstr "????????????" -#: src/eim.h:91 +#: src/eim.h:93 msgid "Space as selection key" msgstr "??????????????????????????????????????????" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx5-chewing-5.0.10/po/ko.po new/fcitx5-chewing-5.0.12/po/ko.po --- old/fcitx5-chewing-5.0.10/po/ko.po 2022-03-08 02:54:05.432740700 +0100 +++ new/fcitx5-chewing-5.0.12/po/ko.po 2022-05-14 07:55:26.359608200 +0200 @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: fcitx5-chewing\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2022-03-01 20:24+0000\n" +"POT-Creation-Date: 2022-05-09 20:24+0000\n" "PO-Revision-Date: 2017-12-08 17:30+0000\n" "Last-Translator: JungHee Lee <[email protected]>, 2022\n" "Language-Team: Korean (https://www.transifex.com/fcitx/teams/12005/ko/)\n" @@ -31,19 +31,19 @@ #: src/eim.h:85 msgid "Add Phrase Forward" -msgstr "????????? ?????? ??????" +msgstr "?????? ?????? ??????" #: src/eim.h:89 msgid "Automatically shift cursor" -msgstr "???????????? ????????? ??????" +msgstr "???????????? ?????? ??????" #: src/eim.h:87 msgid "Backward phrase choice" -msgstr "????????? ?????? ??????" +msgstr "????????? ?????? ??????" #: src/eim.h:80 msgid "Candidate List Layout" -msgstr "" +msgstr "?????? ?????? ??????" #: src/eim.h:70 msgid "Carpalx Keyboard" @@ -59,7 +59,7 @@ #: org.fcitx.Fcitx5.Addon.Chewing.metainfo.xml.in:7 msgid "Chewing for Fcitx 5" -msgstr "Fcitx 5 ??? Chewing" +msgstr "Fcitx5??? Chewing" #: org.fcitx.Fcitx5.Addon.Chewing.metainfo.xml.in:8 msgid "Chewing input method" @@ -89,17 +89,21 @@ msgid "ETen26 Keyboard" msgstr "ETen26 ?????????" +#: src/eim.h:91 +msgid "Enable easy symbol" +msgstr "" + #: src/eim.h:65 msgid "Gin-Yieh Keyboard" msgstr "Gin-Yieh ?????????" #: src/eim.h:69 msgid "Han-Yu PinYin Keyboard" -msgstr "Han-Yu ?????? ?????????" +msgstr "Han-Yu Pinyin ?????????" #: src/eim.h:24 msgid "Horizontal" -msgstr "" +msgstr "??????" #: src/eim.h:64 msgid "Hsu's Keyboard" @@ -109,23 +113,23 @@ msgid "IBM Keyboard" msgstr "IBM ?????????" -#: src/eim.h:93 +#: src/eim.h:95 msgid "Keyboard Layout" msgstr "????????? ??????" #: src/eim.h:23 msgid "Not Set" -msgstr "" +msgstr "???????????? ??????" #: src/eim.h:77 msgid "Page Size" -msgstr "" +msgstr "????????? ??????" #: src/eim.h:75 msgid "Selection Key" msgstr "?????? ???" -#: src/eim.h:91 +#: src/eim.h:93 msgid "Space as selection key" msgstr "?????????????????? ?????? ??????" @@ -135,7 +139,7 @@ #: src/eim.h:24 msgid "Vertical" -msgstr "" +msgstr "??????" #: src/eim.h:41 msgid "aoeuhtn789" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx5-chewing-5.0.10/po/ru.po new/fcitx5-chewing-5.0.12/po/ru.po --- old/fcitx5-chewing-5.0.10/po/ru.po 2022-01-20 23:22:11.333848700 +0100 +++ new/fcitx5-chewing-5.0.12/po/ru.po 2022-06-30 06:09:18.021697000 +0200 @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: fcitx5-chewing\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2022-01-15 20:24+0000\n" +"POT-Creation-Date: 2022-06-02 20:25+0000\n" "PO-Revision-Date: 2017-12-08 17:30+0000\n" "Last-Translator: Dmitry <[email protected]>, 2022\n" "Language-Team: Russian (https://www.transifex.com/fcitx/teams/12005/ru/)\n" @@ -18,9 +18,9 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" -"%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n" -"%100>=11 && n%100<=14)? 2 : 3);\n" +"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && " +"n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || " +"(n%100>=11 && n%100<=14)? 2 : 3);\n" #: src/eim.h:39 msgid "1234567890" @@ -90,6 +90,10 @@ msgid "ETen26 Keyboard" msgstr "???????????????????? ETen26" +#: src/eim.h:91 +msgid "Enable easy symbol" +msgstr "???????????????? ?????????????? ????????????" + #: src/eim.h:65 msgid "Gin-Yieh Keyboard" msgstr "???????????????????? Gin-Yieh" @@ -110,7 +114,7 @@ msgid "IBM Keyboard" msgstr "???????????????????? IBM" -#: src/eim.h:93 +#: src/eim.h:95 msgid "Keyboard Layout" msgstr "?????????????????? ????????????????????" @@ -126,7 +130,7 @@ msgid "Selection Key" msgstr "?????????????? ????????????" -#: src/eim.h:91 +#: src/eim.h:93 msgid "Space as selection key" msgstr "???????????? ?? ???????????????? ?????????????? ????????????" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx5-chewing-5.0.10/po/tr.po new/fcitx5-chewing-5.0.12/po/tr.po --- old/fcitx5-chewing-5.0.10/po/tr.po 2021-11-30 07:08:17.931782200 +0100 +++ new/fcitx5-chewing-5.0.12/po/tr.po 2022-05-14 07:55:26.359608200 +0200 @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: fcitx5-chewing\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2021-11-25 20:24+0000\n" +"POT-Creation-Date: 2022-05-09 20:24+0000\n" "PO-Revision-Date: 2017-12-08 17:30+0000\n" "Last-Translator: abc Def <[email protected]>, 2021\n" "Language-Team: Turkish (https://www.transifex.com/fcitx/teams/12005/tr/)\n" @@ -88,6 +88,10 @@ msgid "ETen26 Keyboard" msgstr "ETen26 Klavyesi" +#: src/eim.h:91 +msgid "Enable easy symbol" +msgstr "" + #: src/eim.h:65 msgid "Gin-Yieh Keyboard" msgstr "Gin-Yieh Klavyesi" @@ -108,7 +112,7 @@ msgid "IBM Keyboard" msgstr "IBM Klavyesi" -#: src/eim.h:93 +#: src/eim.h:95 msgid "Keyboard Layout" msgstr "Klavye D??zeni " @@ -124,7 +128,7 @@ msgid "Selection Key" msgstr "Se??im Tu??u" -#: src/eim.h:91 +#: src/eim.h:93 msgid "Space as selection key" msgstr "Se??im tu??u olarak bo??luk tu??u" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx5-chewing-5.0.10/po/zh_CN.po new/fcitx5-chewing-5.0.12/po/zh_CN.po --- old/fcitx5-chewing-5.0.10/po/zh_CN.po 2021-12-04 16:34:24.899659400 +0100 +++ new/fcitx5-chewing-5.0.12/po/zh_CN.po 2022-05-22 20:13:24.878927000 +0200 @@ -3,15 +3,15 @@ # This file is distributed under the same license as the fcitx5-chewing package. # # Translators: -# csslayer <[email protected]>, 2021 +# csslayer <[email protected]>, 2022 # msgid "" msgstr "" "Project-Id-Version: fcitx5-chewing\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2021-12-04 15:32+0000\n" +"POT-Creation-Date: 2022-05-14 20:25+0000\n" "PO-Revision-Date: 2017-12-08 17:30+0000\n" -"Last-Translator: csslayer <[email protected]>, 2021\n" +"Last-Translator: csslayer <[email protected]>, 2022\n" "Language-Team: Chinese (China) (https://www.transifex.com/fcitx/teams/12005/"; "zh_CN/)\n" "Language: zh_CN\n" @@ -88,6 +88,10 @@ msgid "ETen26 Keyboard" msgstr "??????26?????????" +#: src/eim.h:91 +msgid "Enable easy symbol" +msgstr "????????????????????????" + #: src/eim.h:65 msgid "Gin-Yieh Keyboard" msgstr "????????????" @@ -108,7 +112,7 @@ msgid "IBM Keyboard" msgstr "IBM??????" -#: src/eim.h:93 +#: src/eim.h:95 msgid "Keyboard Layout" msgstr "????????????" @@ -124,7 +128,7 @@ msgid "Selection Key" msgstr "?????????" -#: src/eim.h:91 +#: src/eim.h:93 msgid "Space as selection key" msgstr "???????????????" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx5-chewing-5.0.10/po/zh_TW.po new/fcitx5-chewing-5.0.12/po/zh_TW.po --- old/fcitx5-chewing-5.0.10/po/zh_TW.po 2022-01-09 07:03:07.043568800 +0100 +++ new/fcitx5-chewing-5.0.12/po/zh_TW.po 2022-05-14 07:55:26.359608200 +0200 @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: fcitx5-chewing\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2022-01-04 20:24+0000\n" +"POT-Creation-Date: 2022-05-09 20:24+0000\n" "PO-Revision-Date: 2017-12-08 17:30+0000\n" "Last-Translator: Weizhong Yang <[email protected]>, 2022\n" "Language-Team: Chinese (Taiwan) (https://www.transifex.com/fcitx/teams/12005/"; @@ -91,6 +91,10 @@ msgid "ETen26 Keyboard" msgstr "?????? 26 ?????????" +#: src/eim.h:91 +msgid "Enable easy symbol" +msgstr "" + #: src/eim.h:65 msgid "Gin-Yieh Keyboard" msgstr "????????????" @@ -111,7 +115,7 @@ msgid "IBM Keyboard" msgstr "IBM ??????" -#: src/eim.h:93 +#: src/eim.h:95 msgid "Keyboard Layout" msgstr "????????????" @@ -127,7 +131,7 @@ msgid "Selection Key" msgstr "?????????" -#: src/eim.h:91 +#: src/eim.h:93 msgid "Space as selection key" msgstr "?????????????????????????????????" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx5-chewing-5.0.10/src/CMakeLists.txt new/fcitx5-chewing-5.0.12/src/CMakeLists.txt --- old/fcitx5-chewing-5.0.10/src/CMakeLists.txt 2021-03-05 04:04:19.988001600 +0100 +++ new/fcitx5-chewing-5.0.12/src/CMakeLists.txt 2022-05-08 18:24:58.909676800 +0200 @@ -3,7 +3,6 @@ ) add_library(chewing MODULE ${CHEWING_SOURCES}) target_link_libraries(chewing Fcitx5::Core Fcitx5::Config PkgConfig::Chewing) -set_target_properties(chewing PROPERTIES PREFIX "") target_compile_definitions(chewing PRIVATE FCITX_GETTEXT_DOMAIN=\"fcitx5-chewing\") fcitx5_add_i18n_definition(TARGETS chewing) install(TARGETS chewing DESTINATION "${CMAKE_INSTALL_LIBDIR}/fcitx5") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx5-chewing-5.0.10/src/chewing-addon.conf.in.in new/fcitx5-chewing-5.0.12/src/chewing-addon.conf.in.in --- old/fcitx5-chewing-5.0.10/src/chewing-addon.conf.in.in 2021-03-05 04:03:45.310772700 +0100 +++ new/fcitx5-chewing-5.0.12/src/chewing-addon.conf.in.in 2022-05-08 18:25:07.883293000 +0200 @@ -6,7 +6,7 @@ Type=SharedLibrary OnDemand=True Configurable=True -Library=chewing +Library=libchewing [Addon/OptionalDependencies] 0=chttrans diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx5-chewing-5.0.10/src/eim.cpp new/fcitx5-chewing-5.0.12/src/eim.cpp --- old/fcitx5-chewing-5.0.10/src/eim.cpp 2021-11-30 07:08:17.935116000 +0100 +++ new/fcitx5-chewing-5.0.12/src/eim.cpp 2022-05-09 06:04:44.195112200 +0200 @@ -6,6 +6,7 @@ * */ #include "eim.h" +#include <cstdarg> #include <fcitx-utils/utf8.h> #include <fcitx/inputcontext.h> #include <fcitx/inputpanel.h> @@ -168,11 +169,21 @@ std::vector<Text> labels_; }; +void logger(void *, int, const char *fmt, ...) { + va_list ap; + va_start(ap, fmt); + vfprintf(stderr, fmt, ap); + va_end(ap); +} + } // namespace ChewingEngine::ChewingEngine(Instance *instance) : instance_(instance), context_(chewing_new()) { chewing_set_maxChiSymbolLen(context_.get(), CHEWING_MAX_LEN); + if (chewing_log().checkLogLevel(Debug)) { + chewing_set_logger(context_.get(), logger, nullptr); + } reloadConfig(); } @@ -185,6 +196,21 @@ void ChewingEngine::populateConfig() { ChewingContext *ctx = context_.get(); + + chewing_set_KBType( + ctx, chewing_KBStr2Num( + builtin_keymaps[static_cast<int>(*config_.Layout)].data())); + + chewing_set_ChiEngMode(ctx, CHINESE_MODE); + + int selkey[10]; + int i = 0; + for (i = 0; i < 10; i++) { + selkey[i] = + builtin_selectkeys[static_cast<int>(*config_.SelectionKey)][i]; + } + + chewing_set_selKey(ctx, selkey, 10); chewing_set_candPerPage(ctx, *config_.PageSize); chewing_set_addPhraseDirection(ctx, *config_.AddPhraseForward ? 0 : 1); chewing_set_phraseChoiceRearward(ctx, *config_.ChoiceBackward ? 1 : 0); @@ -199,13 +225,7 @@ void ChewingEngine::doReset(InputContextEvent &event) { ChewingContext *ctx = context_.get(); - chewing_Reset(ctx); - - chewing_set_KBType( - ctx, chewing_KBStr2Num( - builtin_keymaps[static_cast<int>(*config_.Layout)].data())); - - chewing_set_ChiEngMode(ctx, CHINESE_MODE); + chewing_handle_Esc(ctx); updateUI(event.inputContext()); } @@ -240,6 +260,7 @@ return; } + chewing_set_easySymbolInput(ctx, 0); CHEWING_DEBUG() << "KeyEvent: " << keyEvent.key().toString(); auto ic = keyEvent.inputContext(); const KeyList keypadKeys{Key{FcitxKey_KP_1}, Key{FcitxKey_KP_2}, @@ -260,8 +281,20 @@ } else if (keyEvent.key().check(FcitxKey_Tab)) { chewing_handle_Tab(ctx); } else if (keyEvent.key().isSimple()) { + if (keyEvent.rawKey().states().test(KeyState::Shift)) { + chewing_set_easySymbolInput(ctx, *config_.EasySymbolInput ? 1 : 0); + } int scan_code = keyEvent.key().sym() & 0xff; + if (*config_.Layout == ChewingLayout::HanYuPinYin) { + const char *zuin_str = chewing_bopomofo_String_static(ctx); + // Workaround a bug in libchewing fixed in 2017 but never has stable + // release. + if (std::string_view(zuin_str).size() >= 9) { + return keyEvent.filterAndAccept(); + } + } chewing_handle_Default(ctx, scan_code); + chewing_set_easySymbolInput(ctx, 0); } else if (keyEvent.key().check(FcitxKey_BackSpace)) { const char *zuin_str = chewing_bopomofo_String_static(ctx); if (chewing_buffer_Len(ctx) == 0 && !zuin_str[0]) { @@ -358,17 +391,6 @@ CHEWING_DEBUG() << "updateUI"; ChewingContext *ctx = context_.get(); - int selkey[10]; - int i = 0; - for (i = 0; i < 10; i++) { - selkey[i] = - builtin_selectkeys[static_cast<int>(*config_.SelectionKey)][i]; - } - - chewing_set_selKey(ctx, selkey, 10); - chewing_set_candPerPage(ctx, instance_->globalConfig().defaultPageSize()); - populateConfig(); - // clean up window asap ic->inputPanel().reset(); ic->updateUserInterface(UserInterfaceComponent::InputPanel); @@ -377,7 +399,7 @@ const char *zuin_str = chewing_bopomofo_String_static(ctx); std::string text = buf_str.get(); - std::string zuin = zuin_str; + std::string_view zuin = zuin_str; CHEWING_DEBUG() << "Text: " << text << " Zuin: " << zuin; /* if not check done, so there is candidate word */ if (!chewing_cand_CheckDone(ctx)) { @@ -413,14 +435,21 @@ // insert zuin in the middle preedit.append(text.substr(0, rcur), format); - preedit.append(zuin, {TextFormatFlag::HighLight, format}); + preedit.append(std::string(zuin), {TextFormatFlag::HighLight, format}); preedit.append(text.substr(rcur), format); + if (chewing_aux_Check(ctx)) { + const char *aux_str = chewing_aux_String_static(ctx); + std::string aux = aux_str; + ic->inputPanel().setAuxDown(Text(aux)); + } + if (useClientPreedit) { ic->inputPanel().setClientPreedit(preedit); } else { ic->inputPanel().setPreedit(preedit); } + ic->updatePreedit(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx5-chewing-5.0.10/src/eim.h new/fcitx5-chewing-5.0.12/src/eim.h --- old/fcitx5-chewing-5.0.10/src/eim.h 2021-11-25 16:40:45.432569000 +0100 +++ new/fcitx5-chewing-5.0.12/src/eim.h 2022-05-09 04:47:27.045358700 +0200 @@ -87,6 +87,8 @@ _("Backward phrase choice"), true}; Option<bool> AutoShiftCursor{this, "AutoShiftCursor", _("Automatically shift cursor"), false}; + Option<bool> EasySymbolInput{this, "EasySymbolInput", + _("Enable easy symbol"), false}; Option<bool> SpaceAsSelection{this, "SpaceAsSelection", _("Space as selection key"), true}; OptionWithAnnotation<ChewingLayout, ChewingLayoutI18NAnnotation> Layout{ @@ -112,6 +114,7 @@ const Configuration *getConfig() const override { return &config_; } void setConfig(const RawConfig &config) override { config_.load(config, true); + populateConfig(); safeSaveAsIni(config_, "conf/chewing.conf"); }
