From patchwork Mon May 3 13:43:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: luhui X-Patchwork-Id: 29079 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 1F55E27BC82; Mon, 3 May 2021 14:45:36 +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 96D6227BC81 for ; Mon, 3 May 2021 14:45:35 +0100 (BST) Received: from localhost ([::1]:44852 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ldYtC-0001dD-No for patchwork@mira.cbaines.net; Mon, 03 May 2021 09:45:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47064) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ldYsg-0001ct-E0 for guix-patches@gnu.org; Mon, 03 May 2021 09:45:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:34945) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ldYsg-0001eM-6G for guix-patches@gnu.org; Mon, 03 May 2021 09:45:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ldYsg-0004aM-4e for guix-patches@gnu.org; Mon, 03 May 2021 09:45:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#48186] [PATCH] gnu: emacs-rime: Adjust to changes in emacs-build-system. Resent-From: luhui Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 03 May 2021 13:45:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 48186 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 48186@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.162004946417594 (code B ref -1); Mon, 03 May 2021 13:45:01 +0000 Received: (at submit) by debbugs.gnu.org; 3 May 2021 13:44:24 +0000 Received: from localhost ([127.0.0.1]:46491 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ldYs1-0004Zi-0q for submit@debbugs.gnu.org; Mon, 03 May 2021 09:44:24 -0400 Received: from lists.gnu.org ([209.51.188.17]:44590) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ldYrk-0004ZX-Tt for submit@debbugs.gnu.org; Mon, 03 May 2021 09:44:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46840) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ldYrk-0000nD-M1 for guix-patches@gnu.org; Mon, 03 May 2021 09:44:04 -0400 Received: from m12-12.163.com ([220.181.12.12]:42992) by eggs.gnu.org with esmtps (TLS1.2:DHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1ldYrf-0000qF-SH for guix-patches@gnu.org; Mon, 03 May 2021 09:44:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=Date:From:Subject:Message-ID:MIME-Version; bh=/1EDe fSNpvTKLDaJ6g+ckN22DJmDIa1JhGck6W4V9GA=; b=AZz+Sy14w3sAEk7+JtKsM NPLzGzlbSB/F7sK7Ims9JZMpNp3uHrr/BraQ2daYHaAHT+OfLwo2krLkhSmdnV8R f0gPmw+t7IgQ0nxirLPwNEW1ww+pe5ZuRM/Prg+yx1Qw1vszAMATl40nnv4nERID HUE3f+xFs4viFi35ceAMkA= Received: from localhost (unknown [110.183.12.194]) by smtp8 (Coremail) with SMTP id DMCowABXjUIQ_o9gp8kYCA--.6159S3; Mon, 03 May 2021 21:43:44 +0800 (CST) Date: Mon, 3 May 2021 21:43:42 +0800 From: luhui Message-ID: MIME-Version: 1.0 Content-Disposition: inline X-CM-TRANSID: DMCowABXjUIQ_o9gp8kYCA--.6159S3 X-Coremail-Antispam: 1Uf129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7v73 VFW2AGmfu7bjvjm3AaLaJ3UbIYCTnIWIevJa73UjIFyTuYvjxU9L0eDUUUU X-Originating-IP: [110.183.12.194] X-CM-SenderInfo: 5oxk3xlqv6il2tof0z/xtbBQhCHDF++Lnwm7AAAsg Received-SPF: pass client-ip=220.181.12.12; envelope-from=luhuins@163.com; helo=m12-12.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, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, 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 Because of the update of emacs-build-system it cannot run correctly, fix it. From 10b339344ac01724a19d8efa137425f4eba83cad Mon Sep 17 00:00:00 2001 From: luhui Date: Mon, 3 May 2021 20:22:43 +0800 Subject: [PATCH] gnu: emacs-rime: Adjust to changes in emacs-build-system. * gnu/packages/emacs-xyz.scm (emacs-rime): [#:phases]: add patch-rime-module-path, change install-emacs-module --- gnu/packages/emacs-xyz.scm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index dbeab25b39..9afe343a14 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 lu hui ;;; ;;; This file is part of GNU Guix. ;;; @@ -25706,6 +25707,13 @@ REPL appropriate to the current major mode.") (arguments '(#:phases (modify-phases %standard-phases + (add-after 'unpack 'patch-rime-module-path + (lambda* (#:key outputs #:allow-other-keys) + (make-file-writable "rime.el") + (emacs-substitute-variables "rime.el" + ("rime--module-path" + (string-append (assoc-ref outputs "out") "/lib/librime-emacs.so"))) + #t)) (add-after 'unpack 'patch-rime-data-path (lambda* (#:key inputs #:allow-other-keys) (make-file-writable "rime.el") @@ -25721,7 +25729,7 @@ REPL appropriate to the current major mode.") (lambda* (#:key outputs #:allow-other-keys) (install-file "librime-emacs.so" (string-append (assoc-ref outputs "out") - "/share/emacs/site-lisp")) + "/lib/")) #t))))) (inputs `(("librime" ,librime)