From patchwork Thu Oct 19 04:53:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 55018 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 2A9F527BBE9; Thu, 19 Oct 2023 06:54: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.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS 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 DD9EB27BBE2 for ; Thu, 19 Oct 2023 06:54:27 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qtLyU-0003iz-Ft; Thu, 19 Oct 2023 01:53:38 -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 1qtLyT-0003if-8w for guix-patches@gnu.org; Thu, 19 Oct 2023 01:53:37 -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 1qtLyS-0002Nv-U0 for guix-patches@gnu.org; Thu, 19 Oct 2023 01:53:36 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qtLyt-0000vm-7c; Thu, 19 Oct 2023 01:54:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66624] [PATCH emacs-team 05/15] gnu: emacs-mew: Adjust to changes in emacs-build-system. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com, guix-patches@gnu.org Resent-Date: Thu, 19 Oct 2023 05:54:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66624 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66624@debbugs.gnu.org Cc: andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com X-Debbugs-Original-Xcc: andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com Received: via spool by 66624-submit@debbugs.gnu.org id=B66624.16976948243457 (code B ref 66624); Thu, 19 Oct 2023 05:54:03 +0000 Received: (at 66624) by debbugs.gnu.org; 19 Oct 2023 05:53:44 +0000 Received: from localhost ([127.0.0.1]:35491 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qtLyZ-0000tV-BP for submit@debbugs.gnu.org; Thu, 19 Oct 2023 01:53:43 -0400 Received: from mail-lf1-x129.google.com ([2a00:1450:4864:20::129]:45132) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qtLyQ-0000ri-2c for 66624@debbugs.gnu.org; Thu, 19 Oct 2023 01:53:34 -0400 Received: by mail-lf1-x129.google.com with SMTP id 2adb3069b0e04-50797cf5b69so7998062e87.2 for <66624@debbugs.gnu.org>; Wed, 18 Oct 2023 22:53:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697694782; x=1698299582; darn=debbugs.gnu.org; h=to:content-transfer-encoding:mime-version:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=aEuXmLYBEuKvG4rVK/Oyrt1BKl0WhQVy/whlC3NqXiw=; b=RdA+k39oqkKvA1qMB/+rtdfSyN6FSgmLjk+Ejs8AfG4OVlIcPNdeWsdMBMdrT6VfTU TiLupAzpdOHKgTDiD1Vs2yG1KJC/Ze0xKGWnXMwbTgoAFr1oODpb6a8JVF7EjiS+Ec/z VvDvJEUYIYiyZPnbIj68KwHpYCI7shwBxaU/sDm/0A/7f0mRc/tQYHfN5UkhYXkE3+GO +QRND0pMUzJLXwxKBE3PZWtby4q35HAYz/x48FYIE5MciUabjfet1TvBjkop9TDcP1h0 Rnq2GkCIVry+ASx+1Yq8/FPOqnUZTTNAfY+lGDOOpwYj7l43gcT3htOIT730Ilx06Kh9 RN8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697694782; x=1698299582; h=to:content-transfer-encoding:mime-version:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=aEuXmLYBEuKvG4rVK/Oyrt1BKl0WhQVy/whlC3NqXiw=; b=qlJohhyLSv/EZPkcDzz4mcHIJvfSiOJOA5hhSgIK4fb6ZFCUT+xX/OszfCZh5Eu1yu gTKHiavrg2fgm9N8MdOzPKGaRM0p8Pl6Ug/PpFrn3TsQnlBK37Jv+Sr4YjGvUMMFVHsH +LdNEkR+tCXn9c2xcCRYyRGZYcAUH8mJG66FsQa/bZdmKcfNEoYM6V22oNvTIDCM4LQR CANfTCZwvObYuqZcJG0C1Ae8AR0F8naL6WbC7h3xJ7CdKcpF7xyRfLL2FcvzmTO7GszC QXAhUv8lGva7KShBWNK9G8AOQxCLNw2vrK1YuN4b7CkZCV1KMD3BqaMmCF2DTJfeli+O vOhg== X-Gm-Message-State: AOJu0Ywb9SYUVPA4kPq0b008kxEDY56nomVVh2dXWsv6q0fy1YmYp8qe FDQF3n/KQILnFpaVMIvz9RyvA26JLow= X-Google-Smtp-Source: AGHT+IFeNdsaq7UWu2GKnLggV3EACFiLynF6Z8dz0GTaVffdxFQCV/KAwPL0DQeRfDNwpft2i5bFNg== X-Received: by 2002:a05:6512:2253:b0:507:a676:6152 with SMTP id i19-20020a056512225300b00507a6766152mr933923lfu.8.1697694781702; Wed, 18 Oct 2023 22:53:01 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id s22-20020a50ab16000000b0053e589016a7sm3605507edc.16.2023.10.18.22.53.00 for <66624@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Oct 2023 22:53:00 -0700 (PDT) Message-ID: <2d1de384f6a5c83c74e46ea090409952dc1c59c5.1697694142.git.liliana.prikler@gmail.com> In-Reply-To: References: From: Liliana Marie Prikler Date: Thu, 19 Oct 2023 06:53:11 +0200 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/mail.scm (emacs-mew)[arguments]: Only let-bind icon-dir. <#:modules>: Add (guix build emacs-build-system). <#:imported-modules>: Use %emacs-build-system-modules. <#:configure-flags>: Set elispdir with emacs:elpa-directory. <#:phases>: Move ‘generate-autoloads’ after ‘unpack’. Generate the autoloads locally. Also enable compilation. --- gnu/packages/mail.scm | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index be458a2d92..84c7275ef6 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -1165,17 +1165,17 @@ (define-public emacs-mew "0xazygwdc328m5l31rxjazq9giv2xrygp2p2q455lf3jhdxwq1km")))) (build-system gnu-build-system) (arguments - (let ((elisp-dir #~(string-append #$output "/share/emacs/site-lisp")) - (icon-dir #~(string-append #$output "/share/mew"))) + (let ((icon-dir #~(string-append #$output "/share/mew"))) (list #:modules '((guix build gnu-build-system) (guix build utils) + ((guix build emacs-build-system) #:prefix emacs:) (guix build emacs-utils)) - #:imported-modules `(,@%gnu-build-system-modules - (guix build emacs-utils)) + #:imported-modules %emacs-build-system-modules #:tests? #f #:configure-flags - #~(list (string-append "--with-elispdir=" #$elisp-dir) + #~(list (string-append "--with-elispdir=" + (emacs:elpa-directory #$output)) (string-append "--with-etcdir=" #$icon-dir)) #:phases #~(modify-phases %standard-phases @@ -1186,9 +1186,15 @@ (define-public emacs-mew `(progn (add-to-list 'image-load-path 'mew-icon-directory) ,#$icon-dir))))) - (add-after 'install 'generate-autoloads + (add-after 'unpack 'generate-autoloads (lambda _ - (emacs-generate-autoloads "mew" #$elisp-dir))))))) + (emacs-generate-autoloads "mew" "elisp") + (substitute* "elisp/mew-autoloads.el" + ((";; no-byte-compile.*") "")) + ;; Add generated autoloads to Makefile, so they get compiled + (substitute* "elisp/Makefile" + (("OBJS =") "OBJS = mew-autoloads.elc") + (("SRCS =") "SRCS = mew-autoloads.el")))))))) (native-inputs (list emacs)) (propagated-inputs