gentoo auto-resync : 09:02:2025 - 00:12:00

3 files changed, 152 insertions, 0 deletions

diff --git a/app-i18n/fcitx/Manifest b/app-i18n/fcitx/Manifest
index a20305cc7318..d1a723af858c 100644
--- a/app-i18n/fcitx/Manifest
+++ b/app-i18n/fcitx/Manifest
@@ -1,5 +1,8 @@
+AUX fcitx-5.1.12-make-x11-dependencies-optional.patch 623 BLAKE2B 12b3cde5b5aba412bf59246f2136482788c863ee264152c018f84a72cef4be2cad50804eaafe21457eec129c9882de8fd14d3547ca57d2a3011d29a5c6e63547 SHA512 a480d316c73abe987bbdaa13116a7fe6a4afbc6d46c778184fd003ab2c2cafc2bce10f1772fbe7e0638dbeb2d0a333119e54c30ff08d0496fe367b2f86378fc6
 DIST fcitx-5.1.10.tar.zst 8309913 BLAKE2B a63f5c747dd1d7a519873f00f234ae43d1ab5458e57b809f01e2b6cefc3e3921ecd7fff27cf4b21d59842f11e8d397760d90cf6572b42f65d226b21acc18fefc SHA512 196bc26f7dd50596da90e6b4b0a8b4886b57ec928c182427fb8763507f1f4cb39a252bfddcbd6eccaa0cc920070b7b9fda03f18fd444f84154ddd925678ad7d4
 DIST fcitx-5.1.11.tar.zst 8310353 BLAKE2B b38daa03c40b19454cf8b82dc6c9d799730fb614bb606d86f0dfbadb6dd88f3a382f4c2b2a8f820bf4b01e27e27be82ed2624fb3f0a70843af5f72924e62e58b SHA512 d2fee4b931175d67ed29058af5dc644c6918829ca336e88566781ffaf5ccbe942281e9a41459b5ad8ad37756bed24b999127f8b17d8925bb923a9eb10d1081fb
+DIST fcitx-5.1.12.tar.zst 8317084 BLAKE2B 097881acde8fc1cf6960fd20878bb25c483684ff9ad9ffa133081d91fffd50c53b29998b1577866f10a8cb409a3c0fc96766909f6bdf268313e768de79e372ea SHA512 82943f6c2e809e8d9049d457f59e52bc202daf922abec032efc589eefad77b4db4398fbaea92c019eaeaa40ccf51585a8a80676a7909433a8576dc63fb639645
 EBUILD fcitx-5.1.10.ebuild 2502 BLAKE2B 6f5025a3ff53e11f2416de3759cf00b31dc56bc8f11a7cc06b113047903ded8c6d5eaab98d3bb226872d98e98e388e97fb786853464466496ff00dea2e51aea6 SHA512 f662d1548a7dcd9c7231aaff555ede5b61f661fc95b125e4508e95496f50fe86dd0c282b1af7e91763d93c7b293738959ce5c990710e16505fef3b8dde0352a7
 EBUILD fcitx-5.1.11.ebuild 2502 BLAKE2B 6f5025a3ff53e11f2416de3759cf00b31dc56bc8f11a7cc06b113047903ded8c6d5eaab98d3bb226872d98e98e388e97fb786853464466496ff00dea2e51aea6 SHA512 f662d1548a7dcd9c7231aaff555ede5b61f661fc95b125e4508e95496f50fe86dd0c282b1af7e91763d93c7b293738959ce5c990710e16505fef3b8dde0352a7
+EBUILD fcitx-5.1.12.ebuild 2573 BLAKE2B e1ad99fa82cc6f54cbe42a4bd3a2794288ab56e98126ba4e40b3555b2f76d12677f71454715e0f42edf131d457c7a4e87f8535e8357759cf5ccfb840360eef96 SHA512 0458b7a79c802bef9bbd62e9a78183e4dd679e40ee327ff04825239580dd81bc359e0421e03360c78c2724d8b5d96acc5d0038a29b3b4363c7d521042685e803
 MISC metadata.xml 1123 BLAKE2B dc2f8ea69b22e7af90a9980228b8e3a677d51e98b004622985a9a92bee395e45cb1a6367530e75268daabeaaf9dfe38ea383844bcdf6acb7b0edcfcad2920c82 SHA512 edf2d04562271d6582e11cbf5ba7c10a9e320b06af4c8651cc3b862e2992e3522ca746ff1b7fd40f43d45b1e716d32c522cf60ff0ee557de29096b1a3a36ef90
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..91033a878585
--- /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 ~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_install() {
+	cmake_src_install
+	use doc && dodoc -r "${BUILD_DIR}"/doc/*
+}
+
+src_test() {
+	# break by sandbox
+	local CMAKE_SKIP_TESTS=(
+		testdbus
+		testservicewatcher
+	)
+	cmake_src_test
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	elog
+	elog "Follow the instrcutions 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 <ziyao@disroot.org>
+--- 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