commit: f3ed3e24816d5a54359769ef472248d3f1bbf882 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sat Oct 4 15:17:31 2025 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sat Oct 4 15:17:55 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3ed3e24
app-i18n/fcitx: re-add 5.1.12 for a bit Bug: https://bugs.gentoo.org/963229 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> app-i18n/fcitx/Manifest | 1 + app-i18n/fcitx/fcitx-5.1.12.ebuild | 125 +++++++++++++++++++++ ...itx-5.1.12-make-x11-dependencies-optional.patch | 24 ++++ 3 files changed, 150 insertions(+) diff --git a/app-i18n/fcitx/Manifest b/app-i18n/fcitx/Manifest index f0c3c7255f0e..8be8caab4940 100644 --- a/app-i18n/fcitx/Manifest +++ b/app-i18n/fcitx/Manifest @@ -1 +1,2 @@ +DIST fcitx-5.1.12.tar.zst 8317084 BLAKE2B 097881acde8fc1cf6960fd20878bb25c483684ff9ad9ffa133081d91fffd50c53b29998b1577866f10a8cb409a3c0fc96766909f6bdf268313e768de79e372ea SHA512 82943f6c2e809e8d9049d457f59e52bc202daf922abec032efc589eefad77b4db4398fbaea92c019eaeaa40ccf51585a8a80676a7909433a8576dc63fb639645 DIST fcitx-5.1.14.tar.zst 8374893 BLAKE2B e390a2faf54ab8f3a3748d72955104b7080ead8f4bb540341902cb3ba985fd77ce19d881ef8ff387a10145b9cf0d403c6d80ffb48d0f951822e3577c20c72344 SHA512 2a85f8d79bbf483b8feb13d7617f67ec4c56e0b7ba7b1328af9fc1f0214999cc73bb1c3a541e7974d00a0a2cb31f91da4cd7709388c91de2f2737c5055fd6563 diff --git a/app-i18n/fcitx/fcitx-5.1.12.ebuild b/app-i18n/fcitx/fcitx-5.1.12.ebuild new file mode 100644 index 000000000000..57b1436feb8c --- /dev/null +++ b/app-i18n/fcitx/fcitx-5.1.12.ebuild @@ -0,0 +1,125 @@ +# Copyright 2023-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_PN="fcitx5" + +inherit cmake unpacker xdg + +DESCRIPTION="Fcitx 5 is a generic input method framework" +HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx5"; +SRC_URI="https://download.fcitx-im.org/fcitx5/fcitx5/fcitx5-${PV}_dict.tar.zst -> ${P}.tar.zst" + +S="${WORKDIR}/${MY_PN}-${PV}" +LICENSE="LGPL-2+ Unicode-DFS-2016" +SLOT="5" +KEYWORDS="amd64 arm64 ~loong ~ppc ~ppc64 ~riscv x86" +IUSE="+autostart doc +emoji +enchant +keyboard presage +server systemd test wayland +X" +REQUIRED_USE=" + || ( wayland X ) + X? ( keyboard ) + wayland? ( keyboard ) +" + +RESTRICT="!test? ( test )" + +RDEPEND=" + !app-i18n/fcitx:4 + dev-libs/libfmt + sys-devel/gettext + virtual/libintl + x11-libs/cairo[X?] + x11-libs/gdk-pixbuf:2 + x11-libs/pango[X?] + doc? ( + app-text/doxygen + dev-texlive/texlive-fontutils + ) + emoji? ( sys-libs/zlib ) + enchant? ( app-text/enchant:2 ) + keyboard? ( + app-text/iso-codes + dev-libs/expat + dev-libs/json-c:= + x11-misc/xkeyboard-config + x11-libs/libxkbcommon[X?,wayland?] + ) + systemd? ( + sys-apps/systemd + ) + !systemd? ( + dev-libs/libuv + sys-apps/dbus + ) + wayland? ( + dev-libs/glib:2 + dev-libs/wayland + dev-libs/wayland-protocols + dev-util/wayland-scanner + ) + X? ( + dev-libs/glib:2 + >=x11-libs/xcb-imdkit-1.0.3:5 + x11-libs/libX11 + x11-libs/libxkbfile + x11-libs/xcb-util + x11-libs/xcb-util-keysyms + x11-libs/xcb-util-wm + ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + virtual/pkgconfig + kde-frameworks/extra-cmake-modules:0 +" + +PATCHES=( "${FILESDIR}"/${P}-make-x11-dependencies-optional.patch ) + +src_configure() { + local mycmakeargs=( + -DENABLE_DBUS=on + -DENABLE_XDGAUTOSTART=$(usex autostart) + -DENABLE_SERVER=$(usex server) + -DENABLE_KEYBOARD=$(usex keyboard) + -DENABLE_TEST=$(usex test) + -DENABLE_ENCHANT=$(usex enchant) + -DENABLE_EMOJI=$(usex emoji) + -DENABLE_PRESAGE=$(usex presage) + -DENABLE_WAYLAND=$(usex wayland) + -DENABLE_X11=$(usex X) + -DENABLE_DOC=$(usex doc) + -DUSE_SYSTEMD=$(usex systemd) + ) + cmake_src_configure +} + +src_compile() { + cmake_src_compile + use doc && cmake_src_compile doc +} + +src_test() { + # break by sandbox + local CMAKE_SKIP_TESTS=( + testdbus + testservicewatcher + ) + cmake_src_test +} + +src_install() { + cmake_src_install + use doc && dodoc -r "${BUILD_DIR}"/doc/* +} + +pkg_postinst() { + xdg_pkg_postinst + + elog + elog "Follow the instructions on:" + elog "https://wiki.gentoo.org/wiki/Fcitx#Using_Fcitx"; + elog "https://fcitx-im.org/wiki/Setup_Fcitx_5"; + elog "https://fcitx-im.org/wiki/Using_Fcitx_5_on_Wayland"; + elog +} diff --git a/app-i18n/fcitx/files/fcitx-5.1.12-make-x11-dependencies-optional.patch b/app-i18n/fcitx/files/fcitx-5.1.12-make-x11-dependencies-optional.patch new file mode 100644 index 000000000000..b177316fb7e4 --- /dev/null +++ b/app-i18n/fcitx/files/fcitx-5.1.12-make-x11-dependencies-optional.patch @@ -0,0 +1,24 @@ +https://github.com/fcitx/fcitx5/pull/1259 + +The header may be not available when X11 is disabled. Fixes fcitx5 +build without X11 libraries. + +Signed-off-by: Yao Zi <[email protected]> +--- a/src/ui/classic/classicui.cpp ++++ b/src/ui/classic/classicui.cpp +@@ -20,7 +20,6 @@ + #include <utility> + #include <vector> + #include <cairo.h> +-#include <xcb/xcb.h> + #include "fcitx-config/iniparser.h" + #include "fcitx-config/rawconfig.h" + #include "fcitx-utils/color.h" +@@ -45,6 +44,7 @@ + #include "plasmathemewatchdog.h" + #include "theme.h" + #ifdef ENABLE_X11 ++#include <xcb/xcb.h> + #include "xcb_public.h" + #include "xcbui.h" + #endif
