From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1896C158013 for ; Mon, 11 Dec 2023 13:33:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 85D822BC040; Mon, 11 Dec 2023 13:33:51 +0000 (UTC) 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 pigeon.gentoo.org (Postfix) with ESMTPS id 6A94E2BC040 for ; Mon, 11 Dec 2023 13:33:51 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 78BAB33D3CF for ; Mon, 11 Dec 2023 13:33:50 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1838A14B5 for ; Mon, 11 Dec 2023 13:33:49 +0000 (UTC) From: "Yixun Lan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Yixun Lan" Message-ID: <1702301605.539fe1546164fc2cf0e6bfae2e19e6cd727783f4.dlan@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-i18n/fcitx/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-i18n/fcitx/fcitx-4.2.9.8.ebuild app-i18n/fcitx/fcitx-4.9999.ebuild app-i18n/fcitx/fcitx-5.1.5.ebuild X-VCS-Directories: app-i18n/fcitx/ X-VCS-Committer: dlan X-VCS-Committer-Name: Yixun Lan X-VCS-Revision: 539fe1546164fc2cf0e6bfae2e19e6cd727783f4 X-VCS-Branch: master Date: Mon, 11 Dec 2023 13:33:49 +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: 05e69352-805c-4c5b-9c87-45b184575992 X-Archives-Hash: a0d5da64088c73850348ad2032fc3b80 commit: 539fe1546164fc2cf0e6bfae2e19e6cd727783f4 Author: Yongxiang Liang gmail com> AuthorDate: Thu Nov 30 16:42:29 2023 +0000 Commit: Yixun Lan gentoo org> CommitDate: Mon Dec 11 13:33:25 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=539fe154 app-i18n/fcitx: block fcitx:4 and fcitx:5 each other If we want to install both fcitx4 and fcitx5 at the same time, we just need to adjust the location of one of the icon files. But consider that fcitx4 and fcitx5 are registered in the same im module. For example, their XMODIFIERS variables are both "@im=fcitx". Running them at the same time is undefined behavior. Bug: https://bugs.gentoo.org/760501 Signed-off-by: Yongxiang Liang gmail.com> Signed-off-by: Yixun Lan gentoo.org> app-i18n/fcitx/fcitx-4.2.9.8.ebuild | 5 +++-- app-i18n/fcitx/fcitx-4.9999.ebuild | 5 +++-- app-i18n/fcitx/fcitx-5.1.5.ebuild | 1 + 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/app-i18n/fcitx/fcitx-4.2.9.8.ebuild b/app-i18n/fcitx/fcitx-4.2.9.8.ebuild index 066e06f5c894..2dd9ab5f65a6 100644 --- a/app-i18n/fcitx/fcitx-4.2.9.8.ebuild +++ b/app-i18n/fcitx/fcitx-4.2.9.8.ebuild @@ -1,4 +1,4 @@ -# Copyright 2003-2022 Gentoo Authors +# Copyright 2003-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -39,7 +39,8 @@ BDEPEND="dev-util/glib-utils virtual/pkgconfig introspection? ( dev-libs/gobject-introspection ) nls? ( sys-devel/gettext )" -DEPEND="dev-libs/glib:2 +DEPEND="!app-i18n/fcitx:5 + dev-libs/glib:2 sys-apps/dbus sys-apps/util-linux virtual/libiconv diff --git a/app-i18n/fcitx/fcitx-4.9999.ebuild b/app-i18n/fcitx/fcitx-4.9999.ebuild index 93c53f5e7164..57d117c67567 100644 --- a/app-i18n/fcitx/fcitx-4.9999.ebuild +++ b/app-i18n/fcitx/fcitx-4.9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 2003-2022 Gentoo Authors +# Copyright 2003-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -39,7 +39,8 @@ BDEPEND="dev-util/glib-utils virtual/pkgconfig introspection? ( dev-libs/gobject-introspection ) nls? ( sys-devel/gettext )" -DEPEND="dev-libs/glib:2 +DEPEND="!app-i18n/fcitx:5 + dev-libs/glib:2 sys-apps/dbus sys-apps/util-linux virtual/libiconv diff --git a/app-i18n/fcitx/fcitx-5.1.5.ebuild b/app-i18n/fcitx/fcitx-5.1.5.ebuild index db0daa3828d7..6b204f822625 100644 --- a/app-i18n/fcitx/fcitx-5.1.5.ebuild +++ b/app-i18n/fcitx/fcitx-5.1.5.ebuild @@ -23,6 +23,7 @@ REQUIRED_USE=" RESTRICT="!test? ( test )" RDEPEND=" + !app-i18n/fcitx:4 dev-libs/libfmt sys-devel/gettext virtual/libintl