Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package fcitx5-libthai for openSUSE:Leap:16.0 checked in at 2025-07-15 17:55:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:16.0/fcitx5-libthai (Old) and /work/SRC/openSUSE:Leap:16.0/.fcitx5-libthai.new.7373 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "fcitx5-libthai" Tue Jul 15 17:55:06 2025 rev:2 rq:1293342 version:5.1.6 Changes: -------- --- /work/SRC/openSUSE:Leap:16.0/fcitx5-libthai/fcitx5-libthai.changes 2025-03-19 11:42:45.791747126 +0100 +++ /work/SRC/openSUSE:Leap:16.0/.fcitx5-libthai.new.7373/fcitx5-libthai.changes 2025-07-15 17:55:46.076176454 +0200 @@ -1,0 +2,19 @@ +Sun Jun 22 04:17:31 UTC 2025 - Marguerite Su <i...@marguerite.su> + +- update to 5.1.6 + * translation update + +------------------------------------------------------------------- +Wed Jan 29 07:08:24 UTC 2025 - Marguerite Su <i...@marguerite.su> + +- update to 5.1.5 + * use addon factory v2 + * do not include keysymgen.h + +------------------------------------------------------------------- +Sun Jan 5 06:09:40 UTC 2025 - Marguerite Su <i...@marguerite.su> + +- update to 5.1.4 + * translation update + +------------------------------------------------------------------- Old: ---- fcitx5-libthai-5.1.3.tar.zst New: ---- fcitx5-libthai-5.1.6.tar.zst ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fcitx5-libthai.spec ++++++ --- /var/tmp/diff_new_pack.ZB12nL/_old 2025-07-15 17:55:46.320186646 +0200 +++ /var/tmp/diff_new_pack.ZB12nL/_new 2025-07-15 17:55:46.320186646 +0200 @@ -1,7 +1,7 @@ # # spec file for package fcitx5-libthai # -# Copyright (c) 2024 SUSE LLC +# Copyright (c) 2025 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: fcitx5-libthai -Version: 5.1.3 +Version: 5.1.6 Release: 0 Summary: Libthai input method engine for Fcitx5 License: GPL-2.0-or-later @@ -27,7 +27,11 @@ BuildRequires: cmake BuildRequires: extra-cmake-modules BuildRequires: fcitx5-devel +%if 0%{?suse_version} >= 1550 BuildRequires: gcc-c++ +%else +BuildRequires: gcc13-c++ +%endif BuildRequires: libthai-devel BuildRequires: pkgconfig BuildRequires: zstd @@ -45,6 +49,9 @@ %autopatch -p1 %build +%if 0%{?suse_version} < 1550 +export CXX=%{_bindir}/g++-13 +%endif %cmake %make_build ++++++ fcitx5-libthai-5.1.3.tar.zst -> fcitx5-libthai-5.1.6.tar.zst ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx5-libthai-5.1.3/.github/workflows/check.yml new/fcitx5-libthai-5.1.6/.github/workflows/check.yml --- old/fcitx5-libthai-5.1.3/.github/workflows/check.yml 2024-04-22 09:58:00.000000000 +0200 +++ new/fcitx5-libthai-5.1.6/.github/workflows/check.yml 2025-06-16 08:25:42.000000000 +0200 @@ -1,5 +1,4 @@ name: CI - on: push: branches: @@ -7,10 +6,21 @@ pull_request: branches: - master - jobs: + clang-format: + name: Check clang-format + runs-on: ubuntu-latest + container: archlinux:latest + steps: + - name: Install dependencies + run: | + pacman -Syu --noconfirm git clang diffutils + git config --global --add safe.directory $GITHUB_WORKSPACE + - uses: actions/checkout@v4 + - uses: fcitx/github-actions@clang-format check: name: Build and test + needs: clang-format runs-on: ubuntu-latest container: archlinux:latest strategy: @@ -37,20 +47,15 @@ uses: actions/cache@v4 with: path: 'fcitx5/**/*.tar.*' - key: ${{ runner.os }}-${{ hashFiles('fcitx5/src/modules/spell/CMakeLists.txt') }} + key: ${{ runner.os }}-${{ hashFiles('fcitx5/src/modules/spell/CMakeLists.txt') + }} - name: Build and Install fcitx5 uses: fcitx/github-actions@cmake with: path: fcitx5 cmake-option: >- - -DENABLE_KEYBOARD=Off - -DENABLE_X11=Off - -DENABLE_WAYLAND=Off - -DENABLE_ENCHANT=Off - -DENABLE_DBUS=Off - -DENABLE_SERVER=Off - -DENABLE_EMOJI=Off - -DUSE_SYSTEMD=Off + -DENABLE_KEYBOARD=Off -DENABLE_X11=Off -DENABLE_WAYLAND=Off -DENABLE_ENCHANT=Off + -DENABLE_DBUS=Off -DENABLE_SERVER=Off -DENABLE_EMOJI=Off -DUSE_SYSTEMD=Off - uses: actions/checkout@v4 with: path: fcitx5-libthai diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx5-libthai-5.1.3/CMakeLists.txt new/fcitx5-libthai-5.1.6/CMakeLists.txt --- old/fcitx5-libthai-5.1.3/CMakeLists.txt 2024-04-22 09:58:00.000000000 +0200 +++ new/fcitx5-libthai-5.1.6/CMakeLists.txt 2025-06-16 08:25:42.000000000 +0200 @@ -1,5 +1,7 @@ -cmake_minimum_required(VERSION 3.10) -project(fcitx5-libthai VERSION 5.1.3) +cmake_minimum_required(VERSION 3.12) +project(fcitx5-libthai VERSION 5.1.6) + +set(REQUIRED_FCITX_VERSION 5.1.12) find_package(ECM REQUIRED 1.0.0) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH}) include(FeatureSummary) @@ -7,7 +9,7 @@ include(ECMUninstallTarget) find_package(PkgConfig REQUIRED) -find_package(Fcitx5Core 5.0.2 REQUIRED) +find_package(Fcitx5Core ${REQUIRED_FCITX_VERSION} REQUIRED) find_package(Iconv REQUIRED) find_package(Gettext REQUIRED) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx5-libthai-5.1.3/org.fcitx.Fcitx5.Addon.LibThai.metainfo.xml.in new/fcitx5-libthai-5.1.6/org.fcitx.Fcitx5.Addon.LibThai.metainfo.xml.in --- old/fcitx5-libthai-5.1.3/org.fcitx.Fcitx5.Addon.LibThai.metainfo.xml.in 2024-04-22 09:58:00.000000000 +0200 +++ new/fcitx5-libthai-5.1.6/org.fcitx.Fcitx5.Addon.LibThai.metainfo.xml.in 2025-06-16 08:25:42.000000000 +0200 @@ -14,6 +14,9 @@ <url type="vcs-browser">https://github.com/fcitx/fcitx5-libthai</url> <project_group>Fcitx</project_group> <releases> + <release version="5.1.6" date="2025-06-15"/> + <release version="5.1.5" date="2025-01-22"/> + <release version="5.1.4" date="2024-10-08"/> <release version="5.1.3" date="2024-04-22"/> <release version="5.1.2" date="2024-01-02"/> <release version="5.1.1" date="2023-11-01"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx5-libthai-5.1.3/po/LINGUAS new/fcitx5-libthai-5.1.6/po/LINGUAS --- old/fcitx5-libthai-5.1.3/po/LINGUAS 2024-04-22 09:58:00.000000000 +0200 +++ new/fcitx5-libthai-5.1.6/po/LINGUAS 2025-06-16 08:25:42.000000000 +0200 @@ -5,5 +5,6 @@ ja ko ru +vi zh_CN zh_TW diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx5-libthai-5.1.3/po/vi.po new/fcitx5-libthai-5.1.6/po/vi.po --- old/fcitx5-libthai-5.1.3/po/vi.po 1970-01-01 01:00:00.000000000 +0100 +++ new/fcitx5-libthai-5.1.6/po/vi.po 2025-06-16 08:25:42.000000000 +0200 @@ -0,0 +1,68 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the fcitx5-libthai package. +# +# Translators: +# hoanghuy309 <hoanghuy...@gmail.com>, 2025 +# +msgid "" +msgstr "" +"Project-Id-Version: fcitx5-libthai\n" +"Report-Msgid-Bugs-To: fcitx-...@googlegroups.com\n" +"POT-Creation-Date: 2025-04-22 20:24+0000\n" +"PO-Revision-Date: 2020-04-01 16:17+0000\n" +"Last-Translator: hoanghuy309 <hoanghuy...@gmail.com>, 2025\n" +"Language-Team: Vietnamese (https://app.transifex.com/fcitx/teams/12005/vi/)\n" +"Language: vi\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: src/engine.h:32 +msgid "Basic check" +msgstr "" + +#: src/engine.h:38 +msgid "Correction" +msgstr "" + +#: src/engine.h:29 +msgid "KETMANEE" +msgstr "" + +#: src/engine.h:37 +msgid "Keyboard Map" +msgstr "Bản Đồ Bàn Phím" + +#: src/libthai-addon.conf.in.in:2 +msgid "LibThai Addon of Fcitx" +msgstr "" + +#: src/engine.h:29 +msgid "PATTACHOTE" +msgstr "" + +#: src/engine.h:31 +msgid "Passthrough" +msgstr "" + +#: src/engine.h:32 +msgid "Strict" +msgstr "" + +#: src/engine.h:40 +msgid "Strictness" +msgstr "" + +#: src/engine.h:30 +msgid "TIS820_2538" +msgstr "" + +#: org.fcitx.Fcitx5.Addon.LibThai.metainfo.xml.in:7 src/libthai.conf.in:2 +msgid "Thai" +msgstr "" + +#: org.fcitx.Fcitx5.Addon.LibThai.metainfo.xml.in:8 +msgid "Thai language input method" +msgstr "Kiểu gõ tiếng Thái" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx5-libthai-5.1.3/po/zh_TW.po new/fcitx5-libthai-5.1.6/po/zh_TW.po --- old/fcitx5-libthai-5.1.3/po/zh_TW.po 2024-04-22 09:58:00.000000000 +0200 +++ new/fcitx5-libthai-5.1.6/po/zh_TW.po 2025-06-16 08:25:42.000000000 +0200 @@ -4,15 +4,16 @@ # # Translators: # Neko ◣ 0xFF, 2022 +# Kisaragi Hiu <flyingfeather1...@gmail.com>, 2024 # msgid "" msgstr "" "Project-Id-Version: fcitx5-libthai\n" "Report-Msgid-Bugs-To: fcitx-...@googlegroups.com\n" -"POT-Creation-Date: 2022-12-16 20:25+0000\n" +"POT-Creation-Date: 2024-07-08 20:24+0000\n" "PO-Revision-Date: 2020-04-01 16:17+0000\n" -"Last-Translator: Neko ◣ 0xFF, 2022\n" -"Language-Team: Chinese (Taiwan) (https://www.transifex.com/fcitx/teams/12005/" +"Last-Translator: Kisaragi Hiu <flyingfeather1...@gmail.com>, 2024\n" +"Language-Team: Chinese (Taiwan) (https://app.transifex.com/fcitx/teams/12005/" "zh_TW/)\n" "Language: zh_TW\n" "MIME-Version: 1.0\n" @@ -38,7 +39,7 @@ #: src/libthai-addon.conf.in.in:3 msgid "LibThai Addon of Fcitx" -msgstr "泰文附加組件" +msgstr "泰文附加元件" #: src/engine.h:23 msgid "PATTACHOTE" @@ -66,4 +67,4 @@ #: org.fcitx.Fcitx5.Addon.LibThai.metainfo.xml.in:8 msgid "Thai language input method" -msgstr "泰文输入法" +msgstr "泰文輸入法" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx5-libthai-5.1.3/src/CMakeLists.txt new/fcitx5-libthai-5.1.6/src/CMakeLists.txt --- old/fcitx5-libthai-5.1.3/src/CMakeLists.txt 2024-04-22 09:58:00.000000000 +0200 +++ new/fcitx5-libthai-5.1.6/src/CMakeLists.txt 2025-06-16 08:25:42.000000000 +0200 @@ -1,5 +1,5 @@ -add_library(iconvwrapper STATIC iconvwrapper.cpp) +add_library(iconvwrapper OBJECT iconvwrapper.cpp) set_target_properties(iconvwrapper PROPERTIES POSITION_INDEPENDENT_CODE ON) target_link_libraries(iconvwrapper Fcitx5::Utils Iconv::Iconv) @@ -7,7 +7,7 @@ engine.cpp thaikb.cpp ) -add_library(libthai MODULE ${LIBTHAI_SOURCES}) +add_fcitx5_addon(libthai ${LIBTHAI_SOURCES}) target_link_libraries(libthai iconvwrapper Fcitx5::Core ${THAI_TARGET} Iconv::Iconv) target_include_directories(libthai PRIVATE ${PROJECT_BINARY_DIR}) set_target_properties(libthai PROPERTIES PREFIX "") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx5-libthai-5.1.3/src/engine.cpp new/fcitx5-libthai-5.1.6/src/engine.cpp --- old/fcitx5-libthai-5.1.3/src/engine.cpp 2024-04-22 09:58:00.000000000 +0200 +++ new/fcitx5-libthai-5.1.6/src/engine.cpp 2025-06-16 08:25:42.000000000 +0200 @@ -5,18 +5,37 @@ * */ #include "engine.h" +#include "thaikb.h" +#include <cstddef> +#include <cstdint> +#include <cstring> #include <deque> +#include <fcitx-utils/capabilityflags.h> +#include <fcitx-utils/key.h> +#include <fcitx-utils/keysym.h> #include <fcitx-utils/log.h> #include <fcitx-utils/utf8.h> +#include <fcitx/addoninstance.h> +#include <fcitx/event.h> #include <fcitx/inputcontext.h> #include <fcitx/inputcontextmanager.h> +#include <fcitx/inputmethodentry.h> +#include <stdexcept> +#include <string> +#include <string_view> +#include <thai/thailib.h> #include <thai/thcell.h> #include <thai/thinp.h> +#include <vector> -namespace fcitx { +namespace { FCITX_DEFINE_LOG_CATEGORY(libthai_log, "libthai"); +} + +namespace fcitx { + #define LIBTHAI_DEBUG() FCITX_LOGC(libthai_log, Debug) constexpr auto FALLBACK_BUFF_SIZE = 4; @@ -99,11 +118,13 @@ LibThaiEngine::~LibThaiEngine() {} -void LibThaiEngine::activate(const InputMethodEntry &, InputContextEvent &) {} +void LibThaiEngine::activate(const InputMethodEntry & /*entry*/, + InputContextEvent & /*event*/) {} -void LibThaiEngine::deactivate(const InputMethodEntry &, InputContextEvent &) {} +void LibThaiEngine::deactivate(const InputMethodEntry & /*entry*/, + InputContextEvent & /*event*/) {} -bool isContextIntactKey(Key key) { +static bool isContextIntactKey(Key key) { return (((key.sym() & 0xFF00) == 0xFF00) && (/* IsModifierKey */ @@ -114,7 +135,7 @@ key.sym() <= FcitxKey_ISO_Last_Group_Lock)); } -bool isContextLostKey(Key key) { +static bool isContextLostKey(Key key) { return ((key.sym() & 0xFF00) == 0xFF00) && (key.sym() == FcitxKey_BackSpace || key.sym() == FcitxKey_Tab || @@ -134,12 +155,13 @@ (FcitxKey_F1 <= key.sym() && key.sym() <= FcitxKey_F35)); } -void LibThaiEngine::keyEvent(const InputMethodEntry &, KeyEvent &keyEvent) { +void LibThaiEngine::keyEvent(const InputMethodEntry & /*entry*/, + KeyEvent &keyEvent) { auto key = keyEvent.rawKey(); if (keyEvent.isRelease()) { return; } - auto state = keyEvent.inputContext()->propertyFor(&factory_); + auto *state = keyEvent.inputContext()->propertyFor(&factory_); // If any ctrl alt super modifier is pressed, ignore. if (key.states().testAny(KeyStates{KeyState::Ctrl_Alt, KeyState::Super}) || isContextLostKey(key)) { @@ -187,7 +209,8 @@ prevChar = prevChars.back(); } if (!th_isaccept(prevChar, newChar, *config_.strictness)) { - return keyEvent.filterAndAccept(); + keyEvent.filterAndAccept(); + return; } if (state->commitString(&newChar, 1)) { keyEvent.filterAndAccept(); @@ -200,14 +223,16 @@ state->prevCell(&contextCell); if (!th_validate_leveled(contextCell, newChar, &conv, *config_.strictness)) { - return keyEvent.filterAndAccept(); + keyEvent.filterAndAccept(); + return; } if (conv.offset < 0) { // SurroundingText not supported, so just reject the key. if (!keyEvent.inputContext()->capabilityFlags().test( CapabilityFlag::SurroundingText)) { - return keyEvent.filter(); + keyEvent.filter(); + return; } keyEvent.inputContext()->deleteSurroundingText(conv.offset, @@ -217,15 +242,17 @@ state->rememberPrevChars(newChar); if (state->commitString(conv.conv, strlen(reinterpret_cast<char *>(conv.conv)))) { - return keyEvent.filterAndAccept(); + keyEvent.filterAndAccept(); + return; } } -void LibThaiEngine::reset(const InputMethodEntry &, InputContextEvent &event) { - auto state = event.inputContext()->propertyFor(&factory_); +void LibThaiEngine::reset(const InputMethodEntry & /*entry*/, + InputContextEvent &event) { + auto *state = event.inputContext()->propertyFor(&factory_); state->forgetPrevChars(); } } // namespace fcitx -FCITX_ADDON_FACTORY(fcitx::LibThaiFactory); +FCITX_ADDON_FACTORY_V2(libthai, fcitx::LibThaiFactory); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx5-libthai-5.1.3/src/engine.h new/fcitx5-libthai-5.1.6/src/engine.h --- old/fcitx5-libthai-5.1.3/src/engine.h 2024-04-22 09:58:00.000000000 +0200 +++ new/fcitx5-libthai-5.1.6/src/engine.h 2025-06-16 08:25:42.000000000 +0200 @@ -9,10 +9,16 @@ #include "iconvwrapper.h" #include "thaikb.h" +#include <fcitx-config/configuration.h> +#include <fcitx-config/enum.h> #include <fcitx-config/iniparser.h> +#include <fcitx-config/option.h> +#include <fcitx-config/rawconfig.h> #include <fcitx-utils/i18n.h> #include <fcitx/addonfactory.h> +#include <fcitx/addoninstance.h> #include <fcitx/addonmanager.h> +#include <fcitx/event.h> #include <fcitx/inputcontextproperty.h> #include <fcitx/inputmethodengine.h> #include <fcitx/instance.h> @@ -47,7 +53,7 @@ void keyEvent(const InputMethodEntry &entry, KeyEvent &keyEvent) override; void reset(const InputMethodEntry &entry, InputContextEvent &event) override; - void deactivate(const fcitx::InputMethodEntry &, + void deactivate(const fcitx::InputMethodEntry & /*entry*/, fcitx::InputContextEvent &event) override; const fcitx::Configuration *getConfig() const override { return &config_; } void setConfig(const fcitx::RawConfig &raw) override { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx5-libthai-5.1.3/src/iconvwrapper.cpp new/fcitx5-libthai-5.1.6/src/iconvwrapper.cpp --- old/fcitx5-libthai-5.1.3/src/iconvwrapper.cpp 2024-04-22 09:58:00.000000000 +0200 +++ new/fcitx5-libthai-5.1.6/src/iconvwrapper.cpp 2025-06-16 08:25:42.000000000 +0200 @@ -6,8 +6,14 @@ */ #include "iconvwrapper.h" +#include <cstddef> +#include <cstdint> #include <fcitx-utils/utf8.h> #include <iconv.h> +#include <iterator> +#include <memory> +#include <string_view> +#include <vector> class IconvWrapperPrivate { public: @@ -30,7 +36,7 @@ } std::vector<uint8_t> IconvWrapper::tryConvert(std::string_view s) const { - auto conv = d_ptr->conv_; + iconv_t conv = d_ptr->conv_; for (auto iter = std::begin(s), e = std::end(s); iter != e; iter = fcitx::utf8::nextChar(iter)) { std::vector<uint8_t> result; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx5-libthai-5.1.3/src/libthai-addon.conf.in.in new/fcitx5-libthai-5.1.6/src/libthai-addon.conf.in.in --- old/fcitx5-libthai-5.1.3/src/libthai-addon.conf.in.in 2024-04-22 09:58:00.000000000 +0200 +++ new/fcitx5-libthai-5.1.6/src/libthai-addon.conf.in.in 2025-06-16 08:25:42.000000000 +0200 @@ -6,3 +6,6 @@ Type=SharedLibrary OnDemand=True Configurable=True + +[Addon/Dependencies] +0=core:@REQUIRED_FCITX_VERSION@