From patchwork Thu Sep 22 04:58:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 42842 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 1538427BBEA; Thu, 22 Sep 2022 06:05:52 +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=-0.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, SPF_HELO_PASS,URIBL_BLOCKED autolearn=no 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 804F427BBE9 for ; Thu, 22 Sep 2022 06:05:51 +0100 (BST) Received: from localhost ([::1]:49458 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1obEPG-0004vc-Kc for patchwork@mira.cbaines.net; Thu, 22 Sep 2022 01:05:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36354) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1obEJh-0002RE-Jx for guix-patches@gnu.org; Thu, 22 Sep 2022 01:00:09 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36724) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1obEJe-0007h8-V7 for guix-patches@gnu.org; Thu, 22 Sep 2022 01:00:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1obEJe-0002ll-Pb for guix-patches@gnu.org; Thu, 22 Sep 2022 01:00:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57997] [PATCH] gnu: emacs-rime: Emit deprecation warning. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 22 Sep 2022 05:00:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 57997 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 57997@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.166382275510546 (code B ref -1); Thu, 22 Sep 2022 05:00:02 +0000 Received: (at submit) by debbugs.gnu.org; 22 Sep 2022 04:59:15 +0000 Received: from localhost ([127.0.0.1]:35802 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1obEIt-0002k2-1e for submit@debbugs.gnu.org; Thu, 22 Sep 2022 00:59:15 -0400 Received: from lists.gnu.org ([209.51.188.17]:35268) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1obEIr-0002jr-91 for submit@debbugs.gnu.org; Thu, 22 Sep 2022 00:59:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44356) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1obEIr-00025N-3G for guix-patches@gnu.org; Thu, 22 Sep 2022 00:59:13 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:44646) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1obEIp-0007ba-Di for guix-patches@gnu.org; Thu, 22 Sep 2022 00:59:12 -0400 Date: Thu, 22 Sep 2022 12:58:38 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1663822749; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KikDlOCX5k7MBLEPym4/e9yG+xIgQsMH/gus0u35h0M=; b=SroMQhCja+EDeL8UK9GDALoejyr3ef5CJIm3cuLneG52DKFDv9Vj+kSYtKMYtK+J8K0dOq MdOh8h1jweFYwGhmsndh6NNCzu5TZAFwwPoi6qQNa4AMPrx3R3bms4LPbksBjqXLhxVdSW Q29Eo2DAXxtRzrZyal2CdPJXvo2B73rVp/G9GrBm5ya5rJKn3sv+0bwkfY2fKT1G3qSEcy f/xn5TZJxPhhPW8iPo3gbVXE75iyNWNgZhUWxjHolqsYhGIftWPrr8VVNMs2ShLeK+Nme3 +U1wkD88cM8ZvJy5LQW25UGEf4H0BK6TVQo2X9EuPn49uNBJ4Ec33udBgshpvQ== Message-ID: MIME-Version: 1.0 Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space X-Spamd-Bar: / Received-SPF: pass client-ip=144.168.59.46; envelope-from=hako@ultrarare.space; helo=mail.boiledscript.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, 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" Reply-to: Hilton Chain X-ACL-Warn: , Hilton Chain via Guix-patches X-Patchwork-Original-From: Hilton Chain via Guix-patches via From: Hilton Chain X-getmail-retrieved-from-mailbox: Patches * gnu/packages/patches/emacs-rime-update-define-minor-mode-usage.patch: New file. * gnu/local.mk (dist_patch_DATA): Add patch. * gnu/packages/emacs-xyz.scm (emacs-rime)[patches]: Add emacs-rime-update-define-minor-mode-usage.patch --- gnu/local.mk | 1 + gnu/packages/emacs-xyz.scm | 6 ++- ...-rime-update-define-minor-mode-usage.patch | 38 +++++++++++++++++++ 3 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/emacs-rime-update-define-minor-mode-usage.patch base-commit: 33d4992b69bfed2ec6b15b7b842599efb1cb1e31 diff --git a/gnu/local.mk b/gnu/local.mk index ef1bae5f3c..82e980a272 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1051,6 +1051,7 @@ dist_patch_DATA = \ %D%/packages/patches/emacs-libgit-use-system-libgit2.patch \ %D%/packages/patches/emacs-lispy-fix-thread-last-test.patch \ %D%/packages/patches/emacs-polymode-fix-lexical-variable-error.patch \ + %D%/packages/patches/emacs-rime-update-define-minor-mode-usage.patch \ %D%/packages/patches/emacs-source-date-epoch.patch \ %D%/packages/patches/emacs-telega-path-placeholder.patch \ %D%/packages/patches/emacs-telega-test-env.patch \ diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 32e4c33f16..5811fb410a 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -29523,7 +29523,11 @@ (define-public emacs-rime (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0z0iwsqr92g8ykxb51gkawwxwzx0faw0027zgdi7c38ngjqld237")))) + (base32 "0z0iwsqr92g8ykxb51gkawwxwzx0faw0027zgdi7c38ngjqld237")) + (patches + (search-patches + ;; NOTE: Cherry-picked from upstream, remove when bumping. + "emacs-rime-update-define-minor-mode-usage.patch")))) (build-system emacs-build-system) (arguments '(#:include (cons "\\.so$" %default-include) diff --git a/gnu/packages/patches/emacs-rime-update-define-minor-mode-usage.patch b/gnu/packages/patches/emacs-rime-update-define-minor-mode-usage.patch new file mode 100644 index 0000000000..4f905ca0bf --- /dev/null +++ b/gnu/packages/patches/emacs-rime-update-define-minor-mode-usage.patch @@ -0,0 +1,38 @@ +From 5c2ade217134f6f20cd405447af20825e5b44513 Mon Sep 17 00:00:00 2001 +From: tianshu +Date: Sat, 11 Dec 2021 02:06:35 +0800 +Subject: [PATCH] update define-minor-mode usage + +--- + rime.el | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/rime.el b/rime.el +index 64a4d70..044ab97 100644 +--- a/rime.el ++++ b/rime.el +@@ -1084,18 +1084,18 @@ Argument NAME ignored." + "Mode used in composition. + + Should not be enabled manually." +- nil +- nil +- nil ++ :lighter nil ++ :init-value nil ++ :keymap nil + (if rime-active-mode + (rime-active-mode--init) + (rime-active-mode--uninit))) + + (define-minor-mode rime-mode + "Mode used when input method is activated." +- nil +- nil +- rime-mode-map) ++ :lighter nil ++ :init-value nil ++ :keymap rime-mode-map) + + ;;;###autoload + (register-input-method "rime" "euc-cn" 'rime-activate rime-title)