From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 729171581B9 for ; Sat, 04 Oct 2025 12:55:21 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 5C9D2340D1F for ; Sat, 04 Oct 2025 12:55:21 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 53BBD11028A; Sat, 04 Oct 2025 12:55:20 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 4ABAD11028A for ; Sat, 04 Oct 2025 12:55:20 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EFE29340D1F for ; Sat, 04 Oct 2025 12:55:19 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6C5343AA3 for ; Sat, 04 Oct 2025 12:55:18 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1759582498.0a80f800dabb5959715fb608e8d5af28afc36154.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-i18n/fcitx/files/, app-i18n/fcitx/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-i18n/fcitx/Manifest app-i18n/fcitx/fcitx-5.1.12.ebuild app-i18n/fcitx/files/fcitx-5.1.12-make-x11-dependencies-optional.patch X-VCS-Directories: app-i18n/fcitx/ app-i18n/fcitx/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 0a80f800dabb5959715fb608e8d5af28afc36154 X-VCS-Branch: master Date: Sat, 04 Oct 2025 12:55:18 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: c005f2bb-b0eb-48fe-9fac-e8a3cc81b799 X-Archives-Hash: 91d35b49620cde577534b2cad884db10 commit: 0a80f800dabb5959715fb608e8d5af28afc36154 Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Oct 2 19:29:45 2025 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Oct 4 12:54:58 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a80f800 app-i18n/fcitx: drop 5.1.12 Signed-off-by: Andreas Sturmlechner 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 deletions(-) diff --git a/app-i18n/fcitx/Manifest b/app-i18n/fcitx/Manifest index 8be8caab4940..f0c3c7255f0e 100644 --- a/app-i18n/fcitx/Manifest +++ b/app-i18n/fcitx/Manifest @@ -1,2 +1 @@ -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 deleted file mode 100644 index 57b1436feb8c..000000000000 --- a/app-i18n/fcitx/fcitx-5.1.12.ebuild +++ /dev/null @@ -1,125 +0,0 @@ -# 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 deleted file mode 100644 index b177316fb7e4..000000000000 --- a/app-i18n/fcitx/files/fcitx-5.1.12-make-x11-dependencies-optional.patch +++ /dev/null @@ -1,24 +0,0 @@ -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 ---- a/src/ui/classic/classicui.cpp -+++ b/src/ui/classic/classicui.cpp -@@ -20,7 +20,6 @@ - #include - #include - #include --#include - #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 - #include "xcb_public.h" - #include "xcbui.h" - #endif