Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package fcitx5-m17n for openSUSE:Factory checked in at 2025-06-23 15:04:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/fcitx5-m17n (Old) and /work/SRC/openSUSE:Factory/.fcitx5-m17n.new.7067 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "fcitx5-m17n" Mon Jun 23 15:04:05 2025 rev:8 rq:1287642 version:5.1.4 Changes: -------- --- /work/SRC/openSUSE:Factory/fcitx5-m17n/fcitx5-m17n.changes 2025-01-29 16:18:19.855257706 +0100 +++ /work/SRC/openSUSE:Factory/.fcitx5-m17n.new.7067/fcitx5-m17n.changes 2025-06-23 15:04:47.672536501 +0200 @@ -1,0 +2,9 @@ +Sun Jun 22 04:00:35 UTC 2025 - Marguerite Su <i...@marguerite.su> + +- update to 5.1.4 + * get rid of C getling usage + * port away from fmt to std::format + * use new macro for i18n string format + * port to standardpaths + +------------------------------------------------------------------- Old: ---- fcitx5-m17n-5.1.3.tar.zst New: ---- fcitx5-m17n-5.1.4.tar.zst ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fcitx5-m17n.spec ++++++ --- /var/tmp/diff_new_pack.g7pdQk/_old 2025-06-23 15:04:48.908588068 +0200 +++ /var/tmp/diff_new_pack.g7pdQk/_new 2025-06-23 15:04:48.912588235 +0200 @@ -17,17 +17,22 @@ Name: fcitx5-m17n -Version: 5.1.3 +Version: 5.1.4 Release: 0 Summary: M17n input method engine for Fcitx5 License: LGPL-2.1-or-later +Group: System/I18n/Chinese URL: https://github.com/fcitx/fcitx5-m17n Source: https://download.fcitx-im.org/fcitx5/%{name}/%{name}-%{version}.tar.zst BuildRequires: cmake BuildRequires: extra-cmake-modules BuildRequires: fcitx5-devel BuildRequires: fmt-devel +%if 0%{?suse_version} >= 1550 BuildRequires: gcc-c++ +%else +BuildRequires: gcc13-c++ +%endif BuildRequires: m17n-lib-devel BuildRequires: pkgconfig BuildRequires: zstd @@ -46,6 +51,10 @@ %setup -q %build +%if 0%{?suse_version} < 1550 +export CC=%{_bindir}/gcc-13 +export CXX=%{_bindir}/g++-13 +%endif %cmake %make_build @@ -56,7 +65,7 @@ %files -f %{name}.lang %license LICENSES %doc README.md -%{_fcitx5_libdir}/m17n.so +%{_fcitx5_libdir}/libm17n.so %{_fcitx5_addondir}/m17n.conf %{_fcitx5_datadir}/m17n %{_datadir}/metainfo/org.fcitx.Fcitx5.Addon.M17N.metainfo.xml ++++++ fcitx5-m17n-5.1.3.tar.zst -> fcitx5-m17n-5.1.4.tar.zst ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx5-m17n-5.1.3/CMakeLists.txt new/fcitx5-m17n-5.1.4/CMakeLists.txt --- old/fcitx5-m17n-5.1.3/CMakeLists.txt 2025-01-23 00:27:31.000000000 +0100 +++ new/fcitx5-m17n-5.1.4/CMakeLists.txt 2025-06-16 08:25:47.000000000 +0200 @@ -1,8 +1,8 @@ cmake_minimum_required(VERSION 3.6) -project(fcitx-m17n VERSION 5.1.3) +project(fcitx-m17n VERSION 5.1.4) -set(REQUIRED_FCITX_VERSION 5.1.12) +set(REQUIRED_FCITX_VERSION 5.1.13) find_package(ECM REQUIRED 1.0.0) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH}) include(FeatureSummary) @@ -16,17 +16,18 @@ find_package(Fcitx5Core ${REQUIRED_FCITX_VERSION} REQUIRED) find_package(Fcitx5Module REQUIRED COMPONENTS TestFrontend) find_package(Gettext REQUIRED) -find_package(fmt REQUIRED) find_package(PkgConfig REQUIRED) -pkg_check_modules(M17NGui IMPORTED_TARGET "m17n-gui>=1.6.3" REQUIRED) -# Required for data and testing -pkg_check_modules(M17NDB "m17n-db" REQUIRED) - -if (TARGET fmt::fmt-header-only) - set(FMT_TARGET fmt::fmt-header-only) -else() - set(FMT_TARGET fmt::fmt) -endif () + +if (NOT DEFINED M17N_TARGET) + pkg_check_modules(M17NGui IMPORTED_TARGET "m17n-gui>=1.6.3" REQUIRED) + # Required for data and testing + pkg_check_modules(M17NDB "m17n-db" REQUIRED) + set(M17N_TARGET PkgConfig::M17NGui) +endif() + +set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib") +set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin") +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin") include("${FCITX_INSTALL_CMAKECONFIG_DIR}/Fcitx5Utils/Fcitx5CompilerSettings.cmake") add_definitions(-DFCITX_GETTEXT_DOMAIN=\"fcitx5-m17n\" -D_GNU_SOURCE) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx5-m17n-5.1.3/im/CMakeLists.txt new/fcitx5-m17n-5.1.4/im/CMakeLists.txt --- old/fcitx5-m17n-5.1.3/im/CMakeLists.txt 2025-01-23 00:27:31.000000000 +0100 +++ new/fcitx5-m17n-5.1.4/im/CMakeLists.txt 2025-06-16 08:25:47.000000000 +0200 @@ -5,12 +5,11 @@ ) add_fcitx5_addon(m17n ${fcitx_m17n_sources}) -target_link_libraries(m17n Fcitx5::Core Fcitx5::Config ${FMT_TARGET} PkgConfig::M17NGui) +target_link_libraries(m17n Fcitx5::Core Fcitx5::Config ${M17N_TARGET}) target_include_directories(m17n PRIVATE ${PROJECT_BINARY_DIR}) -set_target_properties(m17n PROPERTIES PREFIX "") install(TARGETS m17n DESTINATION "${CMAKE_INSTALL_LIBDIR}/fcitx5") configure_file(m17n.conf.in.in m17n.conf.in) fcitx5_translate_desktop_file("${CMAKE_CURRENT_BINARY_DIR}/m17n.conf.in" m17n.conf) -install(FILES "${CMAKE_CURRENT_BINARY_DIR}/m17n.conf" DESTINATION "${FCITX_INSTALL_PKGDATADIR}/addon") +install(FILES "${CMAKE_CURRENT_BINARY_DIR}/m17n.conf" DESTINATION "${FCITX_INSTALL_PKGDATADIR}/addon" COMPONENT config) -install(FILES default DESTINATION "${CMAKE_INSTALL_DATADIR}/fcitx5/m17n") +install(FILES default DESTINATION "${CMAKE_INSTALL_DATADIR}/fcitx5/m17n" COMPONENT config) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx5-m17n-5.1.3/im/engine.cpp new/fcitx5-m17n-5.1.4/im/engine.cpp --- old/fcitx5-m17n-5.1.3/im/engine.cpp 2025-01-23 00:27:31.000000000 +0100 +++ new/fcitx5-m17n-5.1.4/im/engine.cpp 2025-06-16 08:25:47.000000000 +0200 @@ -18,7 +18,7 @@ #include <fcitx-utils/key.h> #include <fcitx-utils/keysym.h> #include <fcitx-utils/log.h> -#include <fcitx-utils/standardpath.h> +#include <fcitx-utils/standardpaths.h> #include <fcitx-utils/stringutils.h> #include <fcitx-utils/textformatflags.h> #include <fcitx-utils/utf8.h> @@ -32,7 +32,7 @@ #include <fcitx/text.h> #include <fcitx/userinterface.h> #include <fcntl.h> -#include <fmt/format.h> +#include <format> #include <m17n-core.h> #include <m17n.h> #include <memory> @@ -295,13 +295,10 @@ reloadConfig(); M17N_INIT(); - auto file = StandardPath::global().open(StandardPath::Type::PkgData, - "m17n/default", O_RDONLY); - FILE *fp = fdopen(file.fd(), "r"); - if (fp) { - file.release(); - list_ = ParseDefaultSettings(fp); - fclose(fp); + auto file = StandardPaths::global().open(StandardPathsType::PkgData, + "m17n/default"); + if (file.isValid()) { + list_ = ParseDefaultSettings(file.fd()); } instance_->inputContextManager().registerProperty("m17nState", &factory_); @@ -351,9 +348,9 @@ std::string iconName; auto uniqueName = stringutils::concat("m17n_", lang, "_", name); - auto fxName = fmt::format( - _("{0} (M17N)"), - (item && item->i18nName.size()) ? _(item->i18nName) : name); + const std::string i18nname = + (item && item->i18nName.size()) ? _(item->i18nName) : name; + auto fxName = _("{0} (M17N)", i18nname); info = minput_get_title_icon(mlang, mname); // head of info is a MText diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx5-m17n-5.1.3/im/m17n.conf.in.in new/fcitx5-m17n-5.1.4/im/m17n.conf.in.in --- old/fcitx5-m17n-5.1.3/im/m17n.conf.in.in 2025-01-23 00:27:31.000000000 +0100 +++ new/fcitx5-m17n-5.1.4/im/m17n.conf.in.in 2025-06-16 08:25:47.000000000 +0200 @@ -4,7 +4,7 @@ Category=InputMethod Version=@PROJECT_VERSION@ Enabled=True -Library=m17n +Library=libm17n Type=SharedLibrary Configurable=True diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx5-m17n-5.1.3/im/overrideparser.cpp new/fcitx5-m17n-5.1.4/im/overrideparser.cpp --- old/fcitx5-m17n-5.1.3/im/overrideparser.cpp 2025-01-23 00:27:31.000000000 +0100 +++ new/fcitx5-m17n-5.1.4/im/overrideparser.cpp 2025-06-16 08:25:47.000000000 +0200 @@ -9,22 +9,26 @@ #include <cstddef> #include <cstdio> #include <cstdlib> +#include <fcitx-utils/fdstreambuf.h> #include <fcitx-utils/stringutils.h> +#include <istream> #include <string> #include <vector> using namespace fcitx; -std::vector<OverrideItem> ParseDefaultSettings(FILE *fp) { - char *buf = nullptr; - size_t bufsize = 0; +std::vector<OverrideItem> ParseDefaultSettings(int fd) { std::vector<OverrideItem> list; - while (getline(&buf, &bufsize, fp) != -1) { + + IFDStreamBuf buf(fd); + std::istream in(&buf); + std::string line; + while (std::getline(in, line)) { /* ignore comments */ - if (!buf || buf[0] == '#') { + if (!line.empty() || line[0] == '#') { continue; } - auto trimmed = stringutils::trim(buf); + const auto trimmed = stringutils::trimView(line); auto strList = stringutils::split(trimmed, ":"); do { @@ -53,7 +57,6 @@ } } while (0); } - free(buf); std::stable_sort(list.begin(), list.end(), [](const auto &lhs, const auto &rhs) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx5-m17n-5.1.3/im/overrideparser.h new/fcitx5-m17n-5.1.4/im/overrideparser.h --- old/fcitx5-m17n-5.1.3/im/overrideparser.h 2025-01-23 00:27:31.000000000 +0100 +++ new/fcitx5-m17n-5.1.4/im/overrideparser.h 2025-06-16 08:25:47.000000000 +0200 @@ -19,7 +19,7 @@ int wildcardCount; }; -std::vector<OverrideItem> ParseDefaultSettings(FILE *fp); +std::vector<OverrideItem> ParseDefaultSettings(int fd); const OverrideItem *MatchDefaultSettings(const std::vector<OverrideItem> &list, const std::string &lang, const std::string &name); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx5-m17n-5.1.3/org.fcitx.Fcitx5.Addon.M17N.metainfo.xml.in new/fcitx5-m17n-5.1.4/org.fcitx.Fcitx5.Addon.M17N.metainfo.xml.in --- old/fcitx5-m17n-5.1.3/org.fcitx.Fcitx5.Addon.M17N.metainfo.xml.in 2025-01-23 00:27:31.000000000 +0100 +++ new/fcitx5-m17n-5.1.4/org.fcitx.Fcitx5.Addon.M17N.metainfo.xml.in 2025-06-16 08:25:47.000000000 +0200 @@ -14,6 +14,7 @@ <url type="vcs-browser">https://github.com/fcitx/fcitx5-m17n</url> <project_group>Fcitx</project_group> <releases> + <release version="5.1.4" date="2025-06-15"/> <release version="5.1.3" date="2025-01-22"/> <release version="5.1.2" date="2024-10-08"/> <release version="5.1.1" date="2024-04-22"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx5-m17n-5.1.3/po/vi.po new/fcitx5-m17n-5.1.4/po/vi.po --- old/fcitx5-m17n-5.1.3/po/vi.po 2025-01-23 00:27:31.000000000 +0100 +++ new/fcitx5-m17n-5.1.4/po/vi.po 2025-06-16 08:25:47.000000000 +0200 @@ -3,16 +3,17 @@ # This file is distributed under the same license as the fcitx5-m17n package. # # Translators: -# Zen Fas, 2022 +# zenfas, 2022 +# Huy Võ <hoanghuy...@gmail.com>, 2025 # msgid "" msgstr "" "Project-Id-Version: fcitx5-m17n\n" "Report-Msgid-Bugs-To: fcitx-...@googlegroups.com\n" -"POT-Creation-Date: 2022-10-26 20:25+0000\n" +"POT-Creation-Date: 2025-03-12 20:24+0000\n" "PO-Revision-Date: 2017-12-21 01:32+0000\n" -"Last-Translator: Zen Fas, 2022\n" -"Language-Team: Vietnamese (https://www.transifex.com/fcitx/teams/12005/vi/)\n" +"Last-Translator: Huy Võ <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" @@ -31,7 +32,7 @@ msgid "Chewing Symbol" msgstr "Ký tự Chewing" -#: im/engine.h:23 +#: im/engine.h:33 msgid "Enable Deprecated" msgstr "Bật phản đối" @@ -43,11 +44,11 @@ msgid "Keyboard" msgstr "Bàn phím" -#: im/m17n.conf.in.in:3 +#: im/m17n.conf.in.in:2 msgid "M17N" msgstr "M17N" -#: im/m17n.conf.in.in:4 +#: im/m17n.conf.in.in:3 msgid "M17N IM Support For Fcitx" msgstr "Bộ gõ M17N hỗ trợ cho Fcitx" @@ -61,12 +62,12 @@ #: im/i18nname.cpp:14 msgid "Pinyin" -msgstr "Pinyin" +msgstr "Bính âm" #. remember to update "default" in the same directory. #: im/i18nname.cpp:13 msgid "Pinyin Symbol" -msgstr "Ký tự Pinyin" +msgstr "Ký tự Bính âm" #: im/i18nname.cpp:16 msgid "Quick" @@ -80,6 +81,7 @@ msgid "Tone Pinyin" msgstr "Âm điệu Pinyin" -#: im/engine.cpp:337 +#: im/engine.cpp:353 +#, c++-format msgid "{0} (M17N)" msgstr "{0} (M17N)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx5-m17n-5.1.3/test/CMakeLists.txt new/fcitx5-m17n-5.1.4/test/CMakeLists.txt --- old/fcitx5-m17n-5.1.3/test/CMakeLists.txt 2025-01-23 00:27:31.000000000 +0100 +++ new/fcitx5-m17n-5.1.4/test/CMakeLists.txt 2025-06-16 08:25:47.000000000 +0200 @@ -6,4 +6,4 @@ add_executable(testm17n testm17n.cpp) target_link_libraries(testm17n Fcitx5::Core Fcitx5::Module::TestFrontend) add_dependencies(testm17n m17n copy-addon) -add_test(testm17n testm17n) +add_test(NAME testm17n COMMAND testm17n) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx5-m17n-5.1.3/test/testm17n.cpp new/fcitx5-m17n-5.1.4/test/testm17n.cpp --- old/fcitx5-m17n-5.1.3/test/testm17n.cpp 2025-01-23 00:27:31.000000000 +0100 +++ new/fcitx5-m17n-5.1.4/test/testm17n.cpp 2025-06-16 08:25:47.000000000 +0200 @@ -11,7 +11,6 @@ #include <fcitx-utils/keysym.h> #include <fcitx-utils/log.h> #include <fcitx-utils/macros.h> -#include <fcitx-utils/standardpath.h> #include <fcitx-utils/testing.h> #include <fcitx/addonmanager.h> #include <fcitx/inputcontextmanager.h> @@ -75,7 +74,7 @@ void runInstance() {} int main() { - setupTestingEnvironment(TESTING_BINARY_DIR, {TESTING_BINARY_DIR "/im"}, + setupTestingEnvironment(TESTING_BINARY_DIR, {"bin"}, {TESTING_BINARY_DIR "/test"}); // fcitx::Log::setLogRule("default=5,table=5,libime-table=5"); char arg0[] = "testm17n";
