From patchwork Sun May 29 03:36:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew James Kraai X-Patchwork-Id: 39652 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 841D627BBEB; Sun, 29 May 2022 04:38:29 +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,URIBL_BLOCKED autolearn=ham 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 D87D527BBEA for ; Sun, 29 May 2022 04:38:27 +0100 (BST) Received: from localhost ([::1]:59732 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nv9l3-00056E-Vf for patchwork@mira.cbaines.net; Sat, 28 May 2022 23:38:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44732) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nv9kh-0004zs-3R for guix-patches@gnu.org; Sat, 28 May 2022 23:38:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45294) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nv9kg-0006AG-NG for guix-patches@gnu.org; Sat, 28 May 2022 23:38:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nv9kg-0000O0-EN for guix-patches@gnu.org; Sat, 28 May 2022 23:38:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55695] [PATCH] gnu: emacs-elm-mode: Fix wrong number of arguments. Resent-From: Matthew James Kraai Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 29 May 2022 03:38:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 55695 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 55695@debbugs.gnu.org Cc: Matthew James Kraai X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16537954271414 (code B ref -1); Sun, 29 May 2022 03:38:02 +0000 Received: (at submit) by debbugs.gnu.org; 29 May 2022 03:37:07 +0000 Received: from localhost ([127.0.0.1]:39191 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nv9jm-0000Mk-Rg for submit@debbugs.gnu.org; Sat, 28 May 2022 23:37:07 -0400 Received: from lists.gnu.org ([209.51.188.17]:38974) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nv9jj-0000Mb-6G for submit@debbugs.gnu.org; Sat, 28 May 2022 23:37:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44686) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nv9jj-0004rf-0J for guix-patches@gnu.org; Sat, 28 May 2022 23:37:03 -0400 Received: from mail.ftbfs.org ([52.8.68.13]:36616 helo=aws.ftbfs.org) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nv9jh-000689-9T for guix-patches@gnu.org; Sat, 28 May 2022 23:37:02 -0400 Received: from ip68-228-72-49.oc.oc.cox.net ([68.228.72.49] helo=carlo.lan) by aws.ftbfs.org with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1nv9je-002CFR-0t; Sun, 29 May 2022 03:36:58 +0000 From: Matthew James Kraai Date: Sat, 28 May 2022 20:36:43 -0700 Message-Id: <20220529033643.14249-1-kraai@ftbfs.org> X-Mailer: git-send-email 2.36.1 MIME-Version: 1.0 Received-SPF: pass client-ip=52.8.68.13; envelope-from=kraai@ftbfs.org; helo=aws.ftbfs.org X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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 * gnu/packages/patches/emacs-elm-mode-add-now-mandatory-when-arg-for-obsolete-function-alias.patch: New file. * gnu/packages/patches/emacs-elm-mode-remove-obsolete-turn-on-and-turn-off-functions-for-elm-indent-mode: New file. * gnu/packages/emacs-xyz.scm (emacs-elm-mode)[patches]: Use them here. * gnu/local.mk (dist_patch_DATA): Add them here. --- gnu/local.mk | 2 ++ gnu/packages/emacs-xyz.scm | 6 +++- ...when-arg-for-obsolete-function-alias.patch | 25 +++++++++++++++ ...rn-off-functions-for-elm-indent-mode.patch | 31 +++++++++++++++++++ 4 files changed, 63 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/emacs-elm-mode-add-now-mandatory-when-arg-for-obsolete-function-alias.patch create mode 100644 gnu/packages/patches/emacs-elm-mode-remove-obsolete-turn-on-and-turn-off-functions-for-elm-indent-mode.patch This is an alternative to #55675, backporting just the patches that are necessary to fix the build. diff --git a/gnu/local.mk b/gnu/local.mk index bc82c5ba9f..eb087c5c46 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1024,6 +1024,8 @@ dist_patch_DATA = \ %D%/packages/patches/elm-reactor-static-files.patch \ %D%/packages/patches/elogind-revert-polkit-detection.patch \ %D%/packages/patches/emacs-deferred-fix-number-of-arguments.patch \ + %D%/packages/patches/emacs-elm-mode-add-now-mandatory-when-arg-for-obsolete-function-alias.patch \ + %D%/packages/patches/emacs-elm-mode-remove-obsolete-turn-on-and-turn-off-functions-for-elm-indent-mode.patch \ %D%/packages/patches/emacs-exec-path.patch \ %D%/packages/patches/emacs-ess-fix-obsolete-function-alias.patch \ %D%/packages/patches/emacs-git-email-missing-parens.patch \ diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 31822dc641..9b71b4cd61 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -19710,7 +19710,11 @@ (define-public emacs-elm-mode (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0iwk4fmw8hq3ry4ky1zc7lgl4cpbnrjyk74c2xzddfspi3ks41fd")))) + (base32 "0iwk4fmw8hq3ry4ky1zc7lgl4cpbnrjyk74c2xzddfspi3ks41fd")) + (patches + (search-patches + "emacs-elm-mode-add-now-mandatory-when-arg-for-obsolete-function-alias.patch" + "emacs-elm-mode-remove-obsolete-turn-on-and-turn-off-functions-for-elm-indent-mode.patch")))) (propagated-inputs (list emacs-dash emacs-f emacs-reformatter emacs-s)) (build-system emacs-build-system) diff --git a/gnu/packages/patches/emacs-elm-mode-add-now-mandatory-when-arg-for-obsolete-function-alias.patch b/gnu/packages/patches/emacs-elm-mode-add-now-mandatory-when-arg-for-obsolete-function-alias.patch new file mode 100644 index 0000000000..0734dc7b48 --- /dev/null +++ b/gnu/packages/patches/emacs-elm-mode-add-now-mandatory-when-arg-for-obsolete-function-alias.patch @@ -0,0 +1,25 @@ +From 714a3cebb3fe7e82a294d046d7fa7978e9ca8945 Mon Sep 17 00:00:00 2001 +From: Steve Purcell +Date: Wed, 6 Jan 2021 15:28:10 +1300 +Subject: [PATCH] Add now-mandatory "when" arg for obsolete function alias + +--- + elm-indent.el | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/elm-indent.el b/elm-indent.el +index 1527434..17fab78 100644 +--- a/elm-indent.el ++++ b/elm-indent.el +@@ -1200,7 +1200,7 @@ TYPE is either 'guard or 'rhs." + (define-key map [?\C-c ?\C-=] 'elm-indent-insert-equal) + map)) + +-(define-obsolete-variable-alias 'elm-indent-map 'elm-indent-mode-map) ++(define-obsolete-variable-alias 'elm-indent-map 'elm-indent-mode-map "2017-10-29") + + ;;;###autoload + (define-minor-mode elm-indent-mode +-- +2.36.1 + diff --git a/gnu/packages/patches/emacs-elm-mode-remove-obsolete-turn-on-and-turn-off-functions-for-elm-indent-mode.patch b/gnu/packages/patches/emacs-elm-mode-remove-obsolete-turn-on-and-turn-off-functions-for-elm-indent-mode.patch new file mode 100644 index 0000000000..f1a4f49152 --- /dev/null +++ b/gnu/packages/patches/emacs-elm-mode-remove-obsolete-turn-on-and-turn-off-functions-for-elm-indent-mode.patch @@ -0,0 +1,31 @@ +From 688d20b7cd0220af334d618608d8dfb0df250c69 Mon Sep 17 00:00:00 2001 +From: Steve Purcell +Date: Sun, 5 Apr 2020 15:22:40 +1200 +Subject: [PATCH] Remove obsolete turn-on- and turn-off- functions for + elm-indent-mode + +--- + elm-indent.el | 7 ------- + 1 file changed, 7 deletions(-) + +diff --git a/elm-indent.el b/elm-indent.el +index a1a2a1c..8ffcd9f 100644 +--- a/elm-indent.el ++++ b/elm-indent.el +@@ -1233,13 +1233,6 @@ Invokes `elm-indent-hook' if not nil." + (kill-local-variable 'indent-line-function) + (kill-local-variable 'indent-region-function))) + +-;;;###autoload +-(define-obsolete-function-alias 'turn-on-elm-indent 'elm-indent-mode) +- +-(defun turn-off-elm-indent () +- "Turn off ``intelligent'' Elm indentation mode." +- (elm-indent-mode nil)) +- + + (provide 'elm-indent) + ;;; elm-indent.el ends here +-- +2.36.1 +