commit: 25ed71126f4bce6f110dee891bb68bfaa86d1812 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Mon Mar 2 16:11:42 2026 +0000 Commit: Yixun Lan <dlan <AT> gentoo <DOT> org> CommitDate: Tue Mar 3 11:44:16 2026 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25ed7112
app-i18n/fcitx-m17n: drop 5.1.3, 5.1.4, 5.1.4-r1 Part-of: https://github.com/gentoo/gentoo/pull/45880 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> Signed-off-by: Yixun Lan <dlan <AT> gentoo.org> app-i18n/fcitx-m17n/Manifest | 2 - app-i18n/fcitx-m17n/fcitx-m17n-5.1.3.ebuild | 41 -------- app-i18n/fcitx-m17n/fcitx-m17n-5.1.4-r1.ebuild | 38 -------- app-i18n/fcitx-m17n/fcitx-m17n-5.1.4.ebuild | 39 -------- .../fcitx-m17n-5.1.3-fix-i18n-string-format.patch | 103 --------------------- 5 files changed, 223 deletions(-) diff --git a/app-i18n/fcitx-m17n/Manifest b/app-i18n/fcitx-m17n/Manifest index 4487c531c0e6..2bf65cc4bcf0 100644 --- a/app-i18n/fcitx-m17n/Manifest +++ b/app-i18n/fcitx-m17n/Manifest @@ -1,3 +1 @@ -DIST fcitx-m17n-5.1.3.tar.zst 27964 BLAKE2B 8ee22fab28e9da79ca3d24ee1aaae10623e07daa17b8cf950c03bdfbf7a0fcc83439af72c6443d9aa1ce50614f0bc5f70af139bb795f9aeec7d1c4e064f670a5 SHA512 188d7d02fc6897c3b5966c369b7875c175e5ebb23ee87eefaf295ca36309bfa42cfe846ae57b09be850f6c0f9bdfe1045c6bfd259f92f6d350cb4f15c1b48f26 -DIST fcitx-m17n-5.1.4.tar.zst 27990 BLAKE2B ab988ecaad09aafca59ffe9d5d8eae1cbed2af3133a7d7d945e8c5104f40121665c5565f2640d10c5d5f1d8e3571fc60cc19fa26a7bb70efb7f71c48497f03ab SHA512 3a5b3185f51462865f8ca73c13ff0cf0790e9a47424858cacccbfec9613382ade8ac08512b0bf3229d0592dc0cde01ed5eba1abf19c94f107024bd76f42fe159 DIST fcitx-m17n-5.1.5.tar.zst 28699 BLAKE2B 1c5bf2dcacd00170174c9d626ac5b1c70ad4a060b1e412bff34fcc42a03c925136c4512c295f53a0b85d517d9fe184a69727f96ccd0c250451890b88dba89a8c SHA512 74aecfb436a3324844219e17ccf81d85622faefa4f3733e2e53f72601cbfaa2a45fd6ce1788d4a1c8a8e49e32274412138ef2198d4290ab5fc509f3ce6901d49 diff --git a/app-i18n/fcitx-m17n/fcitx-m17n-5.1.3.ebuild b/app-i18n/fcitx-m17n/fcitx-m17n-5.1.3.ebuild deleted file mode 100644 index 06ec7be2c2bc..000000000000 --- a/app-i18n/fcitx-m17n/fcitx-m17n-5.1.3.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 2024-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -MY_PN="fcitx5-m17n" - -inherit cmake unpacker - -DESCRIPTION="m17n-provided input methods for Fcitx5" -HOMEPAGE="https://github.com/fcitx/fcitx5-m17n"; -SRC_URI="https://download.fcitx-im.org/fcitx5/${MY_PN}/${MY_PN}-${PV}.tar.zst -> ${P}.tar.zst" - -S="${WORKDIR}/${MY_PN}-${PV}" -LICENSE="LGPL-2.1+" -SLOT="5" -KEYWORDS="amd64 ~arm64 ~loong ~riscv x86" -IUSE="test" -RESTRICT="!test? ( test )" - -# m17n-gui>=1.6.3 -RDEPEND=" - >=app-i18n/fcitx-5.1.12:5 - dev-db/m17n-db - dev-libs/libfmt - >=dev-libs/m17n-lib-1.6.3[X] -" -DEPEND="${RDEPEND}" -BDEPEND=" - virtual/pkgconfig - kde-frameworks/extra-cmake-modules:0 -" - -PATCHES=( "${FILESDIR}/${P}-fix-i18n-string-format.patch") # bugs #959670 - -src_configure() { - local mycmakeargs=( - -DENABLE_TEST=$(usex test) - ) - cmake_src_configure -} diff --git a/app-i18n/fcitx-m17n/fcitx-m17n-5.1.4-r1.ebuild b/app-i18n/fcitx-m17n/fcitx-m17n-5.1.4-r1.ebuild deleted file mode 100644 index 449787b22ee0..000000000000 --- a/app-i18n/fcitx-m17n/fcitx-m17n-5.1.4-r1.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 2024-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -MY_PN="fcitx5-m17n" - -inherit cmake unpacker - -DESCRIPTION="m17n-provided input methods for Fcitx5" -HOMEPAGE="https://github.com/fcitx/fcitx5-m17n"; -SRC_URI="https://download.fcitx-im.org/fcitx5/${MY_PN}/${MY_PN}-${PV}.tar.zst -> ${P}.tar.zst" - -S="${WORKDIR}/${MY_PN}-${PV}" -LICENSE="LGPL-2.1+" -SLOT="5" -KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86" -IUSE="test" -RESTRICT="!test? ( test )" - -# m17n-gui>=1.6.3 -RDEPEND=" - >=app-i18n/fcitx-5.1.12:5 - dev-db/m17n-db - >=dev-libs/m17n-lib-1.6.3[X] -" -DEPEND="${RDEPEND}" -BDEPEND=" - virtual/pkgconfig - kde-frameworks/extra-cmake-modules:0 -" - -src_configure() { - local mycmakeargs=( - -DENABLE_TEST=$(usex test) - ) - cmake_src_configure -} diff --git a/app-i18n/fcitx-m17n/fcitx-m17n-5.1.4.ebuild b/app-i18n/fcitx-m17n/fcitx-m17n-5.1.4.ebuild deleted file mode 100644 index 1af5f94c61d7..000000000000 --- a/app-i18n/fcitx-m17n/fcitx-m17n-5.1.4.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 2024-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -MY_PN="fcitx5-m17n" - -inherit cmake unpacker - -DESCRIPTION="m17n-provided input methods for Fcitx5" -HOMEPAGE="https://github.com/fcitx/fcitx5-m17n"; -SRC_URI="https://download.fcitx-im.org/fcitx5/${MY_PN}/${MY_PN}-${PV}.tar.zst -> ${P}.tar.zst" - -S="${WORKDIR}/${MY_PN}-${PV}" -LICENSE="LGPL-2.1+" -SLOT="5" -KEYWORDS="amd64 ~arm64 ~loong ~riscv x86" -IUSE="test" -RESTRICT="!test? ( test )" - -# m17n-gui>=1.6.3 -RDEPEND=" - >=app-i18n/fcitx-5.1.12:5 - dev-db/m17n-db - dev-libs/libfmt - >=dev-libs/m17n-lib-1.6.3[X] -" -DEPEND="${RDEPEND}" -BDEPEND=" - virtual/pkgconfig - kde-frameworks/extra-cmake-modules:0 -" - -src_configure() { - local mycmakeargs=( - -DENABLE_TEST=$(usex test) - ) - cmake_src_configure -} diff --git a/app-i18n/fcitx-m17n/files/fcitx-m17n-5.1.3-fix-i18n-string-format.patch b/app-i18n/fcitx-m17n/files/fcitx-m17n-5.1.3-fix-i18n-string-format.patch deleted file mode 100644 index 21e1ad2f6d64..000000000000 --- a/app-i18n/fcitx-m17n/files/fcitx-m17n-5.1.3-fix-i18n-string-format.patch +++ /dev/null @@ -1,103 +0,0 @@ -port away from fmt to std::format - -Bugs: https://bugs.gentoo.org/959670 -Link: https://github.com/fcitx/fcitx5-m17n/commit/105bee2b3b9bc8a17f0546f879daa31e88a9613b -Link: https://github.com/fcitx/fcitx5-m17n/commit/fbbfdcafaa5299e80c16d8bc4ed9cf8c6bd86395 - -From 105bee2b3b9bc8a17f0546f879daa31e88a9613b Mon Sep 17 00:00:00 2001 -From: Weng Xuetian <[email protected]> -Date: Wed, 19 Feb 2025 18:59:31 +0000 -Subject: [PATCH] Port away from fmt to std::format - ---- - CMakeLists.txt | 7 ------- - im/CMakeLists.txt | 2 +- - im/engine.cpp | 9 +++++---- - 3 files changed, 6 insertions(+), 12 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index a6ee6bb..ab5f3f3 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -16,18 +16,11 @@ set(GCOV_TOOL "gcov" CACHE STRING "Path to gcov tool used by coverage.") - 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 () -- - include("${FCITX_INSTALL_CMAKECONFIG_DIR}/Fcitx5Utils/Fcitx5CompilerSettings.cmake") - add_definitions(-DFCITX_GETTEXT_DOMAIN=\"fcitx5-m17n\" -D_GNU_SOURCE) - fcitx5_add_i18n_definition() -diff --git a/im/CMakeLists.txt b/im/CMakeLists.txt -index 900437f..ba50bd3 100644 ---- a/im/CMakeLists.txt -+++ b/im/CMakeLists.txt -@@ -5,7 +5,7 @@ set(fcitx_m17n_sources - ) - - 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 PkgConfig::M17NGui) - target_include_directories(m17n PRIVATE ${PROJECT_BINARY_DIR}) - set_target_properties(m17n PROPERTIES PREFIX "") - install(TARGETS m17n DESTINATION "${CMAKE_INSTALL_LIBDIR}/fcitx5") -diff --git a/im/engine.cpp b/im/engine.cpp -index 9b9ee4f..0f6da54 100644 ---- a/im/engine.cpp -+++ b/im/engine.cpp -@@ -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> -@@ -348,9 +348,10 @@ std::vector<InputMethodEntry> M17NEngine::listInputMethods() { - - 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 = -+ std::vformat(_("{0} (M17N)"), std::make_format_args(i18nname)); - - info = minput_get_title_icon(mlang, mname); - // head of info is a MText -From fbbfdcafaa5299e80c16d8bc4ed9cf8c6bd86395 Mon Sep 17 00:00:00 2001 -From: Weng Xuetian <[email protected]> -Date: Wed, 19 Feb 2025 23:33:05 -0800 -Subject: [PATCH] Use new macro for i18n string format - ---- - im/engine.cpp | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/im/engine.cpp b/im/engine.cpp -index 0f6da54..1a22657 100644 ---- a/im/engine.cpp -+++ b/im/engine.cpp -@@ -350,8 +350,7 @@ std::vector<InputMethodEntry> M17NEngine::listInputMethods() { - auto uniqueName = stringutils::concat("m17n_", lang, "_", name); - const std::string i18nname = - (item && item->i18nName.size()) ? _(item->i18nName) : name; -- auto fxName = -- std::vformat(_("{0} (M17N)"), std::make_format_args(i18nname)); -+ auto fxName = _("{0} (M17N)", i18nname); - - info = minput_get_title_icon(mlang, mname); - // head of info is a MText
