From patchwork Sun Apr 28 06:52:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zheng Junjie X-Patchwork-Id: 63526 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id B5B3927BBE9; Sun, 28 Apr 2024 07:52:59 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 3D2EE27BBE2 for ; Sun, 28 Apr 2024 07:52:58 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s0yP2-0007lp-LS; Sun, 28 Apr 2024 02:52:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1s0yP0-0007j1-QJ for guix-patches@gnu.org; Sun, 28 Apr 2024 02:52:47 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1s0yP0-0003rC-Hb for guix-patches@gnu.org; Sun, 28 Apr 2024 02:52:46 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1s0yPG-00023p-Ef; Sun, 28 Apr 2024 02:53:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70623] [PATCH 1/2] gnu: fcitx5-configtool: Enable kcm support. Resent-From: Zheng Junjie Original-Sender: "Debbugs-submit" Resent-CC: all_but_last@163.com, iyzsong@envs.net, guix-patches@gnu.org Resent-Date: Sun, 28 Apr 2024 06:53:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70623 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70623@debbugs.gnu.org Cc: Zhu Zihao , =?utf-8?b?5a6L5paH5q2m?= X-Debbugs-Original-Xcc: Zhu Zihao , =?utf-8?b?5a6L5paH?= =?utf-8?b?5q2m?= Received: via spool by 70623-submit@debbugs.gnu.org id=B70623.17142871707891 (code B ref 70623); Sun, 28 Apr 2024 06:53:02 +0000 Received: (at 70623) by debbugs.gnu.org; 28 Apr 2024 06:52:50 +0000 Received: from localhost ([127.0.0.1]:50006 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s0yP3-00023D-R1 for submit@debbugs.gnu.org; Sun, 28 Apr 2024 02:52:50 -0400 Received: from smtp84.cstnet.cn ([159.226.251.84]:58026 helo=cstnet.cn) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s0yP0-000236-Px for 70623@debbugs.gnu.org; Sun, 28 Apr 2024 02:52:48 -0400 Received: from m.tailaa68d.ts.net (unknown [183.247.5.170]) by APP-05 (Coremail) with SMTP id zQCowACnr+ci8i1m0LLJBg--.49099S2; Sun, 28 Apr 2024 14:52:18 +0800 (CST) From: Zheng Junjie Date: Sun, 28 Apr 2024 14:52:16 +0800 Message-ID: <2f305ea7199e12069d41d9094e62b2fddc4818ab.1714286584.git.zhengjunjie@iscas.ac.cn> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-CM-TRANSID: zQCowACnr+ci8i1m0LLJBg--.49099S2 X-Coremail-Antispam: 1UD129KBjvJXoW7Ar4UuFy7GryxCFWktFWrXwb_yoW8WryfpF sayr429w48GF98Crs0qF1UCr43u397Aw45Aw42yw47Kr43K348u3y3tFW5trnrCw18uw17 uFyrKF45G390gFDanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUyab7Iv0xC_tr1lb4IE77IF4wAFF20E14v26r1j6r4UM7CY07I2 0VC2zVCF04k26cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28lY4IEw2IIxxk0rw A2F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Gr0_Xr1l84ACjcxK6xII jxv20xvEc7CjxVAFwI0_Gr0_Cr1l84ACjcxK6I8E87Iv67AKxVW8Jr0_Cr1UM28EF7xvwV C2z280aVCY1x0267AKxVWxJr0_GcWle2I262IYc4CY6c8Ij28IcVAaY2xG8wAqx4xG64xv F2IEw4CE5I8CrVC2j2WlYx0E2Ix0cI8IcVAFwI0_JrI_JrylYx0Ex4A2jsIE14v26r1j6r 4UMcvjeVCFs4IE7xkEbVWUJVW8JwACjcxG0xvY0x0EwIxGrwCF04k20xvY0x0EwIxGrwCF x2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v26r1j6r18MI8I3I0E7480Y4vE14 v26r106r1rMI8E67AF67kF1VAFwI0_Jr0_JrylIxkGc2Ij64vIr41lIxAIcVC0I7IYx2IY 67AKxVWUJVWUCwCI42IY6xIIjxv20xvEc7CjxVAFwI0_Jr0_Gr1lIxAIcVCF04k26cxKx2 IYs7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r1j6r4UMIIF0xvEx4A2jsIEc7CjxVAFwI0_ Jr0_GrUvcSsGvfC2KfnxnUUI43ZEXa7IU8c6pPUUUUU== X-Originating-IP: [183.247.5.170] X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/ X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/fcitx5.scm (fcitx5-configtool) [arguments]: Remove it. [inputs]: Add qtdeclarative, qtquickcontrols2, ki18n, kpackage, kdeclarative, kiconthemes, kcoreaddons, plasma-framework, kwindowsystem, kirigami, libxkbcommon. Change-Id: I43a43458232a5ad3c1d156c779359e356cbf98b8 --- gnu/packages/fcitx5.scm | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/gnu/packages/fcitx5.scm b/gnu/packages/fcitx5.scm index 435ccde45f..6e2f922c37 100644 --- a/gnu/packages/fcitx5.scm +++ b/gnu/packages/fcitx5.scm @@ -439,17 +439,24 @@ (define-public fcitx5-configtool (sha256 (base32 "1pnwrj6kgha91djfvd2439nbhrmjargpw8ashhb91y5h3cdz7vhz")))) (build-system cmake-build-system) - (arguments - `(#:configure-flags - ;; KDE is currently not working on Guix, KCM supports doesn't make sense. - '("-DENABLE_KCM=Off"))) (inputs `(("fcitx5" ,fcitx5) ("fcitx5-qt" ,fcitx5-qt) ("qtbase" ,qtbase-5) ("qtx11extras" ,qtx11extras) + ("qtdeclarative" ,qtdeclarative-5) + ("qtquickcontrols2" ,qtquickcontrols2-5) + ("ki18n" ,ki18n) + ("kpackage" ,kpackage) + ("kdeclarative" ,kdeclarative) + ("kiconthemes" ,kiconthemes) + ("kcoreaddons" ,kcoreaddons) + ("plasma-framework" ,plasma-framework) ("kitemviews" ,kitemviews) ("kwidgetsaddons" ,kwidgetsaddons) + ("kwindowsystem" ,kwindowsystem) + ("kirigami" ,kirigami) + ("libxkbcommon" ,libxkbcommon) ("libx11" ,libx11) ("xkeyboard-config" ,xkeyboard-config) ("libxkbfile" ,libxkbfile) From patchwork Sun Apr 28 06:52:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zheng Junjie X-Patchwork-Id: 63527 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 6663D27BBE9; Sun, 28 Apr 2024 07:53:08 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 9F57E27BBE2 for ; Sun, 28 Apr 2024 07:53:06 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s0yP2-0007jY-5h; Sun, 28 Apr 2024 02:52:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1s0yOy-0007hx-Mf for guix-patches@gnu.org; Sun, 28 Apr 2024 02:52:44 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1s0yOy-0003r5-78 for guix-patches@gnu.org; Sun, 28 Apr 2024 02:52:44 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1s0yPG-00023v-Rx; Sun, 28 Apr 2024 02:53:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70623] [PATCH 2/2] gnu: fcitx5-configtool: Remove inputs label. Resent-From: Zheng Junjie Original-Sender: "Debbugs-submit" Resent-CC: all_but_last@163.com, iyzsong@envs.net, guix-patches@gnu.org Resent-Date: Sun, 28 Apr 2024 06:53:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70623 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70623@debbugs.gnu.org Cc: Zhu Zihao , =?utf-8?b?5a6L5paH5q2m?= X-Debbugs-Original-Xcc: Zhu Zihao , =?utf-8?b?5a6L5paH?= =?utf-8?b?5q2m?= Received: via spool by 70623-submit@debbugs.gnu.org id=B70623.17142871717903 (code B ref 70623); Sun, 28 Apr 2024 06:53:02 +0000 Received: (at 70623) by debbugs.gnu.org; 28 Apr 2024 06:52:51 +0000 Received: from localhost ([127.0.0.1]:50008 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s0yP5-00023P-2s for submit@debbugs.gnu.org; Sun, 28 Apr 2024 02:52:51 -0400 Received: from smtp84.cstnet.cn ([159.226.251.84]:58028 helo=cstnet.cn) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s0yP1-000235-9O for 70623@debbugs.gnu.org; Sun, 28 Apr 2024 02:52:50 -0400 Received: from m.tailaa68d.ts.net (unknown [183.247.5.170]) by APP-05 (Coremail) with SMTP id zQCowACnr+ci8i1m0LLJBg--.49099S3; Sun, 28 Apr 2024 14:52:18 +0800 (CST) From: Zheng Junjie Date: Sun, 28 Apr 2024 14:52:17 +0800 Message-ID: <7ede98be440f471b85683dfdf004c75409eeffc2.1714286584.git.zhengjunjie@iscas.ac.cn> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-CM-TRANSID: zQCowACnr+ci8i1m0LLJBg--.49099S3 X-Coremail-Antispam: 1UD129KBjvJXoW7Ar4UtF4fXF1fWF1xXw15CFg_yoW8Cry5pF savr1agr48WF93CrsIqF1UCr4a9392yay3Aw47Aw1xKw4Ykry8Z3y3Jr45GF17G3s7Ww47 XFy5KF48W3yqgFDanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUU9Yb7Iv0xC_Zr1lb4IE77IF4wAFF20E14v26r1j6r4UM7CY07I2 0VC2zVCF04k26cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28IrcIa0xkI8VA2jI 8067AKxVWUGwA2048vs2IY020Ec7CjxVAFwI0_Jr4l8cAvFVAK0II2c7xJM28CjxkF64kE wVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVW8JVW5JwA2z4x0Y4vE2Ix0cI8IcVCY1x 0267AKxVW8JVWxJwA2z4x0Y4vEx4A2jsIE14v26r4UJVWxJr1l84ACjcxK6I8E87Iv6xkF 7I0E14v26F4UJVW0owAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFcxC0VAKzVAqx4 xG6I80ewAv7VC0I7IYx2IY67AKxVWUGVWUXwAv7VC2z280aVAFwI0_Jr0_Gr1lOx8S6xCa FVCjc4AY6r1j6r4UM4x0Y48IcxkI7VAKI48JMxAIw28IcxkI7VAKI48JMxC20s026xCaFV Cjc4AY6r1j6r4UMI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWl x4CE17CEb7AF67AKxVWUJVWUXwCIc40Y0x0EwIxGrwCI42IY6xIIjxv20xvE14v26r1j6r 1xMIIF0xvE2Ix0cI8IcVCY1x0267AKxVWUJVW8JwCI42IY6xAIw20EY4v20xvaj40_Jr0_ JF4lIxAIcVC2z280aVAFwI0_Jr0_Gr1lIxAIcVC2z280aVCY1x0267AKxVWUJVW8JbIYCT nIWIevJa73UjIFyTuYvjxU2_MaUUUUU X-Originating-IP: [183.247.5.170] X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/ X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/fcitx5.scm (fcitx5-configtool) [inputs]: Remove label. Change-Id: Ib45fbf71d5f2ffbac3285e388629b6cf0ca004fe --- gnu/packages/fcitx5.scm | 44 ++++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/gnu/packages/fcitx5.scm b/gnu/packages/fcitx5.scm index 6e2f922c37..aba0be21e7 100644 --- a/gnu/packages/fcitx5.scm +++ b/gnu/packages/fcitx5.scm @@ -440,28 +440,28 @@ (define-public fcitx5-configtool (base32 "1pnwrj6kgha91djfvd2439nbhrmjargpw8ashhb91y5h3cdz7vhz")))) (build-system cmake-build-system) (inputs - `(("fcitx5" ,fcitx5) - ("fcitx5-qt" ,fcitx5-qt) - ("qtbase" ,qtbase-5) - ("qtx11extras" ,qtx11extras) - ("qtdeclarative" ,qtdeclarative-5) - ("qtquickcontrols2" ,qtquickcontrols2-5) - ("ki18n" ,ki18n) - ("kpackage" ,kpackage) - ("kdeclarative" ,kdeclarative) - ("kiconthemes" ,kiconthemes) - ("kcoreaddons" ,kcoreaddons) - ("plasma-framework" ,plasma-framework) - ("kitemviews" ,kitemviews) - ("kwidgetsaddons" ,kwidgetsaddons) - ("kwindowsystem" ,kwindowsystem) - ("kirigami" ,kirigami) - ("libxkbcommon" ,libxkbcommon) - ("libx11" ,libx11) - ("xkeyboard-config" ,xkeyboard-config) - ("libxkbfile" ,libxkbfile) - ("gettext" ,gettext-minimal) - ("iso-codes" ,iso-codes))) + (list fcitx5 + fcitx5-qt + qtbase-5 + qtx11extras + qtdeclarative-5 + qtquickcontrols2-5 + ki18n + kpackage + kdeclarative + kiconthemes + kcoreaddons + plasma-framework + kitemviews + kwidgetsaddons + kwindowsystem + kirigami + libxkbcommon + libx11 + xkeyboard-config + libxkbfile + gettext-minimal + iso-codes)) (native-inputs (list extra-cmake-modules pkg-config)) (home-page "https://github.com/fcitx/fcitx5-configtool")