From patchwork Sun Jun 18 23:02:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mekeor Melire X-Patchwork-Id: 51068 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 1F0F427BBE9; Mon, 19 Jun 2023 00:14:27 +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.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable 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 1F68727BBE2 for ; Mon, 19 Jun 2023 00:14:24 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qB1au-0005na-3Q; Sun, 18 Jun 2023 19:14:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qB1as-0005nK-Hr for guix-patches@gnu.org; Sun, 18 Jun 2023 19:14:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qB1as-0007Cj-4O for guix-patches@gnu.org; Sun, 18 Jun 2023 19:14:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qB1ar-00020e-Kr for guix-patches@gnu.org; Sun, 18 Jun 2023 19:14:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63987] [PATCH v2] gnu: Add emacs-jinx. References: <88d5ddf1b26b5f4c23601780aa29158e46a6cbfe.1686354110.git.mekeor@posteo.de> In-Reply-To: <88d5ddf1b26b5f4c23601780aa29158e46a6cbfe.1686354110.git.mekeor@posteo.de> Resent-From: Mekeor Melire Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 18 Jun 2023 23:14:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63987 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63987@debbugs.gnu.org Received: via spool by 63987-submit@debbugs.gnu.org id=B63987.16871300077666 (code B ref 63987); Sun, 18 Jun 2023 23:14:01 +0000 Received: (at 63987) by debbugs.gnu.org; 18 Jun 2023 23:13:27 +0000 Received: from localhost ([127.0.0.1]:55221 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qB1aI-0001zZ-Sa for submit@debbugs.gnu.org; Sun, 18 Jun 2023 19:13:27 -0400 Received: from mout02.posteo.de ([185.67.36.66]:39311) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qB1aF-0001zI-T8 for 63987@debbugs.gnu.org; Sun, 18 Jun 2023 19:13:26 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 824C9240101 for <63987@debbugs.gnu.org>; Mon, 19 Jun 2023 01:13:17 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.de; s=2017; t=1687129997; bh=mqtmfug6i0FjqULcohGAFPy1+BLAl2IuZkWPC++fMtU=; h=From:To:Subject:Date:Message-ID:MIME-Version:From; b=BiFqej30XqPMGha8j1linovVzWt6UxP9VAFbLROyAf9kciNykQR/9J5Dba8eemKd8 864f9D2OfA2ubfF4tSdT15huWkmViu8iG8ymYGIBBsPIewRPzWPb+DgXrL621AYdVH QEBG8e6n8em2aYlYOEwlylW1ZRyMpkQh2TmXGgDUd7AxY2eca39LnubvwmTIWh4SS9 C6QRfG+sD5a9RkQuETrbnzRVtXszS/WFcWmNTqro+CEo67XItKp11cfW2/yls/9UYI HH08i17EFOh8rd5FXTUnYxuuuEzcC7uQPgg0FXEy2cj07VpZxOsEsymDj750hgXHBM e4sGkJd1BwurQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Qkpbc4sh1z6tx8; Mon, 19 Jun 2023 01:13:16 +0200 (CEST) From: Mekeor Melire Date: Sun, 18 Jun 2023 23:02:04 +0000 Message-ID: <87zg4w5pvi.fsf@posteo.de> 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/emacs-xyz.scm (emacs-jinx): New variable. --- Some (but not all) changes in this patch version: 1. The patch still installs jinx-mod.so into $output/lib. 2. The patch does not import (gnu packages commencement) anymore. 3. The patch does not use (let ((commit ...) (revision ...)) ...) anymore. 4. The patch now adds emacs-jinx right before emacs-jit-spell. 5. The patch now splits phases of installation and build of documentation and jinx-mod. 6. The patch now uses a more concise package description. gnu/packages/emacs-xyz.scm | 60 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) +folding, if any.") + (license license:gpl3+))) + (define-public emacs-jit-spell (package (name "emacs-jit-spell") -- 2.39.2 diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 24a4ae169e..574fd4cfca 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -177,6 +177,7 @@ (define-module (gnu packages emacs-xyz) #:use-module (gnu packages djvu) #:use-module (gnu packages ebook) #:use-module (gnu packages emacs) + #:use-module (gnu packages enchant) #:use-module (gnu packages fonts) #:use-module (gnu packages freedesktop) #:use-module (gnu packages games) @@ -10010,6 +10011,65 @@ (define-public emacs-jinja2-mode sgml/html integration, and indentation (working with sgml).") (license license:gpl3+))) +(define-public emacs-jinx + (package + (name "emacs-jinx") + (version "0.8") + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/minad/jinx") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1y097rnf9zg26jf4vh74a0laddfp4x6pp1fjqs3xqgwc0cmdq59w")))) + (build-system emacs-build-system) + (propagated-inputs (list emacs-compat)) + (native-inputs (list emacs-compat enchant pkg-config texinfo)) + (inputs (list enchant)) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-before 'install 'build-jinx-mod + (lambda* _ + (invoke + "emacs" "--batch" "-L" "." + "-l" "jinx.el" + "-f" "jinx--load-module"))) + (add-before 'install 'patch-path-to-jinx-mod + (lambda _ + (let ((file "jinx.el")) + (make-file-writable file) + (emacs-substitute-sexps file + ("\"Compile and load dynamic module.\"" + `(module-load + ,(string-append #$output "/lib/jinx-mod.so"))))))) + (add-before 'install 'build-info + (lambda _ + (invoke "emacs" "--batch" + "--eval=(require 'ox-texinfo)" + "--eval=(find-file \"README.org\")" + "--eval=(org-texinfo-export-to-info)"))) + (add-after 'install 'install-jinx-mod + (lambda _ + (install-file "jinx-mod.so" + (string-append #$output "/lib")))) + (add-after 'install 'install-info + (lambda _ + (install-file "jinx.info" + (string-append #$output "/share/info"))))))) + (home-page "https://github.com/minad/jinx") + (synopsis "Emacs Enchanted Spell Checker") + (description "Jinx is a just-in-time spell-checker for Emacs based on the +Enchant library. It lazily highlights misspelled words in the text of the +visible portion of the buffer by honouring window boundaries as well as text