From patchwork Tue Dec 8 13:51:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhu Zihao X-Patchwork-Id: 25653 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 82FD527BC01; Tue, 8 Dec 2020 13:55:02 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id DC00027BC02 for ; Tue, 8 Dec 2020 13:55:00 +0000 (GMT) Received: from localhost ([::1]:49222 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kmdSG-0002LE-0U for patchwork@mira.cbaines.net; Tue, 08 Dec 2020 08:55:00 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46492) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kmdPO-0000eC-35 for guix-patches@gnu.org; Tue, 08 Dec 2020 08:52:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:45381) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kmdPN-0003Qj-SP for guix-patches@gnu.org; Tue, 08 Dec 2020 08:52:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kmdPN-0005lF-Rp for guix-patches@gnu.org; Tue, 08 Dec 2020 08:52:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45120] [PATCH]: Remove stale build steps for Fcitx5 components Resent-From: Zhu Zihao Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 08 Dec 2020 13:52:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 45120 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 45120@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.160743550922125 (code B ref -1); Tue, 08 Dec 2020 13:52:01 +0000 Received: (at submit) by debbugs.gnu.org; 8 Dec 2020 13:51:49 +0000 Received: from localhost ([127.0.0.1]:56927 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kmdPA-0005kn-Sw for submit@debbugs.gnu.org; Tue, 08 Dec 2020 08:51:49 -0500 Received: from lists.gnu.org ([209.51.188.17]:38770) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kmdP9-0005ke-Bd for submit@debbugs.gnu.org; Tue, 08 Dec 2020 08:51:48 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46454) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kmdP6-0000Kr-Rh for guix-patches@gnu.org; Tue, 08 Dec 2020 08:51:45 -0500 Received: from mail-m975.mail.163.com ([123.126.97.5]:48264) by eggs.gnu.org with esmtps (TLS1.2:DHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kmdOx-00038i-LL for guix-patches@gnu.org; Tue, 08 Dec 2020 08:51:42 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-ID:MIME-Version; bh=MLEP1 2xjkqKvrLP1cJBEjjS0q+jJfSr/Gir1aJGxW8s=; b=hlZUJa7IVZ5+SrAKBgWKJ 8vcbxZZlBPBR2m605J2uK8FZDjUIJLbgPjlEOmIl4EV617vVhx5ix1a2Gr9b/+yL /gyU0riEtqvknjf6HozXy9Sv1nAfmE0Nr08TPjE56EKHGgDyAKUOq4QeIQd5L2tW Rl9oOSnI4lKNBSwwFHPJK0= Received: from asus-laptop (unknown [112.93.142.78]) by smtp5 (Coremail) with SMTP id HdxpCgCHpirQhM9fF22pEA--.2093S2; Tue, 08 Dec 2020 21:51:12 +0800 (CST) User-agent: mu4e 1.4.13; emacs 27.1 From: Zhu Zihao Date: Tue, 08 Dec 2020 21:51:05 +0800 Message-ID: <86wnxsflti.fsf@163.com> MIME-Version: 1.0 X-CM-TRANSID: HdxpCgCHpirQhM9fF22pEA--.2093S2 X-Coremail-Antispam: 1Uf129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7v73 VFW2AGmfu7bjvjm3AaLaJ3UbIYCTnIWIevJa73UjIFyTuYvjxUI_MaUUUUU X-Originating-IP: [112.93.142.78] X-CM-SenderInfo: pdoosuxxwbztlvw6il2tof0z/1tbiTxL0r1sGW20Q4gAAsf Received-SPF: pass client-ip=123.126.97.5; envelope-from=all_but_last@163.com; helo=mail-m975.mail.163.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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" X-getmail-retrieved-from-mailbox: Patches These are the patches should be merge in http://debbugs.gnu.org/cgi/bugreport.cgi?bug=44920 but missed. From 1b54678aade98dc47ef4071ae5525699ff29ab2b Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Tue, 8 Dec 2020 21:45:56 +0800 Subject: [PATCH 2/2] gnu: fcitx5-chinese-addons: Remove stale build steps. * gnu/packages/fcitx5.scm(fcitx5-chinese-addons)[arguments] : Remove it. : Remove phase 'patch-install-prefix'. --- gnu/packages/fcitx5.scm | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/gnu/packages/fcitx5.scm b/gnu/packages/fcitx5.scm index 68ff7cf5cd..7c10f97440 100644 --- a/gnu/packages/fcitx5.scm +++ b/gnu/packages/fcitx5.scm @@ -293,23 +293,8 @@ for Qt based application.") (base32 "0mf91gzwzhfci0jn6g3l516xjw8r4v40ginnbl70h1zx6vr24rfp")))) (build-system cmake-build-system) (arguments - `(#:configure-flags - (list - (string-append "-DFEM_INCLUDE_INSTALL_DIR=" %output "/include") - (string-append "-DFEM_LIB_INSTALL_DIR=" %output "/lib")) - #:phases + `(#:phases (modify-phases %standard-phases - (add-before 'configure 'patch-install-prefix - (lambda* (#:key outputs #:allow-other-keys) - (for-each - (lambda (x) - (format #t "patch-install-prefix: Fixing install prefix in ~a~%" - x) - (substitute* x - (("\\$\\{FCITX_INSTALL_PKGDATADIR\\}") - (string-append (assoc-ref outputs "out") - "/share/fcitx5")))) - (find-files "." "CMakeLists\\.txt$")))) (add-before 'configure 'split-outputs ;; Build with GUI supports requires Qt and increase package closure ;; by 800M on x86_64, so place it under another output. -- 2.29.2