From patchwork Mon Jul 8 18:23:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 29054 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 DC67127BBE2; Mon, 8 Jul 2024 19:24:22 +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 5AEC527BBE9 for ; Mon, 8 Jul 2024 19:24:21 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sQt1r-0005Xw-HD; Mon, 08 Jul 2024 14:23:59 -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 1sQt1p-0005W7-Nj for guix-patches@gnu.org; Mon, 08 Jul 2024 14:23:57 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sQt1p-0000SW-CA for guix-patches@gnu.org; Mon, 08 Jul 2024 14:23:57 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sQt1t-0004AF-Vu for guix-patches@gnu.org; Mon, 08 Jul 2024 14:24:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71989] [PATCH 1/2] gnu: guile-emacs: Remove variable. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 08 Jul 2024 18:24:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71989 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Ada Stevenson Cc: Katherine Cox-Buday , 71989@debbugs.gnu.org, Liliana Marie Prikler , Andrew Tropin Received: via spool by 71989-submit@debbugs.gnu.org id=B71989.172046303315991 (code B ref 71989); Mon, 08 Jul 2024 18:24:01 +0000 Received: (at 71989) by debbugs.gnu.org; 8 Jul 2024 18:23:53 +0000 Received: from localhost ([127.0.0.1]:51476 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sQt1l-00049r-1u for submit@debbugs.gnu.org; Mon, 08 Jul 2024 14:23:53 -0400 Received: from eggs.gnu.org ([209.51.188.92]:55740) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sQt1i-00049d-3O for 71989@debbugs.gnu.org; Mon, 08 Jul 2024 14:23:52 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sQt1V-0000MD-NF; Mon, 08 Jul 2024 14:23:38 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=avns+bZ3arGjsmYjyIMdLC0n+SSTp2JFiO+CbgVKgzM=; b=GW4d9jxFKaK/vRd70c7b EVS3PmL+8dYbN6CUStilSHxZdo7f5WtaxRlEyisES84kZAq17SW47s+uPAPcKlwMpptHU3e6SGfv7 yJQsO1HMh7ChWReFf4uoU0QtHJWnaQNM2DuHdFthI9+TqnzAPM160HrpfoYP6EhKhlQwMUUvRSv3j 6JJm3uq+PYuVDMEFPeLyhN25pLwXSkRsJDb6HoHcHz/YAOwnxwVcCdP4itPa85B9PnUMQ3X9Kw1bb z0G6JO87ZR1PjGW2rrvnZxpgWehUtjIMnFOo6UNULpFnfJLPCOlVdfaLZJK2iEpOshAt3PJxOFgoH FZaLH4LagB7hdg==; From: Janneke Nieuwenhuizen In-Reply-To: (Ada Stevenson's message of "Mon, 8 Jul 2024 15:40:08 +0800") Organization: AvatarAcademy.nl References: X-Url: http://AvatarAcademy.nl Date: Mon, 08 Jul 2024 20:23:30 +0200 Message-ID: <8734ojivz1.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) 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 Ada Stevenson writes: Hi! > This package appears to be unmaintained, and the website that was > hosting its git repository is no longer active. So...using the attached patch, the guile-emacs build reaches --8<---------------cut here---------------start------------->8--- prerocessing OKURI-ARI entries ... Processing POSTFIX entries ... Processing PREFIX entries ... Collecting OKURI-NASI entries ... collected 26% ... collected 30% ... collected 40% ... --8<---------------cut here---------------end--------------->8--- running --8<---------------cut here---------------start------------->8--- guixbui+ 11628 11626 99 19:15 ? 02:12:52 ../src/emacs -batch --no-site-file --no-site-lisp -batch -l ja-dic-cnv -f batch-skkdic-convert -dir ./../lisp/leim/ja-dic SKK-DIC/SKK-JISYO.L --8<---------------cut here---------------end--------------->8--- without apparent progress for hours (at 200% CPU)... So yeah, unless someone wants to take this up, prolly best to remove it :'-( Janneke From ff0603076b23010834573d922566dea978f75c64 Mon Sep 17 00:00:00 2001 Message-ID: From: Janneke Nieuwenhuizen Date: Mon, 8 Jul 2024 08:42:22 +0200 Subject: [PATCH] gnu: guile-emacs: Update to 0.0.0-0.8bc3ef5 and resurrect build. Change-Id: I7a671f0e43885bce16bab9af4a87d8577c6a31c7 * gnu/packages/emacs.scm (guile-emacs): Update to 8bc3ef5f21fd83216349fba54e3ba13ebd73828c. [phases]: Add `allow-PATCH-PROGRAM-FILE-NAMES-to-succeed' phase. Change-Id: Ia15983923e9a6c98f033c17ac59555a83a1e5721 --- gnu/packages/emacs.scm | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 6557180139..ba301e8f86 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -12,7 +12,7 @@ ;;; Copyright © 2017, 2019, 2020, 2023, 2024 Maxim Cournoyer ;;; Copyright © 2017 Alex Vong ;;; Copyright © 2017, 2018 Ricardo Wurmus -;;; Copyright © 2017, 2023 Janneke Nieuwenhuizen +;;; Copyright © 2017, 2023, 2024 Janneke Nieuwenhuizen ;;; Copyright © 2018, 2023 Efraim Flashner ;;; Copyright © 2018 Mathieu Othacehe ;;; Copyright © 2018, 2019, 2021 Tobias Geerinckx-Rice @@ -607,7 +607,7 @@ (define-public emacs-next-tree-sitter (deprecated-package "emacs-next-tree-sitter" emacs-next)) (define-public guile-emacs - (let ((commit "41120e0f595b16387eebfbf731fff70481de1b4b") + (let ((commit "8bc3ef5f21fd83216349fba54e3ba13ebd73828c") (revision "0")) (package (inherit emacs) @@ -622,7 +622,7 @@ (define-public guile-emacs (patches (search-patches "guile-emacs-fix-configure.patch")) (sha256 (base32 - "0lvcvsz0f4mawj04db35p1dvkffdqkz8pkhc0jzh9j9x2i63kcz6")))) + "1fi9gldsd2m5k6gd9q32iw1sdlb2w9kqc1jlyipvz5mc20rwq284")))) (native-inputs (modify-inputs (package-native-inputs emacs) (prepend autoconf automake guile-for-guile-emacs))) @@ -643,6 +643,17 @@ (define-public guile-emacs (add-before 'build 'make-deps-dir (lambda _ (invoke "mkdir" "-p" "src/deps"))) + (add-after 'unpack 'allow-PATCH-PROGRAM-FILE-NAMES-to-succeed + ;;Instead of copying most of `patch-program-file-names', + ;;touch missing files. + (lambda _ + (define (touch file-name) + (with-output-to-file file-name + (lambda _ (display "")))) + (for-each touch '("lisp/gnus/gnus-search.el" + "lisp/obsolete/nnir.el" + "lisp/org/ob-sed.el")))) + (delete 'patch-compilation-driver) (delete 'restore-emacs-pdmp) (delete 'strip-double-wrap)))))))) base-commit: 6eb19661c5202fdc2e6b27bb078ba4e528f3b984 -- 2.45.1