From patchwork Tue May 11 16:16:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Z572 <873216071@qq.com> X-Patchwork-Id: 29250 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 D714527BC82; Tue, 11 May 2021 17:22:11 +0100 (BST) 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 9615927BC81 for ; Tue, 11 May 2021 17:22:11 +0100 (BST) Received: from localhost ([::1]:37326 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lgV98-0007qg-NR for patchwork@mira.cbaines.net; Tue, 11 May 2021 12:22:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44460) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lgV58-0000GG-Jp for guix-patches@gnu.org; Tue, 11 May 2021 12:18:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:53881) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lgV58-00048J-C5 for guix-patches@gnu.org; Tue, 11 May 2021 12:18:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lgV58-0003Cx-68 for guix-patches@gnu.org; Tue, 11 May 2021 12:18:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#48186] [PATCH] gnu: emacs-rime: Adjust to changes in emacs-build-system. Resent-From: Z572 <873216071@qq.com> Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 11 May 2021 16:18:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 48186 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: luhui Cc: 48186@debbugs.gnu.org Received: via spool by 48186-submit@debbugs.gnu.org id=B48186.162074982812265 (code B ref 48186); Tue, 11 May 2021 16:18:02 +0000 Received: (at 48186) by debbugs.gnu.org; 11 May 2021 16:17:08 +0000 Received: from localhost ([127.0.0.1]:37193 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lgV4G-0003Bl-2l for submit@debbugs.gnu.org; Tue, 11 May 2021 12:17:08 -0400 Received: from out162-62-57-64.mail.qq.com ([162.62.57.64]:56027 helo=qq.com) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <873216071@qq.com>) id 1lgV46-0003Ay-Ql for 48186@debbugs.gnu.org; Tue, 11 May 2021 12:17:07 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qq.com; s=s201512; t=1620749809; bh=8FHYgCxVsZJt+h1UsmUHppbQIhrpZAxzhRvgPSE/v00=; h=From:To:Subject:References:CC:Date:In-Reply-To; b=QIxoDoecQ4vdYH9IZhAY7+bLJ+60cc8PfdLPKrEZ3rIVTRXxnbxUpvxi6TrdNZzpw tVDQ8sf8Af3ucW8FzAw1GEnR2j3mKHQx9MmAjSwgHKxnCDTp2d7bfFTY/Z5JEb/zGc q2p0ZcQEb1EKJnK+rjmSCUlHoyIDexDxMab94uhg= Received: from Z572 ([2409:8928:1208:1bc7:6d99:7eff:acb3:17a2]) by newxmesmtplogicsvrszc7.qq.com (NewEsmtp) with SMTP id 42E1B6DB; Wed, 12 May 2021 00:16:46 +0800 X-QQ-mid: xmsmtpt1620749806t7amiigww Message-ID: X-QQ-XMAILINFO: OWsOIDILzqv2uRh6U9a9Z2o+gGf40N6U4xjoRdmPpRH+FAvBx0ab3wxFM2cub0 LJHMDOCjQ5Zg49NmHmWupUrG+pI65N3rA41VwPyLO7Ts/h3GerA3OxJm4ra6x1+19zYP9xvJHuLD qTUpVUtJcasF/pcObnuLew0z16JNRTM/yvD6VRuU5+d3GxYSW4NiXVnwSc06ybgbjYjheeb918V1 BqkuLVvvdRU0QqSTc2zjaTvmA1jIg+x3oPB78YwSm5oCTLaaN0J8jXqL6FwgkKpK6aw9nNJYoTRS PMN9+9Uv9ATKmBwxWlDZ6oiL0eozFzG+OxHzBxHQaURLvud1p9qcqHHz5uNRWlNjzRmZ7h3ATakb OcFmSFF8De2PirdCmZ7oy7lqtSbQoaHS36sORml3DWEiZ+gOqMD0p8n0GhUXOjrHp8eJaDTu1YW8 OgKH8dvIyIuevWSvhojxaZKp08PpFlAfOP+r161nCLA8m9jnDvWxK4a4HpoNK1fPcra2JsEYcbAJ 6lgeeAvJrvOtIUqDFqdcwshf5vBIH00sFIlnlxmKQUYrTo4Y94HufH5iHV9QjusY7sQGdQnpsC7c qHma8qIXJClD9jxBHaODB7f8s4nq/exP0kR+ELDdfr2gNOkp/r95A/pmh4pFYDko9HjKNZXWLJCq wFkPUfGHcXBXLhPOoR4sorpnTosc31/qwob70ZzpsAHpWMpxiaSe2OyWS1c9NL/BhGJZJsvb3qBp eMJzpxIJI2j3+hF09qUkVSEYBwN6gb0NUqywA2mow3yXaj1aapuJjJvEVvkpx2+d1SNOe6KaAp1g qo2Qug3oQvCTIvflA7ENyWlihcYPKPqLf7vQ+blAhmxvAYsqR9zHMf/J/X1lRX/u/fitEAyvAwHA == From: Z572 <873216071@qq.com> References: Date: Wed, 12 May 2021 00:16:45 +0800 In-Reply-To: (luhui's message of "Mon, 3 May 2021 21:43:42 +0800") Message-ID: <87k0o51c0i.fsf@qq.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (gnu/linux) MIME-Version: 1.0 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 I think #:include is better. From 3e4c22f82ad038e89de866198dccc7e793d185b6 Mon Sep 17 00:00:00 2001 From: Zheng junjie <873216071@qq.com> Date: Tue, 11 May 2021 23:44:44 +0800 Subject: [PATCH] gnu: emacs-rime: Adjust to changes in emacs-build-system. * gnu/packages/emacs-xyz.scm (emacs-rime):[arguments]: Use #:include rather than #:phases to add librime-emacs.so. --- gnu/packages/emacs-xyz.scm | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index fc4c03965e..ff90c6bd3a 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -97,6 +97,7 @@ ;;; Copyright © 2021 Stefan Reichör ;;; Copyright © 2021 Simon Tournier ;;; Copyright © 2021 Eugene Klimov +;;; Copyright © 2021 Zheng Junjie <873216071@qq.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -25720,7 +25721,8 @@ REPL appropriate to the current major mode.") (base32 "1a50cziwg7lpgh26yvwxs46jfyfq1m0l6igbg5g5m288mz4d3an9")))) (build-system emacs-build-system) (arguments - '(#:phases + '(#:include (cons "\\.so$" %default-include) + #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-rime-data-path (lambda* (#:key inputs #:allow-other-keys) @@ -25732,13 +25734,7 @@ REPL appropriate to the current major mode.") #t)) (add-before 'install 'build-emacs-module (lambda _ - (invoke "make" "lib"))) - (add-after 'install 'install-emacs-module - (lambda* (#:key outputs #:allow-other-keys) - (install-file "librime-emacs.so" - (string-append (assoc-ref outputs "out") - "/share/emacs/site-lisp")) - #t))))) + (invoke "make" "lib")))))) (inputs `(("librime" ,librime) ("rime-data" ,rime-data))) -- 2.31.1