From debbugs-submit-bounces@debbugs.gnu.org Thu Oct 19 01:50:43 2023 Received: (at submit) by debbugs.gnu.org; 19 Oct 2023 05:50:43 +0000 Received: from localhost ([127.0.0.1]:35459 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qtLve-0000mw-P1 for submit@debbugs.gnu.org; Thu, 19 Oct 2023 01:50:43 -0400 Received: from lists.gnu.org ([2001:470:142::17]:43674) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qtLvZ-0000ma-1p for submit@debbugs.gnu.org; Thu, 19 Oct 2023 01:50:41 -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 1qtLv3-0003GS-8M for guix-patches@gnu.org; Thu, 19 Oct 2023 01:50:05 -0400 Received: from mail-ej1-x641.google.com ([2a00:1450:4864:20::641]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qtLuz-0001fX-Po for guix-patches@gnu.org; Thu, 19 Oct 2023 01:50:03 -0400 Received: by mail-ej1-x641.google.com with SMTP id a640c23a62f3a-9a58dbd5daeso1220091166b.2 for ; Wed, 18 Oct 2023 22:50:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697694599; x=1698299399; darn=gnu.org; h=to:content-transfer-encoding:mime-version:subject:date:from :message-id:from:to:cc:subject:date:message-id:reply-to; bh=efS9Bv5eqOY2XuIfWN9GnWAhmue1AYou3D6Qr2fFo7s=; b=QIZFDP0OJkut+y5izG9ChlNHE8nT744QGea05eV7yrplIlzWwhGFUPsfKvwbHVkp/c Cx9B2cdtWzo2JESNUAzZUvQXoTGr00TTyxsPs/1ibDfVO428l+AoYcqCOgS6UP2PzFyf HDD/tvFo1Zq3vuyl+Jv4s2Il6+QGR7v//Vc1ooOLzQ5oHZrXEDCVtD55j//MpFQW8fnk VN0MLB14j8Ew1NTxmDUiqiTUxyPwSjqor4vSRoaMw48t/PlYRudhooawDVTgj8d9UtoN KNB4lz1OgbewRnveVXi6qabkqvG/WItRlK/fSYy9qL9Z0DJfAYZtuMoGOWpRPMDjzIkV tdVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697694599; x=1698299399; h=to:content-transfer-encoding:mime-version:subject:date:from :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=efS9Bv5eqOY2XuIfWN9GnWAhmue1AYou3D6Qr2fFo7s=; b=oJeoHon+3qDqepaa9POzkOsPZo41atDCNfgNqZk+RNFBgGOn32uRuLNJ6tVRTD+KHs 5s+Ic7twOkUpQBoMI0TwrMel3tPfkcrF5E6IathiOIGGpLbbS/3GacaIKVN/QD6b5Ex6 oo36e5QLGXTo7RibZvE/GLMtCZ91UQcTuWIFSy/odK0xfWkjvrndTWmYSDF1hCn+TwBb eS5MOdwrWS2razXfjRAv/9ROGW23xUG3FjkMrxwVAidQknapOVqERvw2pZorKG/TaBDc m6XjDJyZk2sTtk3hwNnfV06orzh0+0rcAcnfOtr1nSnS41YJkXfKAXv0HZ8MA64zLYKQ bJRw== X-Gm-Message-State: AOJu0Yy+OK7dnGWAHYbNLP9WyEjP2bjwso04MfIOOEfA81kqGDilkS07 qij8RxXpjqZSRRfo/Sa1nPFu1NRyyMvcyA== X-Google-Smtp-Source: AGHT+IF9i5pI7e66MA7tN6yCOPEF75Cm0IsMxpJX6PJ4oxDkAHKQbU2mGKfUIYTd1sFePC7xIdMu7A== X-Received: by 2002:a17:907:320d:b0:9c3:70d5:dc57 with SMTP id xg13-20020a170907320d00b009c370d5dc57mr944006ejb.40.1697694599257; Wed, 18 Oct 2023 22:49:59 -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 hy24-20020a1709068a7800b009a1c05bd672sm2789594ejc.127.2023.10.18.22.49.57 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Oct 2023 22:49:58 -0700 (PDT) Message-ID: From: Liliana Marie Prikler Date: Thu, 19 Oct 2023 07:42:22 +0200 Subject: [PATCH emacs-team 00/15] Start reworking emacs-build-system MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Debbugs-Cc: andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com to: guix-patches@gnu.org Received-SPF: pass client-ip=2a00:1450:4864:20::641; envelope-from=liliana.prikler@gmail.com; helo=mail-ej1-x641.google.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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) Hi Guix, this has been on my back-burner for some while, but since we failed to do Emacs build system changes during the 29 update, let's keep up the struggle and refactor what we have. This series makes it so that the build tree reflects what is actually going to be installed. I've updated most non-emacs-build-system packages to follow suit, but a few very outdated ones are also in the mix. I didn't touch those; whoever needs them will have to take a look. Anyhow, with this series the only strange thing about emacs-build-system is the check → install → build cycle rather than the reverse. I don't think it'll be possible to move build before install, though, so that's that. Cheers Liliana Marie Prikler (15): guix: emacs-build-system: Process package source in build tree. gnu: skktools: Build autoloads before installing them. gnu: translate-shell: Build autoloads before installing them. gnu: translate-shell: Compile emacs bytecode. gnu: emacs-mew: Adjust to changes in emacs-build-system. gnu: crm114: Adjust to changes in emacs-build-system. gnu: guile-wisp: Build autoloads before installing them. gnu: uim: Keep Emacs files in subdirectory. gnu: emacs-geiser-guile: Process autoloads in-tree. gnu: emacs-geiser-gauche: Process autoloads in-tree. gnu: emacs-geiser-racket: Process autoloads in-tree. gnu: emacs-geiser-chez: Process autoloads in-tree. gnu: emacs-libgit: Adjust to changes in emacs-build-system. gnu: emacs-eweouz: Build autoloads before installing them. gnu: emacs-pdf-tools: Build autoloads before installing them. gnu/packages/dictionaries.scm | 8 +-- gnu/packages/emacs-xyz.scm | 33 +++++------- gnu/packages/guile-xyz.scm | 6 +-- gnu/packages/language.scm | 6 +-- gnu/packages/mail.scm | 30 ++++++----- gnu/packages/xorg.scm | 13 +---- guix/build/emacs-build-system.scm | 85 +++++++++++++------------------ 7 files changed, 75 insertions(+), 106 deletions(-) base-commit: 8d6b3dd0b863ccada887da8cd347727dd04cb456 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Oct 19 01:53:32 2023 Received: (at 66624) by debbugs.gnu.org; 19 Oct 2023 05:53:33 +0000 Received: from localhost ([127.0.0.1]:35473 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qtLyO-0000s4-BR for submit@debbugs.gnu.org; Thu, 19 Oct 2023 01:53:32 -0400 Received: from mail-ed1-x541.google.com ([2a00:1450:4864:20::541]:58780) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qtLyL-0000ra-PD for 66624@debbugs.gnu.org; Thu, 19 Oct 2023 01:53:30 -0400 Received: by mail-ed1-x541.google.com with SMTP id 4fb4d7f45d1cf-53f9af41444so263635a12.1 for <66624@debbugs.gnu.org>; Wed, 18 Oct 2023 22:53:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697694777; x=1698299577; darn=debbugs.gnu.org; h=mime-version:to:subject:date:from:references:in-reply-to:message-id :from:to:cc:subject:date:message-id:reply-to; bh=69c2V3RnTf25qd4I7MfyaW6muQgnLDJZkvWsa0n+taU=; b=law77mn5mqv8X4AsN4MkSyYeATHNWhU88SMW7JtRhZ7fpmrKDf64nTPz1AkolqnWZs vxZmnXN63mOwMZ+zINNTU8Z49ruQZCKPXq7GUYecR7Z5VOmsNFeOhcfmChW/DORF2+ag mgPycddUGRlVrVHxRZ8rJYCyBej1HhmIc5xof1RHEDyOlfe0aUmJ0VwQLek8OtNdGuqV D3IaKZlNJPnLeq42EPCcMfmnTUSi2D7wKUdPHB43c9xkkt/vZjcfwTVV10r/8Gk44e9V rktICHBX1BaO7CKPiGJ7GDQCqwkNJvsHFuIEsUjJfZ2ZVHejbdCQX8MOA7fKxJx826pm ncWA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697694777; x=1698299577; h=mime-version:to:subject:date:from:references:in-reply-to:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=69c2V3RnTf25qd4I7MfyaW6muQgnLDJZkvWsa0n+taU=; b=ebO9Z0Ch9L90+HVzvfiNrnlKwXH8PL8VX7K+38qFLNESJ9sPJ6tIrWO/NYlZizCL8N CRH7XdcgTYXZN5DF6WO8Dosy0ei8dljBetRYahi5IU88PzZ1bJbrbjpXVRNtXn2nA57x kPYILqfpwpPKm82jfObUPe86qspRx0Nk9JZHb2NiIQNsbm9EmKWGQBYdUOIRy7PiuS/O qcmQQojNMLv4Zk45rGM8A5Ioen9KXpF4G6IcWbUuuGWe869UVTVsISdXu3pSLgqDdLeu JFWJ32xyJqY4Lr8zwZ5NDMouNbu3dBOC9MMaXKFOwXwFZ3MQCmC6jSYqnp+c+aBdMqhV MHCA== X-Gm-Message-State: AOJu0Yy5r9WWINdfG2F72JoHaTyP5WSIbXDCqnQZ87+7rHi046M3NimT yyaENUw90rEklwDcqyUNpGMJA0DL0VLyAA== X-Google-Smtp-Source: AGHT+IHXXbOHceUHML/eR0FC9DXwtMFYGBOnTch463wKJje+4R7HWiSz2sxrMCMjUUoV45m1ioErsA== X-Received: by 2002:a50:cc83:0:b0:53e:7d91:611f with SMTP id q3-20020a50cc83000000b0053e7d91611fmr714186edi.11.1697694777189; Wed, 18 Oct 2023 22:52:57 -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.52.56 for <66624@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Oct 2023 22:52:56 -0700 (PDT) Message-ID: In-Reply-To: References: From: Liliana Marie Prikler Date: Thu, 19 Oct 2023 06:06:48 +0200 Subject: [PATCH emacs-team 01/15] guix: emacs-build-system: Process package source in build tree. X-Debbugs-Cc: andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com to: 66624@debbugs.gnu.org MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 66624 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * guix/build/emacs-build-system.scm (ensure-package-description) (patch-el-files, make-autoloads): Operate on the current working directory, either implicitly, or through (getcwd). (enable-autoloads-compilation): Deleted variable, logic moved into make-autoloads. (%standard-phases): Adjust accordingly. --- guix/build/emacs-build-system.scm | 85 +++++++++++++------------------ 1 file changed, 34 insertions(+), 51 deletions(-) diff --git a/guix/build/emacs-build-system.scm b/guix/build/emacs-build-system.scm index 3808b60445..aa083c6409 100644 --- a/guix/build/emacs-build-system.scm +++ b/guix/build/emacs-build-system.scm @@ -132,29 +132,25 @@ (define* (build #:key outputs inputs #:allow-other-keys) (parameterize ((%emacs emacs)) (emacs-compile-directory (elpa-directory out))))) -(define* (patch-el-files #:key outputs #:allow-other-keys) - "Substitute the absolute \"/bin/\" directory with the right location in the -store in '.el' files." - - (let* ((out (assoc-ref outputs "out")) - (elpa-name-ver (store-directory->elpa-name-version out)) - (el-dir (string-append out %install-dir "/" elpa-name-ver)) - (el-files (find-files (getcwd) "\\.el$"))) - (define (substitute-program-names) - (substitute* el-files - (("\"/bin/([^.]\\S*)\"" _ cmd-name) - (let ((cmd (which cmd-name))) - (unless cmd - (error "patch-el-files: unable to locate " cmd-name)) - (string-append "\"" cmd "\""))))) - - (with-directory-excursion el-dir - ;; Some old '.el' files (e.g., tex-buf.el in AUCTeX) are still - ;; ISO-8859-1-encoded. - (unless (false-if-exception (substitute-program-names)) - (with-fluids ((%default-port-encoding "ISO-8859-1")) - (substitute-program-names)))) - #t)) +(define* (patch-el-files #:key inputs outputs #:allow-other-keys) + "Substitute the absolute \"/bin/\" and \"/sbin\" directories with the right +locations in the store in '.el' files." + + (define substitute-program-names + (let ((el-files (find-files (getcwd) "\\.el$"))) + (lambda () + (substitute* el-files + (("\"/(s?bin/[^.]\\S*)\"" _ cmd) + (let ((cmd (search-input-file inputs cmd))) + (unless cmd + (error "patch-el-files: unable to locate " (basename cmd))) + (string-append "\"" cmd "\""))))))) + + (unless (false-if-exception (substitute-program-names)) + ;; Some old '.el' files (e.g., tex-buf.el in AUCTeX) are still + ;; ISO-8859-1-encoded. + (with-fluids ((%default-port-encoding "ISO-8859-1")) + (substitute-program-names)))) (define (find-root-library-file name) (let loop ((parts (string-split @@ -224,10 +220,8 @@ (define* (ensure-package-description #:key outputs #:allow-other-keys) (emacs-batch-edit-file (string-append name ".el") %write-pkg-file-form))) - (let* ((out (assoc-ref outputs "out")) - (elpa-name-ver (store-directory->elpa-name-version out))) - (with-directory-excursion (elpa-directory out) - (and=> (find-root-library-file elpa-name-ver) write-pkg-file)))) + (let ((name (store-directory->elpa-name-version (assoc-ref outputs "out")))) + (and=> (find-root-library-file name) write-pkg-file))) (define* (check #:key tests? (test-command '("make" "check")) (parallel-tests? #t) #:allow-other-keys) @@ -306,24 +300,15 @@ (define* (move-doc #:key outputs #:allow-other-keys) info-files))) #t)) -(define* (make-autoloads #:key outputs inputs #:allow-other-keys) +(define* (make-autoloads #:key outputs #:allow-other-keys) "Generate the autoloads file." - (let* ((emacs (search-input-file inputs "/bin/emacs")) - (out (assoc-ref outputs "out")) - (elpa-name-ver (store-directory->elpa-name-version out)) - (elpa-name (package-name->name+version elpa-name-ver)) - (el-dir (elpa-directory out))) - (parameterize ((%emacs emacs)) - (emacs-generate-autoloads elpa-name el-dir)))) - -(define* (enable-autoloads-compilation #:key outputs #:allow-other-keys) - "Remove the NO-BYTE-COMPILATION local variable embedded in the generated -autoload files." - (let* ((out (assoc-ref outputs "out")) - (autoloads (find-files out "-autoloads.el$"))) - (substitute* autoloads - ((";; no-byte-compile.*") "")) - #t)) + (emacs-generate-autoloads + (package-name->name+version (store-directory->elpa-name-version + (assoc-ref outputs "out"))) + (getcwd)) + ;; Ensure that autoloads can be byte-compiled. + (substitute* (find-files "." "-autoloads\\.el$") + ((";; no-byte-compile.*") ""))) (define* (validate-compiled-autoloads #:key outputs #:allow-other-keys) "Verify whether the byte compiled autoloads load fine." @@ -358,7 +343,11 @@ (define (elpa-directory store-dir) (define %standard-phases (modify-phases gnu:%standard-phases (replace 'unpack unpack) + (add-after 'unpack 'ensure-package-description + ensure-package-description) (add-after 'unpack 'expand-load-path expand-load-path) + (add-after 'unpack 'patch-el-files patch-el-files) + (add-after 'expand-load-path 'make-autoloads make-autoloads) (add-after 'expand-load-path 'add-install-to-native-load-path add-install-to-native-load-path) (delete 'bootstrap) @@ -366,14 +355,8 @@ (define %standard-phases (delete 'build) (replace 'check check) (replace 'install install) - (add-after 'install 'make-autoloads make-autoloads) - (add-after 'make-autoloads 'enable-autoloads-compilation - enable-autoloads-compilation) - (add-after 'enable-autoloads-compilation 'patch-el-files patch-el-files) - (add-after 'patch-el-files 'ensure-package-description - ensure-package-description) ;; The .el files are byte compiled directly in the store. - (add-after 'ensure-package-description 'build build) + (add-after 'install 'build build) (add-after 'build 'validate-compiled-autoloads validate-compiled-autoloads) (add-after 'validate-compiled-autoloads 'move-doc move-doc))) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Oct 19 01:53:33 2023 Received: (at 66624) by debbugs.gnu.org; 19 Oct 2023 05:53:33 +0000 Received: from localhost ([127.0.0.1]:35476 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qtLyO-0000s6-UZ for submit@debbugs.gnu.org; Thu, 19 Oct 2023 01:53:33 -0400 Received: from mail-lf1-x130.google.com ([2a00:1450:4864:20::130]:55382) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qtLyM-0000rc-QU for 66624@debbugs.gnu.org; Thu, 19 Oct 2023 01:53:31 -0400 Received: by mail-lf1-x130.google.com with SMTP id 2adb3069b0e04-507a0907896so7193953e87.2 for <66624@debbugs.gnu.org>; Wed, 18 Oct 2023 22:53:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697694778; x=1698299578; 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=pdkp+naKJNxdqtQg6nW47Z8XpV2sZgvWttTK9PokS/g=; b=kLE1W07NwbT2Ziz/faXiNGUVsKehQ4ZhEVxw8bS1MaJCrD7eGt1C9vcq0l3l+JrXOB rkBNjgfn6rSFOWG++K1XT6APQJYhQer7BjBqHQfYA9Nv+bE/s1t9ts6r2cn/Cgfy7Is9 XI2ElJdG4DSJ6zIrvgX/yNL2ukjPgRLRvLYguDWeL686qJGFcTbnLlj1vddDUYImE21o a3VNgumiTrhD9huLd1iezlu6/pNctaxPo4kKt0OUUV10HlVpbewVlN0I42Wju26O2rlL tjcmfMbLOltnYfE7PDlAmS6aceMr8cvxmiAQACoYvK0vEuq1teN5HcgKUAcki6sDEo3u 3mag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697694778; x=1698299578; 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=pdkp+naKJNxdqtQg6nW47Z8XpV2sZgvWttTK9PokS/g=; b=hGDj6wnuf+9hqGYSub8pzuF4pS9IAsYXez3BhAiFSvOFsofyODW/boDJDMHBLg73Rl wnhLUrnTc8pgIrc35Ebmf0V6qYQYRLduhg/o6I/ByHmJRoELeic2K6vuLjEyHhK4MzGD oul32q1HX9inAQR0604ctVR6KCYshQu4GC+xscLGodJL2N1HVVy7oOqoDB+pBlq2Prku 7NuovMFl/aCEVygB9EzdXe7x22Xne5Iyw8QwMtOzfl5zgXUAeA38c9hejdUr5OQqx8xD 2Q8fZxrwh1kyI2EL2TkBaABAx4Xc7N1Pjc6waN4wmavE6kMuzKZ/1SttS7OSV1l+0v17 h5cA== X-Gm-Message-State: AOJu0YwvI4HHN8U848ku39c1COSrUmrwkKX6AxRqm6xVVKEG3/rprCcm GEzalT3UnnTR57e78PXACriM5vKH06k= X-Google-Smtp-Source: AGHT+IGSAgCaXtX0ligxB9VMi7njUB1b7T6Cinn9rf13KxJZefWykCM/KcbMAg5+URvmVJ+PK9mQ7w== X-Received: by 2002:a05:6512:200c:b0:503:446:c7b0 with SMTP id a12-20020a056512200c00b005030446c7b0mr669912lfb.32.1697694778288; Wed, 18 Oct 2023 22:52:58 -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.52.57 for <66624@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Oct 2023 22:52:57 -0700 (PDT) Message-ID: In-Reply-To: References: From: Liliana Marie Prikler Date: Thu, 19 Oct 2023 06:14:30 +0200 Subject: [PATCH emacs-team 02/15] gnu: skktools: Build autoloads before installing them. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Debbugs-Cc: andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com to: 66624@debbugs.gnu.org X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 66624 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/language.scm (skktools)[#:phases]: Move ‘make-autoloads’ after ‘unpack’. --- gnu/packages/language.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/language.scm b/gnu/packages/language.scm index faf3114b84..275b1da422 100644 --- a/gnu/packages/language.scm +++ b/gnu/packages/language.scm @@ -1003,15 +1003,15 @@ (define-public skktools "convert2skk/skk2list") (find-files "filters" "\\.rb$")))))) ;; Install and make autoloads for skk-xml.el. + (add-after 'unpack 'make-autoloads + (assoc-ref emacs:%standard-phases + 'make-autoloads)) (add-after 'install 'install-emacs-files (assoc-ref emacs:%standard-phases 'install)) (add-after 'install-emacs-files 'compile-emacs-files (assoc-ref emacs:%standard-phases 'build)) - (add-after 'compile-emacs-files 'make-autoloads - (assoc-ref emacs:%standard-phases - 'make-autoloads)) (add-after 'install 'install-docs (lambda* (#:key outputs #:allow-other-keys) (let ((doc (string-append (assoc-ref outputs "out") -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Oct 19 01:53:34 2023 Received: (at 66624) by debbugs.gnu.org; 19 Oct 2023 05:53:34 +0000 Received: from localhost ([127.0.0.1]:35479 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qtLyQ-0000sT-9k for submit@debbugs.gnu.org; Thu, 19 Oct 2023 01:53:34 -0400 Received: from mail-ed1-x541.google.com ([2a00:1450:4864:20::541]:56828) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qtLyN-0000re-Tm for 66624@debbugs.gnu.org; Thu, 19 Oct 2023 01:53:32 -0400 Received: by mail-ed1-x541.google.com with SMTP id 4fb4d7f45d1cf-5230a22cfd1so13062273a12.1 for <66624@debbugs.gnu.org>; Wed, 18 Oct 2023 22:53:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697694780; x=1698299580; 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=VP/RuBqlBRm4unDcNF3ByTOQChq00jAAbAczvfxAPfs=; b=erag3IoR4cZ0FfsMScd+b9MD0JeQmyIcIK9CxQH06U88uPV2KJQ86qEis2qXsCm1uR A7vtgC7i45qlpqVYjVyELRvPvwWHFnO/01W5RQgFgP2Bma3i9l+gVbkNGCffTyZgceX0 lOfA2ZoEIlcjcE4/QlybZTBuFWG/rBNSZr/xnHZBpuOxQ84FJOut1BMEAX7fUlrSPBsB Ez/MY1O2C66BMe5nZrNzdP+LTBS/qLnDMJtYvaZoOXmvCraD/0pYvyvYHYiYUrZF4G39 URmNg3mihZKS/lT3xngwkyzfS3PV+PIc/3gTLkQnvSURIdEls5J0eLpqATFfdCzgIbb2 lT2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697694780; x=1698299580; 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=VP/RuBqlBRm4unDcNF3ByTOQChq00jAAbAczvfxAPfs=; b=gr0mCuE9S5lEkYZZ7oYG52bPKyqS+0eCD6Z3YYp/Ci2RlZLOuJ0VKBO1FrlCec3/qd dvzZBz2Xl90IQ8sjU2t3Fj2IXN3pCsWX9GvSBN+cH5oTHPzW7vIkAvRqUxtpeCOIWp/b ShbPc7H54ZAuiLTk/DFdD/MYT8zno2P5ON6IKkKr3f7hGR2AQPddmnWALqYnkPVntrA0 w3Kr1NFrgmJKV88iaef9jb9glRrJrqnIYlbHnwA3IHrP5+zgk6ZT5dBt7i7cXvRLzRlC ILhRXiH3VimAVcekHF3K+ZgR8XwKiP97fLjhxBQiQPAMnHpj1FKyTCX3txO8O3aPVz5f 1GhA== X-Gm-Message-State: AOJu0YxcGrZo3o4gMI7tlFKcvdTz5cWVsVv0g4m30AyGT+gqrPp+tN+8 o45nnjYep+plsNxahTQYdYu94j7iq468QQ== X-Google-Smtp-Source: AGHT+IFv9l8RP9ouA1wMDy/+fQmMSDpMo0She0rRMOSfNVCc2YwirrxQsNQ8JXzIqe/zXpY4Xmi+6A== X-Received: by 2002:a05:6402:350b:b0:53d:b839:203f with SMTP id b11-20020a056402350b00b0053db839203fmr714875edd.29.1697694779472; Wed, 18 Oct 2023 22:52:59 -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.52.58 for <66624@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Oct 2023 22:52:58 -0700 (PDT) Message-ID: In-Reply-To: References: From: Liliana Marie Prikler Date: Thu, 19 Oct 2023 06:29:26 +0200 Subject: [PATCH emacs-team 03/15] gnu: translate-shell: Build autoloads before installing them. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Debbugs-Cc: andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com to: 66624@debbugs.gnu.org X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 66624 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/dictionaries.scm (translate-shell)[#:phases]: Move ‘emacs-make-autoloads’ before ‘unpack’. Drop ‘emacs-autoload-compilation’. --- gnu/packages/dictionaries.scm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/gnu/packages/dictionaries.scm b/gnu/packages/dictionaries.scm index 06b5c4362c..19fe9b6f11 100644 --- a/gnu/packages/dictionaries.scm +++ b/gnu/packages/dictionaries.scm @@ -272,12 +272,10 @@ (define-public translate-shell curl "/bin:" fribidi "/bin:" rlwrap "/bin"))))))) + (add-after 'unpack 'emacs-make-autoloads + (assoc-ref emacs:%standard-phases 'make-autoloads)) (add-after 'install 'emacs-install (assoc-ref emacs:%standard-phases 'install)) - (add-after 'emacs-install 'emacs-make-autoloads - (assoc-ref emacs:%standard-phases 'make-autoloads)) - (add-after 'emacs-make-autoloads 'emacs-autoloads-compilation - (assoc-ref emacs:%standard-phases 'enable-autoloads-compilation))) #:make-flags (list (string-append "PREFIX=" %output) "NETWORK_ACCESS=no test") #:imported-modules (,@%gnu-build-system-modules -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Oct 19 01:53:43 2023 Received: (at 66624) by debbugs.gnu.org; 19 Oct 2023 05:53:43 +0000 Received: from localhost ([127.0.0.1]:35488 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qtLyY-0000tS-MP for submit@debbugs.gnu.org; Thu, 19 Oct 2023 01:53:43 -0400 Received: from mail-ed1-x542.google.com ([2a00:1450:4864:20::542]:52412) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qtLyO-0000rg-OO for 66624@debbugs.gnu.org; Thu, 19 Oct 2023 01:53:33 -0400 Received: by mail-ed1-x542.google.com with SMTP id 4fb4d7f45d1cf-53ed4688b9fso6524231a12.0 for <66624@debbugs.gnu.org>; Wed, 18 Oct 2023 22:53:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697694780; x=1698299580; 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=ongEgD1ioa8D69TDlUPgIQWwZtx48kudUn1wLah8350=; b=bb1LcSDiyPsCKSw+sgsxNxjLdnTIennJkzINcpWsTViWh14b3Pl3IKl2nYlAEsL20P 1ybXFHVRLt+EvuSbGfBqvFuLMuQFSmjy99vESNjvaSY7rOEMIiJvxyC/LoAoqhXV4o9v uEHJqMSvx9GRaePm16QMRVdr8oF5Z7TUCi/LPYbqKKOnf43PGwqgxGEBxAuyJbqqbmvT QjbAF/96QkH7gplEzRe4u3c2KGpAZQ6G8rI7fq8faOhFbR7fbsYGOKtSYscMK6Vp6Vp1 kUzI6YvfWpOxxy3fxwti0MNEvbTKFDbr3BDKI2CgMvpAqZGC7DH0J77XPLFtNkisQds4 nNvA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697694780; x=1698299580; 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=ongEgD1ioa8D69TDlUPgIQWwZtx48kudUn1wLah8350=; b=JuHy5nS8AiUA2K+VNx8K7knVVqXhlT7UDkTdSuRmdWfTzRTDsX6Tbcqs7pEaBhbusz rd7fAHWxkpFXrYrqmxoYNEGMKewQm5tnmtlvC9I3nBRZJnMN1FuOluYOY5m/1mcH2LS5 l5cBEQuBZHxm38VKeED/5XWxOeqKBFGZ0Ef4s57drUczoqMIjM+rGR5bDhEvTkCXkXl5 KWH3gWYuj61HcouibGyQDCl0efwv7K8UkvShKZMt7s3k9J/oClHundCsXnBBRHsckd+B Vr/RhLE9hKJ1rObkEF2IYyEslj489d9gMplgJib3Km80eBj6p7AfLtTJoSg1OSmBxCns 9L8w== X-Gm-Message-State: AOJu0Yzd7/LavS/PgZCDj3oMC6rI3SA3pBnqmvRBlI4MRpHNzmfgefX7 H9wREgX850Vd9K73jcr6yAAIyOs2EEdSLA== X-Google-Smtp-Source: AGHT+IEyYLY+je4eXi85QB59eW/o1iPnxtKSsBRbEuos6tq0pzVsro3S4D1N5tPbwVfWCmaWzcYXVg== X-Received: by 2002:a05:6402:278d:b0:53d:7be0:4a88 with SMTP id b13-20020a056402278d00b0053d7be04a88mr754207ede.22.1697694780581; Wed, 18 Oct 2023 22:53:00 -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.52.59 for <66624@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Oct 2023 22:52:59 -0700 (PDT) Message-ID: <8916ddafdf53296f530122e00d34e20a86f050b1.1697694142.git.liliana.prikler@gmail.com> In-Reply-To: References: From: Liliana Marie Prikler Date: Thu, 19 Oct 2023 06:30:53 +0200 Subject: [PATCH emacs-team 04/15] gnu: translate-shell: Compile emacs bytecode. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Debbugs-Cc: andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com to: 66624@debbugs.gnu.org X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 66624 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/dictionaries.scm (translate-shell)[#:phases]: Add ‘emacs-build’. --- gnu/packages/dictionaries.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/dictionaries.scm b/gnu/packages/dictionaries.scm index 19fe9b6f11..9f493d91ad 100644 --- a/gnu/packages/dictionaries.scm +++ b/gnu/packages/dictionaries.scm @@ -276,6 +276,8 @@ (define-public translate-shell (assoc-ref emacs:%standard-phases 'make-autoloads)) (add-after 'install 'emacs-install (assoc-ref emacs:%standard-phases 'install)) + (add-after 'emacs-install 'emacs-build + (assoc-ref emacs:%standard-phases 'build))) #:make-flags (list (string-append "PREFIX=" %output) "NETWORK_ACCESS=no test") #:imported-modules (,@%gnu-build-system-modules -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Oct 19 01:53:43 2023 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 Subject: [PATCH emacs-team 05/15] gnu: emacs-mew: Adjust to changes in emacs-build-system. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Debbugs-Cc: andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com to: 66624@debbugs.gnu.org X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 66624 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Oct 19 01:53:44 2023 Received: (at 66624) by debbugs.gnu.org; 19 Oct 2023 05:53:44 +0000 Received: from localhost ([127.0.0.1]:35494 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qtLyZ-0000ti-TZ for submit@debbugs.gnu.org; Thu, 19 Oct 2023 01:53:44 -0400 Received: from mail-ed1-x544.google.com ([2a00:1450:4864:20::544]:50506) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qtLyR-0000rk-4s for 66624@debbugs.gnu.org; Thu, 19 Oct 2023 01:53:35 -0400 Received: by mail-ed1-x544.google.com with SMTP id 4fb4d7f45d1cf-53d9b94731aso13243956a12.1 for <66624@debbugs.gnu.org>; Wed, 18 Oct 2023 22:53:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697694783; x=1698299583; 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=GL0Bfn1x2ItQ/z8N+m9Py0nCzIsmA9Bap1vsUOwG6yE=; b=I4QtaQ3gTO7EEq0VkcePeYM3aWr8jGO29R75A5Gkjh6+khU8eZ/V0JU6VwyrqsRJk2 Lrxo7DahjRYlJgN2obq00N7ySgaDXsy1zZqmg7MHndIeQpgSab2W05g25TYSfjYb8dwg r/ZEYmnD4dvgmmnrjy8Djm7pzA1PRMcNuKeUlsCXnnKAMyKIZJIid5C5o4OcLfqPI4c5 +RVFdt8oxv97VsZkBCcl34JWuH4V5e4X3l9JUbS3adrXLVBe2nSI3db9bqbCM6zAi0VN +oa/FugbCMEIOOrM4zFmEFso1icnrURqv9BDDO28KelJo68FJPuG6qzdRM2SMD4ZAQVc telA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697694783; x=1698299583; 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=GL0Bfn1x2ItQ/z8N+m9Py0nCzIsmA9Bap1vsUOwG6yE=; b=W/uKmls6QMTRS2n4OMFCA7uNDLZMMI8TQd11IsPjHrrbtE8//Vo/kXcwtL358NOaj6 b2Mckq4VZIDgHXXb3i1s6CQ509/DQaougwJiGoU2HyBiV22MH8BtPW4SQSMLbCr2vrws pBYj2GBsnVS34UOmYYVGR/61pzS3/kmSV7v11EQk8k4CiwB8QEqxwtls74xVsAovy7mj 75V0vpsjRw+48IZfUBZZVdiZwwyEBBIGFGWbZB8jZP07ISwFwzEHr2iWI4E/21UiNo04 XWfj9vC66/9MU7PJAns/q0TGzk4JUXq8GiDoU6yQiMHA7iypONR/VviLG41xO6vj2klB +zGg== X-Gm-Message-State: AOJu0YzLh5Owz84AShQeHjyH7Bpf4UgbZrEDc8TX9KTzZ2Fxllp21Cw0 c8aFBZfZCIXy+3lUfe0WYkzrvN2PzKhxyA== X-Google-Smtp-Source: AGHT+IGeSZcGgI9Bql3unxRPtIshKmTEh9k+xlxDLLIQIh/ObvBvDy34WXWC3PlbxwpTW6WxQrTHdQ== X-Received: by 2002:a50:f690:0:b0:53d:b33d:412b with SMTP id d16-20020a50f690000000b0053db33d412bmr654662edn.28.1697694782829; Wed, 18 Oct 2023 22:53:02 -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.01 for <66624@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Oct 2023 22:53:02 -0700 (PDT) Message-ID: <5d9b8675cb37c0a680a77e539ea65481fec8f2d4.1697694142.git.liliana.prikler@gmail.com> In-Reply-To: References: From: Liliana Marie Prikler Date: Thu, 19 Oct 2023 07:03:54 +0200 Subject: [PATCH emacs-team 06/15] gnu: crm114: Adjust to changes in emacs-build-system. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Debbugs-Cc: andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com to: 66624@debbugs.gnu.org X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 66624 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/mail.scm (crm114)[#:phases]: Move ‘make-autoloads’ after ‘unpack’. Delete ‘enable-autoloads-compilation’. Adjust ordering of other phases accordingly. --- gnu/packages/mail.scm | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 84c7275ef6..4fedce5d9c 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -4736,14 +4736,12 @@ (define-public crm114 (for-each (lambda (file) (install-file file (string-append out "/bin"))) (list "mailfilter.crm" "mailreaver.crm" "mailtrainer.crm"))))) - (add-after 'install 'install-emacs-mode - (assoc-ref emacs:%standard-phases 'install)) ;; Run phases from the emacs build system. - (add-after 'install-emacs-mode 'make-autoloads + (add-after 'unpack 'make-autoloads (assoc-ref emacs:%standard-phases 'make-autoloads)) - (add-after 'make-autoloads 'enable-autoloads-compilation - (assoc-ref emacs:%standard-phases 'enable-autoloads-compilation)) - (add-after 'enable-autoloads-compilation 'emacs-build + (add-after 'install 'install-emacs-mode + (assoc-ref emacs:%standard-phases 'install)) + (add-after 'install-emacs-mode 'emacs-build (assoc-ref emacs:%standard-phases 'build)) (add-after 'emacs-build 'validate-compiled-autoloads (assoc-ref emacs:%standard-phases 'validate-compiled-autoloads))))) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Oct 19 01:53:44 2023 Received: (at 66624) by debbugs.gnu.org; 19 Oct 2023 05:53:45 +0000 Received: from localhost ([127.0.0.1]:35496 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qtLya-0000tq-Be for submit@debbugs.gnu.org; Thu, 19 Oct 2023 01:53:44 -0400 Received: from mail-lj1-x243.google.com ([2a00:1450:4864:20::243]:58432) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qtLyS-0000rr-CR for 66624@debbugs.gnu.org; Thu, 19 Oct 2023 01:53:37 -0400 Received: by mail-lj1-x243.google.com with SMTP id 38308e7fff4ca-2c50ec238aeso76372111fa.0 for <66624@debbugs.gnu.org>; Wed, 18 Oct 2023 22:53:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697694784; x=1698299584; 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=8qu6pmTV6bdpXQfcBhH0A1Y7grbA8BSgMVKopq2XM2U=; b=gqS+J5EYxtR+lqE6E66hDymHWw7N5d1KJZUvFezzKS1/cc5K5Rmn4bxyPH+IyhvQO/ Vixjt0qpeBNsCqLdWqOoJQh7eJY05lus4pACXkNNnO0g8rjGbuHks8gCq1xIDEqfvPq+ smzUzuU6vL/SZ3xDlOm6c6mAmFCIkAOccJu9jlSAHQWgcRsBznQ6gbWK/gZaONhgfFMD rYRfUwQSJqy01DEbqlj0AbNJCF/uBAKpXO8V3wxeVFRFeJOr7USEUk412+oWucgd/Oep GDsOcwKdGBCa0J/biDwA4lWNAw/UHFmBzJdGWTBc6CsswvYhTpfy5dZH9V54jLqk7KZ1 DmVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697694784; x=1698299584; 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=8qu6pmTV6bdpXQfcBhH0A1Y7grbA8BSgMVKopq2XM2U=; b=MzSixXp+49wZouthwEqAzIjHP7fSt8T1Cs7yAIlrWnGELXQ96HiswHD7zxlGHwH+wF arHUbkUq6swuVhVESiQoK1sn+8w0VD4+Q8MHyW6U7s+DMz0wByOpQW7pIpySZaeFTbvF hTjQ0teWuWF/ZInS422bG1S/TmKBFNpX/rwKqVpwKqu53Q7iPxQpICZNnSh3ugB+vBno umApMvSZ1TZoHuSdRExYYYtCqWur2QkQaiDyIDy/3Y6uV8kOEUQ/ja+wqOCB3VOaFJtR ZF2kr38L50Lz38QfOsHPUcJHrD7P0A1igrkpyt69Zz0yfM84cFsrS4TslNZ8J8YfiBvv 7XcA== X-Gm-Message-State: AOJu0Yxe/PDGUqAgdLDZDveikBnuA8YreLoodp4PcTcGTYbWyWeGBs9r xBa+KQiZJG0lMpbdVhWgY+W7KdIMJ99eqw== X-Google-Smtp-Source: AGHT+IFtUXNzbfDGXKLWOOhoJI6gEM58wOV9gktENt/7QxcqCCR1YNs1tvJpJwvBExfWIY++UNePcg== X-Received: by 2002:a19:504a:0:b0:507:9784:644c with SMTP id z10-20020a19504a000000b005079784644cmr675276lfj.26.1697694783974; Wed, 18 Oct 2023 22:53:03 -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.02 for <66624@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Oct 2023 22:53:03 -0700 (PDT) Message-ID: <45f7683d193fbaed8ba9b37b9ce274ab98341095.1697694142.git.liliana.prikler@gmail.com> In-Reply-To: References: From: Liliana Marie Prikler Date: Thu, 19 Oct 2023 07:09:54 +0200 Subject: [PATCH emacs-team 07/15] gnu: guile-wisp: Build autoloads before installing them. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Debbugs-Cc: andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com to: 66624@debbugs.gnu.org X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 66624 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/guile-xyz.scm (guile-wisp)[#:phases]: Move ‘make-autoloads’ after ‘unpack’. --- gnu/packages/guile-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 0dbab6d991..078ba5e641 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -2179,12 +2179,12 @@ (define-public guile-wisp (invoke "guild" "compile" "-L" module-dir file "-o" go))) (find-files module-dir "\\.scm$"))))) + (add-after 'unpack 'make-autoloads + (assoc-ref emacs:%standard-phases 'make-autoloads)) (add-after 'install 'install-emacs-files (assoc-ref emacs:%standard-phases 'install)) (add-after 'install-emacs-files 'compile-emacs-files - (assoc-ref emacs:%standard-phases 'build)) - (add-after 'compile-emacs-files 'make-autoloads - (assoc-ref emacs:%standard-phases 'make-autoloads))))) + (assoc-ref emacs:%standard-phases 'build))))) (home-page "https://www.draketo.de/english/wisp") (inputs (list guile-3.0)) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Oct 19 01:53:45 2023 Received: (at 66624) by debbugs.gnu.org; 19 Oct 2023 05:53:45 +0000 Received: from localhost ([127.0.0.1]:35498 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qtLya-0000u2-Ql for submit@debbugs.gnu.org; Thu, 19 Oct 2023 01:53:45 -0400 Received: from mail-ed1-x541.google.com ([2a00:1450:4864:20::541]:55400) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qtLyT-0000ry-9b for 66624@debbugs.gnu.org; Thu, 19 Oct 2023 01:53:37 -0400 Received: by mail-ed1-x541.google.com with SMTP id 4fb4d7f45d1cf-53e751aeb3cso8484975a12.2 for <66624@debbugs.gnu.org>; Wed, 18 Oct 2023 22:53:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697694785; x=1698299585; 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=7WHDWRyQ+W+mHGqL/QEJaM5BX2Xq5/tV9Yd7+XXJT8o=; b=nnOZ1F9yLE+b/31HVSKd6PfWlqCt+iwsgziC9Ujhb5jqcMkB/wSNTDByMf6nMCJ64d QxsFSAC6heAqJtzlCKARnj4wBe6E/TU4Vvn9W1BPPrv7ECqkRI5Zr0QCZ+QxFlLQocIS /Q/mLpx5asPkxes50hak5vLiaZ5vrJS7jdoPM5WvAuGJ8EeUipvqy62582NjFe0KCuUt D3mSso7aMuplzH+z+q7H9CNePt8qCj9SwvmxDoTTWikQG/ROHLv09PzpioNAFr6s07M7 ikz4bZ/t5FfFLul3ri5YyuZAKL/TwDpPVIDbBeeqUVx/6SfKkEN+r01QDQ16WOGRnx81 9zcw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697694785; x=1698299585; 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=7WHDWRyQ+W+mHGqL/QEJaM5BX2Xq5/tV9Yd7+XXJT8o=; b=L/RBUfIYhzHNRVW0NERKkWTBvLHPceKB28t+/mYxlr3CIXLsDs1MFI+9M/IYCAUONd UozaZ0FVBc8sgA4MCRgiA7BC1hGWUuPueQmQ5rqCcya2yvz7dc0ByvQ4jHZapVw+CvPP 0xVIbDa+5iSzV9vSbKgqb9XMOpB5dLsIzcznl9RnYygn+JJJGggGq+tHSf/Ic9D625xG dmHm9Y100DzXbVbPeO9WIKyoFyfNJWyo91nEyocdjLTaDjRtHQ+FsBtzIl2Jq0+CNfXC /KwqTcgfmVytBgUxiO/mjvBMkRGXdfpHTtz3k7UeVWrpTDG8sxawgkjAFMihy3MnG5+7 Jgjw== X-Gm-Message-State: AOJu0YwP7UFhZ3OX3Hx5JgAEvST0XHht4sGOyH2/xCrkbijG3Z5QeJXt 2BiFTj4iKbTUBHbSRvQdz2FSZo+JajYMXQ== X-Google-Smtp-Source: AGHT+IGgjAuEWmIcYCpO6/mHHgd7JyNCGpJfoPufQpIfFhJxXEeK7xf1IPAQyIejNH2Dbc2uPQivzg== X-Received: by 2002:a05:6402:42d6:b0:53e:7818:b7e8 with SMTP id i22-20020a05640242d600b0053e7818b7e8mr892441edc.19.1697694785103; Wed, 18 Oct 2023 22:53:05 -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.04 for <66624@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Oct 2023 22:53:04 -0700 (PDT) Message-ID: <4e2491379a04e4bd17f29f39b2e415e79e38e37e.1697694142.git.liliana.prikler@gmail.com> In-Reply-To: References: From: Liliana Marie Prikler Date: Thu, 19 Oct 2023 07:16:18 +0200 Subject: [PATCH emacs-team 08/15] gnu: uim: Keep Emacs files in subdirectory. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Debbugs-Cc: andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com to: 66624@debbugs.gnu.org X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 66624 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/xorg.scm (uim)[arguments]<#:configure-flags>: Drop “--with-lispdir”. <#:phases>: Drop ‘fix-install-path’. Adjust ‘make-autoloads’ accordingly. --- gnu/packages/xorg.scm | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 66ba88f773..4fefb6f123 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -6298,7 +6298,6 @@ (define-public uim (guix build emacs-utils)) #:configure-flags (list "--with-anthy-utf8" - (string-append "--with-lispdir=" %output "/share/emacs") ;; Set proper runpath (string-append "LDFLAGS=-Wl,-rpath=" %output "/lib") "CFLAGS=-O2 -g -fcommon") @@ -6312,21 +6311,11 @@ (define-public uim ("uim-el-agent" (string-append out "/bin/uim-el-agent")) ("uim-el-helper-agent" (string-append out "/bin/uim-el-helper-agent")))) #t)) - ;; Fix installation path by renaming share/emacs/uim-el to - ;; share/emacs/site-lisp - (add-after 'install 'fix-install-path - (lambda* (#:key outputs #:allow-other-keys) - (let ((share-emacs (string-append (assoc-ref outputs "out") - "/share/emacs"))) - (rename-file (string-append share-emacs "/uim-el") - (string-append share-emacs "/site-lisp"))) - #t)) - ;; Generate emacs autoloads for uim.el (add-after 'fix-install-path 'make-autoloads (lambda* (#:key outputs #:allow-other-keys) (emacs-generate-autoloads ,name (string-append (assoc-ref outputs "out") - "/share/emacs/site-lisp")) + "/share/emacs/site-lisp/uim-el")) #t))))) (home-page "https://github.com/uim/uim") (synopsis "Multilingual input method framework") -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Oct 19 01:53:46 2023 Received: (at 66624) by debbugs.gnu.org; 19 Oct 2023 05:53:47 +0000 Received: from localhost ([127.0.0.1]:35501 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qtLyc-0000uM-IS for submit@debbugs.gnu.org; Thu, 19 Oct 2023 01:53:46 -0400 Received: from mail-lf1-x144.google.com ([2a00:1450:4864:20::144]:58668) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qtLyU-0000sF-Ie for 66624@debbugs.gnu.org; Thu, 19 Oct 2023 01:53:39 -0400 Received: by mail-lf1-x144.google.com with SMTP id 2adb3069b0e04-507be298d2aso3844436e87.1 for <66624@debbugs.gnu.org>; Wed, 18 Oct 2023 22:53:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697694786; x=1698299586; darn=debbugs.gnu.org; h=mime-version:to:subject:date:from:references:in-reply-to:message-id :from:to:cc:subject:date:message-id:reply-to; bh=jdhYgpEw9qejRFPOxBYfQeETa04V2UH8Q5fSe5n+S9o=; b=d+mesx4xt735iASjPF0qGs9m4ZAZDBWjWAZ4XhKwgFVWE8VjOits0M49gOjlQfIXNs FXD3VKQ6u3GPLZBz3t0BinALhibrK0PBg4Rcrqqg1VhNiW3nYJlAqiT1ZPkHCBG65c0o Av1KA8lSUiGB6DhaXyN4LOPsp4NY1OsxOHwItIAsenD9MeJgA4mKTxoDFwQ4lI7QDLun CjJ2l/DY02VFjUz/IupG07nNNtj6wmedqehsiMTdwKUo3sHAuF5yJeFYr2u5XX4gaLme +U5XLS8ELfeU2FpNv7iT7LySjTPBs0eps+HD9sCF7NAbNUewD600Uwa5JpYUJdrMX69n V9mg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697694786; x=1698299586; h=mime-version:to:subject:date:from:references:in-reply-to:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=jdhYgpEw9qejRFPOxBYfQeETa04V2UH8Q5fSe5n+S9o=; b=X5YvQmdfD+tXDR6VNMPhMLyXJNJm2+TyACXgU5xX2tXFqehTMkcVPuVLceSrKnuyy4 UQ4HC0ksfXtRHhWiGBTSxe+jvN4EfGscAA8dkz/UOps2zzFJBvkC6xslOBEjsG0c9H7l S47pX8PB/itxju4i4KDJzbNVMklVY1xycAZCJH2Akq2YlstcG8JhVaFXYFgJo0GRDbOd io8FqVvj3RnQtfAJoTI1IEE1mqEhsOfb5qzHmgTI8Vw9N8FB1zshRO6dxIYG+6Kt0Iw8 ZJZ5FhtxaxB+N29MFJ2cOu0JaP8vPBpW14LR/jU3cegfUqinZLvDQCvZxvd4uBp66QMU 9DNg== X-Gm-Message-State: AOJu0Ywl56IuesahaawbVbR45Ujb8lMLa2U5YmgNN6GV3H1JwRjknD0i LQWOjct+U0oHcXAAOZhEh55D3RrsFOaO5w== X-Google-Smtp-Source: AGHT+IGj9PhZ1SJ4GwIMaLGZEd0UkWU3SIGh/4yT3EvmsIFly/lZD7cxeMzyYjr6rytV1vkw8wAGGg== X-Received: by 2002:ac2:46c5:0:b0:503:1c07:f7f9 with SMTP id p5-20020ac246c5000000b005031c07f7f9mr625030lfo.29.1697694786183; Wed, 18 Oct 2023 22:53:06 -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.05 for <66624@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Oct 2023 22:53:05 -0700 (PDT) Message-ID: <84cc216ca007ec891ee76ebfe838e55a7d06e09a.1697694142.git.liliana.prikler@gmail.com> In-Reply-To: References: From: Liliana Marie Prikler Date: Thu, 19 Oct 2023 06:10:15 +0200 Subject: [PATCH emacs-team 09/15] gnu: emacs-geiser-guile: Process autoloads in-tree. X-Debbugs-Cc: andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com to: 66624@debbugs.gnu.org MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 66624 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/emacs-xyz.scm (emacs-geiser-guile)[#:phases]: Resolve "geiser-guile-autoloads.el" in the current working directory. --- gnu/packages/emacs-xyz.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index bb8c25f9b5..73abffb916 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -542,8 +542,7 @@ (define-public emacs-geiser-guile (search-input-file inputs "bin/guile")))))) (add-after 'make-autoloads 'patch-autoloads (lambda _ - (substitute* (string-append (elpa-directory #$output) - "/geiser-guile-autoloads.el") + (substitute* "geiser-guile-autoloads.el" ;; Activating implementations fails when Geiser is not yet ;; loaded, so let's defer that until it is. (("\\(geiser-activate-implementation .*\\)" all) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Oct 19 01:53:47 2023 Received: (at 66624) by debbugs.gnu.org; 19 Oct 2023 05:53:47 +0000 Received: from localhost ([127.0.0.1]:35503 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qtLyc-0000uO-S1 for submit@debbugs.gnu.org; Thu, 19 Oct 2023 01:53:47 -0400 Received: from mail-ed1-x543.google.com ([2a00:1450:4864:20::543]:57520) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qtLyV-0000sS-FL for 66624@debbugs.gnu.org; Thu, 19 Oct 2023 01:53:39 -0400 Received: by mail-ed1-x543.google.com with SMTP id 4fb4d7f45d1cf-53e2dc8fa02so11396843a12.2 for <66624@debbugs.gnu.org>; Wed, 18 Oct 2023 22:53:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697694787; x=1698299587; darn=debbugs.gnu.org; h=mime-version:to:subject:date:from:references:in-reply-to:message-id :from:to:cc:subject:date:message-id:reply-to; bh=49cTcqX0SZR5TOnU3l9yP4Hu+wUQYbu25VJBlNaFKug=; b=TA7NKVu3D+5fhRw2/QawQozI9x6ilD+skYVVI+Ei/Dg5rEb4MLkbP677CGCRBVt/Pa o7rw0PPXdHIn9+UsoGzEjS/doewA7B02aKhNVEfwc6sc32k8Bu5BWjp0NNVkOUr1SCUw dVZ1aDm+NsmYHXB/yUot5hk/kEuycWQ2TKdH0BVfz6XDlYW8ZgOF0uOUNu5Bmx5yVOnq KO5NCoyQik1y6K47W1YkQRmxMcyqDcHBrvflm0cAmgNB/u4tvQ61i+X73X4MAInCtdV8 vAVPPBUz0kMhe1VjD03hB3hs5QMQuvYUzmkWqNR/MbRdNbgrG/53tcR1vs28YwyL/7KB a/Jg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697694787; x=1698299587; h=mime-version:to:subject:date:from:references:in-reply-to:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=49cTcqX0SZR5TOnU3l9yP4Hu+wUQYbu25VJBlNaFKug=; b=hMhPTYZS9r0UGl7AyL/RQTDE8tc0jAEFwIMZglld9OULqiAzmHyk//EpmBbygnD35z l8aA0B5sDen/BahAUD+83VsEKIOm2k6yGqMpmQUHKvQQ75i1nMj1ixVDlgBT75wU8Z58 QHhQ+XiSdsty5GMtCzTB/uINt6hVNv5ihu46Ysmu1lJfTVBQceAC62+YLw/k2boWy6VC 8tMb2pcyBD6bhXKmTpS9+RjXVVjsxTf6KJAuj0yfSSkuHpZuNSnhTQDyTBr2QZpOBSX6 VG0pScOaepnBIVxYJcwzBwZlYa4ekMMDE20FKXjm492Ep1VUog2b+qGz7dTOQBHOo1Lj EJXQ== X-Gm-Message-State: AOJu0YyK4f7CkrzpjpE4M7UBTIo4dgGWYW8+fslx4JNV6+/Yy1Zq/FlR zeZvDuRLYHW1yi3CsXkrQ7rTDMH9D2oU/g== X-Google-Smtp-Source: AGHT+IHYlo7ng+dzJ0nGYZ/l/+jfxCJlOKdZQQl5qEFEafs8Ejsp9S8MuaED99Y7ewSA1a8TqSIUeQ== X-Received: by 2002:a50:bb44:0:b0:53e:5f9:328b with SMTP id y62-20020a50bb44000000b0053e05f9328bmr591352ede.2.1697694787289; Wed, 18 Oct 2023 22:53:07 -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.06 for <66624@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Oct 2023 22:53:06 -0700 (PDT) Message-ID: <445c473e50aa8be257d0e770bda103893f31b544.1697694142.git.liliana.prikler@gmail.com> In-Reply-To: References: From: Liliana Marie Prikler Date: Thu, 19 Oct 2023 07:20:08 +0200 Subject: [PATCH emacs-team 10/15] gnu: emacs-geiser-gauche: Process autoloads in-tree. X-Debbugs-Cc: andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com to: 66624@debbugs.gnu.org MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 66624 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/emacs-xyz.scm (emacs-geiser-gauche)[#:phases]: Resolve "geiser-gauche-autoloads.el" in the current working directory. --- gnu/packages/emacs-xyz.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 73abffb916..5d51dbae42 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -611,8 +611,7 @@ (define-public emacs-geiser-gauche (search-input-file inputs "bin/gosh"))))) (add-after 'make-autoloads 'patch-autoloads (lambda _ - (substitute* (string-append (elpa-directory #$output) - "/geiser-gauche-autoloads.el") + (substitute* "geiser-gauche-autoloads.el" ;; Activating implementations fails when Geiser is not yet ;; loaded, so let's defer that until it is. (("\\(geiser-activate-implementation .*\\)" all) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Oct 19 01:53:47 2023 Received: (at 66624) by debbugs.gnu.org; 19 Oct 2023 05:53:47 +0000 Received: from localhost ([127.0.0.1]:35505 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qtLyd-0000uV-6B for submit@debbugs.gnu.org; Thu, 19 Oct 2023 01:53:47 -0400 Received: from mail-ed1-x543.google.com ([2a00:1450:4864:20::543]:44276) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qtLyW-0000sh-EP for 66624@debbugs.gnu.org; Thu, 19 Oct 2023 01:53:40 -0400 Received: by mail-ed1-x543.google.com with SMTP id 4fb4d7f45d1cf-53de8fc1ad8so12835710a12.0 for <66624@debbugs.gnu.org>; Wed, 18 Oct 2023 22:53:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697694788; x=1698299588; darn=debbugs.gnu.org; h=mime-version:to:subject:date:from:references:in-reply-to:message-id :from:to:cc:subject:date:message-id:reply-to; bh=ff9OmQqic5+ClVhCTRHVNF93XmemEkyDAuFuZd3wikw=; b=DACPzkjqfGhVW4h/bRoDaSSQsygzGO2pxC4kNGQEji0cXHiRglpxHh7Bin7EazMvIg 2mzMm6g/I/sr1rRIOeZa08+9INF7BQzoQONeCcB6Rg09rU1of6QyvcEL1uUf2dLhv0Bk fP/XAA8YMiYiH2YqcmpIzSQei7jzLdEz+aNFpQ+fnajKy1ROchPEumAAH4zxVDbg+ByY supfls0hmpvwZilEEQDtHQdxtXE/vWfLDm7tNzp0M5bzIHMEYcDfy7HE1pZ3/Yx577ZH dH0kzpX1j1WOtD2KVxGKHO7DZYlh2OsI+es2ORVHX4pXRPsutPO89y6DunvvmpSGnVGj FY7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697694788; x=1698299588; h=mime-version:to:subject:date:from:references:in-reply-to:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=ff9OmQqic5+ClVhCTRHVNF93XmemEkyDAuFuZd3wikw=; b=DJwcLtk6oP0tTapwFvwBKjMUbyzbkYmOF5hQJzSlRbn7I2GEqpmChTr+9+xpioRwvW S7DmRWoUv90wygpL2i6mIckpGQ5mrAO53m9qq0Gx068epFvHjr5+YNdRHvPkc9gxWl1F 16WFx+sRxv3/9BglaBlMr66wrKPqtdaK5G64lp/FKcXNXC1K1KdPMg6jxwfcyGNefXLQ i5Rj+VER9Onumb9wLWAzaGabWu+IbupI8FEpnEVvGd3Krda6ETxerG1gTClETWoU+Ed/ WZ34mdyIxO6Gy21KZ9Whtw0yZ2mYA3lXsdyrDKLuo+GTTpCGpl0LhnH8QFUzD/Pgkrp/ Vx6Q== X-Gm-Message-State: AOJu0Yx/ObLFwwB6YYR4XkhhrUqAS0sdzWC26wZEPSwr0iuzogzakTpG dpRg/AvYkVwoMRDcco16AeMxTsKc2K+y7g== X-Google-Smtp-Source: AGHT+IGdytcFgyBcLE1pql04mT3XQeb/l6xFRXn3BRI6c2kL4ypOMJsvOHNmtXPeEgtZDjD/OlDKGw== X-Received: by 2002:a50:d0cb:0:b0:53e:327c:7bbc with SMTP id g11-20020a50d0cb000000b0053e327c7bbcmr828090edf.16.1697694788374; Wed, 18 Oct 2023 22:53:08 -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.07 for <66624@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Oct 2023 22:53:07 -0700 (PDT) Message-ID: In-Reply-To: References: From: Liliana Marie Prikler Date: Thu, 19 Oct 2023 07:20:50 +0200 Subject: [PATCH emacs-team 11/15] gnu: emacs-geiser-racket: Process autoloads in-tree. X-Debbugs-Cc: andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com to: 66624@debbugs.gnu.org MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 66624 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/emacs-xyz.scm (emacs-geiser-racket)[#:phases]: Resolve "geiser-racket-autoloads.el" in the current working directory. --- gnu/packages/emacs-xyz.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 5d51dbae42..08367ed411 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -656,8 +656,7 @@ (define-public emacs-geiser-racket (search-input-file inputs "bin/racket")))))) (add-after 'make-autoloads 'patch-autoloads (lambda _ - (substitute* (string-append (elpa-directory #$output) - "/geiser-racket-autoloads.el") + (substitute* "geiser-racket-autoloads.el" ;; Activating implementations fails when Geiser is not yet ;; loaded, so let's defer that until it is. (("\\(geiser-activate-implementation .*\\)" all) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Oct 19 01:53:48 2023 Received: (at 66624) by debbugs.gnu.org; 19 Oct 2023 05:53:48 +0000 Received: from localhost ([127.0.0.1]:35507 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qtLyd-0000uc-GJ for submit@debbugs.gnu.org; Thu, 19 Oct 2023 01:53:47 -0400 Received: from mail-ed1-x541.google.com ([2a00:1450:4864:20::541]:48271) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qtLyX-0000so-H9 for 66624@debbugs.gnu.org; Thu, 19 Oct 2023 01:53:41 -0400 Received: by mail-ed1-x541.google.com with SMTP id 4fb4d7f45d1cf-53e3e7e478bso9904242a12.0 for <66624@debbugs.gnu.org>; Wed, 18 Oct 2023 22:53:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697694789; x=1698299589; darn=debbugs.gnu.org; h=mime-version:to:subject:date:from:references:in-reply-to:message-id :from:to:cc:subject:date:message-id:reply-to; bh=JzQwhtWKeTNHJHryL6dRvaEkY5nlA/f3cwnMAa67Jrs=; b=EI3mILnZNHkL5jEoQE7NRsgvnvsCpQvzZBQPimTJ6xNggI4a+uBHPRUynuG8/bWR0X b2NvQn5aUG+5Z5H+qqBMkHTqFrfasKxXdxgA80G9TtI+yMabZkadWTV8mryluWC0wocg dfRj13zEj0dJ9WapaSlt+/+6Om08AIwGgwvhGoaI6jHx7tAXpJw9SmebjVM01UISDkRJ VimPgihPCCABV0AEN5AZR7ulbf2iEvcHDBcINBUGUbGaoP0NrPyVDIK5Lv3VVUSWXvY2 xvS4dOjvrG6O/QZyMknIBs8yU2QdboddI8dKlYOiKa4Rk/ruyXY4k+vNxwZkhVIlq9vp P5xw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697694789; x=1698299589; h=mime-version:to:subject:date:from:references:in-reply-to:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=JzQwhtWKeTNHJHryL6dRvaEkY5nlA/f3cwnMAa67Jrs=; b=H7H+eOgtKhqylbiEk2sMXUoFCwcTSD/tHvER0iqOzurH0cPYVKm6l5rhUcaMg33Qy5 2S6Omueg/9PjZbqPvODnaTV64/VXqZgxAaRwkThYXAc5RuZlel83t78BMLP1MzRLqZk2 KvRQubnhpwAhi9B1nAXGUxBvQ/dh3E4e46amr3Xng3/mm65wMV4hy+5rsOq/kb+ytxVd 7AXkEAUP0+7UtzFpLBl973d03q4TC00cpTdUqxlLij8iiwE9pUjbkkFHD67Zv7uc2jhi xBrHa4lYj4ScFy23E5ME3BQF3ocTNZ+n0iiwFsV/482MD/Wpj+TvNWNlNn958Fdebzzg exTg== X-Gm-Message-State: AOJu0YzSp+W/pDz2qcSgpd3ak4VlnvmWbdhL1SHVc7tAeefw+K3TGlsX xERwkN9zJjuYQ1eKXNECOykrjEL9mZC9sg== X-Google-Smtp-Source: AGHT+IFsMeSlaufSHrWpqIxQpQ0LohjwfWPGa8fmJwq/b7y4bH+NuedczteFrfDHzyNYgRyN0oMizw== X-Received: by 2002:a50:f616:0:b0:53e:3584:d39d with SMTP id c22-20020a50f616000000b0053e3584d39dmr650657edn.33.1697694789437; Wed, 18 Oct 2023 22:53:09 -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.08 for <66624@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Oct 2023 22:53:08 -0700 (PDT) Message-ID: <15253f25db1b9f52510a35a59a674be8afda5838.1697694142.git.liliana.prikler@gmail.com> In-Reply-To: References: From: Liliana Marie Prikler Date: Thu, 19 Oct 2023 07:21:31 +0200 Subject: [PATCH emacs-team 12/15] gnu: emacs-geiser-chez: Process autoloads in-tree. X-Debbugs-Cc: andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com to: 66624@debbugs.gnu.org MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 66624 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/emacs-xyz.scm (emacs-geiser-chez)[#:phases]: Resolve "geiser-chez-autoloads.el" in the current working directory. --- gnu/packages/emacs-xyz.scm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 08367ed411..fc5bc3a7d4 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -694,9 +694,7 @@ (define-public emacs-geiser-chez (modify-phases %standard-phases (add-after 'make-autoloads 'patch-autoloads (lambda* (#:key outputs #:allow-other-keys) - (substitute* (string-append - (elpa-directory (assoc-ref outputs "out")) - "/geiser-chez-autoloads.el") + (substitute* "geiser-chez-autoloads.el" ;; Activating implementations fails when Geiser is not yet ;; loaded, so let's defer that until it is. ;; See . -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Oct 19 01:54:05 2023 Received: (at 66624) by debbugs.gnu.org; 19 Oct 2023 05:54:05 +0000 Received: from localhost ([127.0.0.1]:35536 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qtLyv-0000wV-0b for submit@debbugs.gnu.org; Thu, 19 Oct 2023 01:54:05 -0400 Received: from mail-ed1-x544.google.com ([2a00:1450:4864:20::544]:56514) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qtLyY-0000sw-Ly for 66624@debbugs.gnu.org; Thu, 19 Oct 2023 01:53:43 -0400 Received: by mail-ed1-x544.google.com with SMTP id 4fb4d7f45d1cf-52bd9ddb741so13094647a12.0 for <66624@debbugs.gnu.org>; Wed, 18 Oct 2023 22:53:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697694790; x=1698299590; 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=kTz/DXu0Ktcdl+WrnXBHkdTYcllARui9u52RUDWfGCM=; b=RmRuW0gU5GKKb/EJV4Flq/svp5MG9Mpiku7eKaMpzGnmKOmBYA+N5Id5tC2dyheuPU qYcxAkQMzQdmMKKhRi7QSxwK29u0xGAFJkhWq9vA0+mdeJNe5xBvqOHKX6v2rUaShBpq /6ebv1EXyAO6HF38avxj1OaZKC6Fq0fKEAMMO7GKc/hdBDoCdE5Xc62pK/SzvYLt+18i ZcLPM9/5XWi1GzzPacBnG9Tn/qEAfvfLipbW6c88fV2Imoq7O1IhuOpzecIvWPAknmPw QNCJFXnTOvE2hB3pg3tL+QJ1nFP/ReKnWzRl7Y3B5x8MVGXb5BxVM23lcc4xC4PYKrUN TXug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697694790; x=1698299590; 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=kTz/DXu0Ktcdl+WrnXBHkdTYcllARui9u52RUDWfGCM=; b=jJFsVb6dY22UpiceDh0Zs2jcJXJAmK73tVOwHXrPrlz8lpl4AyMh0Shq46VTaWWYHX AD59dnxdL9Fd1kfhSUf8M6mJA29ImNQz7GUlyZFwKOZfW6yiG0axpUF4EER8bp3eUIM5 KHRFcXNyHcmtuXInZOk/FM62ZhehRScXRvLQ8V+EJA3OH3k79L5X2OiKGTkhXBpAPF3X ClonSGY8ZsTdU8E4GthHqX9rYYZhkWDExqD0NJfJzfDWuyl+QdfLo+5925ewerXYr6lF 84EPo7459ejWtPM7wpsN5ySBoo7x6SQvtZvwtcSSVB/EgFuwxtI+qe2i/XdVzqeuHndv 1HmQ== X-Gm-Message-State: AOJu0YyGRJHh+CzMfd5fXolgZYz14/sZ1JoI/nxGK4hijgx3rvMwEMBn kZdu8K/AufZzweuRtDO6qWWzoe6G6Wb0fQ== X-Google-Smtp-Source: AGHT+IEZi1kG/HuZSf/CNhos5Gz/wu7UbGLjz/W1eSBCN/6LwSk2FyFsZUrmbrCqoxZE0cqvdKZRUg== X-Received: by 2002:a50:d09c:0:b0:53f:8493:5b0b with SMTP id v28-20020a50d09c000000b0053f84935b0bmr710436edd.35.1697694790528; Wed, 18 Oct 2023 22:53:10 -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.09 for <66624@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Oct 2023 22:53:09 -0700 (PDT) Message-ID: In-Reply-To: References: From: Liliana Marie Prikler Date: Thu, 19 Oct 2023 07:28:21 +0200 Subject: [PATCH emacs-team 13/15] gnu: emacs-libgit: Adjust to changes in emacs-build-system. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Debbugs-Cc: andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com to: 66624@debbugs.gnu.org X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 66624 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/emacs-xyz.scm (emacs-libgit)[#:phases]: Move ‘make-autoloads’ after ‘unpack’. Drop ‘enable-autoloads-compilation’. Move ‘emacs-build’ after ‘install’. --- gnu/packages/emacs-xyz.scm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index fc5bc3a7d4..4a26cd0df6 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -1453,13 +1453,11 @@ (define-public emacs-libgit emacs:%default-include))))) (add-after 'unpack 'emacs-add-install-to-native-load-path (assoc-ref emacs:%standard-phases 'add-install-to-native-load-path)) - (add-after 'install 'make-autoloads + (add-after 'unpack 'make-autoloads (assoc-ref emacs:%standard-phases 'make-autoloads)) - (add-after 'make-autoloads 'enable-autoloads-compilation - (assoc-ref emacs:%standard-phases 'enable-autoloads-compilation)) - (add-after 'enable-autoloads-compilation 'patch-el-files + (add-after 'unpack 'patch-el-files (assoc-ref emacs:%standard-phases 'patch-el-files)) - (add-after 'patch-el-files 'emacs-build + (add-after 'install 'emacs-build (assoc-ref emacs:%standard-phases 'build)) (add-after 'emacs-build 'validate-compiled-autoloads (assoc-ref emacs:%standard-phases 'validate-compiled-autoloads))))) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Oct 19 01:54:05 2023 Received: (at 66624) by debbugs.gnu.org; 19 Oct 2023 05:54:05 +0000 Received: from localhost ([127.0.0.1]:35538 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qtLyv-0000wc-Ba for submit@debbugs.gnu.org; Thu, 19 Oct 2023 01:54:05 -0400 Received: from mail-ed1-x544.google.com ([2a00:1450:4864:20::544]:44277) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qtLyZ-0000t2-ND for 66624@debbugs.gnu.org; Thu, 19 Oct 2023 01:53:44 -0400 Received: by mail-ed1-x544.google.com with SMTP id 4fb4d7f45d1cf-53de8fc1ad8so12835775a12.0 for <66624@debbugs.gnu.org>; Wed, 18 Oct 2023 22:53:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697694791; x=1698299591; 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=AIBv/7dLWvL2qvKfUBzyn9dNCERjtFm5da8edwDmtX0=; b=TXQ4Si+PX/lSjae3yGfiD4pxfsE9OD1z2D2v4sz60zlfRobx3KSFXEoALTaMZLy/5n W9h+JpbG/s3o1h2eKVN6WbzJ7NOPkf65Pdenms4oKVVpolsl2q5yW1zweANfkuWeHATd yhgF5CXAbexzTJhMjLy+juRz52c/L1SXI4uDj9jw1PI91sV4dVtW2sU2bO5Al/5mHyaU fFuqhCdCKM5905gxmluHuEa2cWs78rHNyHXevpSEkyrnITE2OdPLBS4QQuRrZuvQ21jY Sw7C5AHwNtzjtvn/Znlf7R+wFxH/USI3dBrua+EdwuVjkyzK5VkE3VqbnYYaRE7DcKhN bgIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697694791; x=1698299591; 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=AIBv/7dLWvL2qvKfUBzyn9dNCERjtFm5da8edwDmtX0=; b=pG7aKaD6S9Js36fzX1mabDeW88WB4voum0tQ4FGSjDrPDbx/FBQse5V1ZkHRUz1Kpt WruTFc+Y2YGIIewFwq2nFdU10vu9jNEKFiQYdEbtoW4EuTD6/JFfpClAaHvn5+pr+I1B RrmhrO7F3revmJypx3d8X7218nCB9GFcwdPI/wF4uSBN/35aJ9oQF1GqKWgB2mxX2+4o EMQsPA40eQWoxfecgogqHz7xxbD5PUe0ryELh9+FywIGEHpxL4a0vMHH3pjZdUKae0AM tHkYfF62mo6qEBs7N7vycHYhiooSING0cDi/RIe22ncQr/rdUAZH4vfSOrtYPi0hRqXr Qfyw== X-Gm-Message-State: AOJu0YzjjsqoUyCW6Xvzn03vGjCsgMqFxgjzHE9xAZuJRMsgItBqeVHq 0uNQIJASL6b73nJ8rbI6HBMpORpBOskAaA== X-Google-Smtp-Source: AGHT+IGVGLho5Dq6BdxqraWSllGu/S8RaejHTKZOmZvb2tK6IiwpnFHY3W3KSklhwz4jAHuLczVoiA== X-Received: by 2002:a05:6402:1e88:b0:53e:1f7d:10f2 with SMTP id f8-20020a0564021e8800b0053e1f7d10f2mr811167edf.10.1697694791606; Wed, 18 Oct 2023 22:53:11 -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.10 for <66624@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Oct 2023 22:53:10 -0700 (PDT) Message-ID: <67f7db53ef14c6b841230b0749ffb48e6dbd67b5.1697694142.git.liliana.prikler@gmail.com> In-Reply-To: References: From: Liliana Marie Prikler Date: Thu, 19 Oct 2023 07:31:54 +0200 Subject: [PATCH emacs-team 14/15] gnu: emacs-eweouz: Build autoloads before installing them. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Debbugs-Cc: andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com to: 66624@debbugs.gnu.org X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 66624 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/emacs-xyz.scm (emacs-eweouz)[#:phases]: Move ‘emacs-make-autoloads’ after ‘enter-lisp-dir’. --- gnu/packages/emacs-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 4a26cd0df6..113d6ce2bf 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -3705,6 +3705,8 @@ (define-public emacs-eweouz (emacs-substitute-sexps "eweouz.el" ("eweouz-helper-dirs" `(list ,(string-append #$output "/libexec/eweouz")))))) + (add-after 'enter-lisp-dir 'emacs-make-autoloads + (assoc-ref emacs:%standard-phases 'make-autoloads)) (add-after 'emacs-patch-variables 'emacs-expand-load-path (assoc-ref emacs:%standard-phases 'expand-load-path)) (add-after 'emacs-expand-load-path 'emacs-add-install-to-native-load-path @@ -3712,9 +3714,7 @@ (define-public emacs-eweouz (add-after 'emacs-add-install-to-native-load-path 'emacs-install (assoc-ref emacs:%standard-phases 'install)) (add-after 'emacs-install 'emacs-build - (assoc-ref emacs:%standard-phases 'build)) - (add-after 'emacs-install 'emacs-make-autoloads - (assoc-ref emacs:%standard-phases 'make-autoloads))))) + (assoc-ref emacs:%standard-phases 'build))))) (native-inputs (list autoconf automake -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Oct 19 01:54:06 2023 Received: (at 66624) by debbugs.gnu.org; 19 Oct 2023 05:54:06 +0000 Received: from localhost ([127.0.0.1]:35544 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qtLyv-0000ws-RR for submit@debbugs.gnu.org; Thu, 19 Oct 2023 01:54:06 -0400 Received: from mail-ed1-x541.google.com ([2a00:1450:4864:20::541]:61527) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qtLya-0000t4-RP for 66624@debbugs.gnu.org; Thu, 19 Oct 2023 01:53:45 -0400 Received: by mail-ed1-x541.google.com with SMTP id 4fb4d7f45d1cf-523100882f2so12453334a12.2 for <66624@debbugs.gnu.org>; Wed, 18 Oct 2023 22:53:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697694793; x=1698299593; 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=/q2MpljmgUsNtd2xgafBHvKQN7mfJEjpPq+Fw+xFf1U=; b=EMLa+ofhI10OiACKsRdIyQEjyNqrtweOanA5z3p6IvX2vUuLmAQfgrjPfHjUDeo6uQ MrCfzrpxh2NwRiDIp6Hu/r9js5qRpxx2N+9FskjAiyCyGchIFYpgS+zyLIlwkfbgOTgN W7GuwUWvh03Vp5YbBHL5rljkS5AATdxbDqnHfJnWUIgWzHgFJ1g4ckHyKyYzN4AVw3JI 72P73RVbGrhYqbIT+8GeNV646pGIM14U/KYQakmQ+jwAQ7YjPSw5Eh9oWl+TBxL9cS4o mO9Fki0idaBWtzY7x7GzI8WtlnLGDXbn7t/pSOgJl/cKzT/pFjRA68dJ29tQEmhArOY9 PK7A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697694793; x=1698299593; 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=/q2MpljmgUsNtd2xgafBHvKQN7mfJEjpPq+Fw+xFf1U=; b=lO918ter7YN+PFDJPsWU+hZJ9llUiq1+g/anB/uYqklQc6k/ZYHOie/X4nNqkINcwx 0rTCVhEnzsy857Xod4EoH5mpj+GwJx2Z4CRJbOl1Q9Ayw+CRfwEPhf98VyVY3h0iEZHT P+ZhpW427PiTSHxswZJgxYxEFbBKY3+hh5Rf+zw6LHXLgaWgCzWbu6yG127Lc845CmEU uWrFAgPIbBb04CEYE81I89wtV33hstdyLkEjRGZ5K1McV4S+8JpU407uF28jg4JielxU Cr1YO1UNoUxIc2dyVYprejVcFzZ1EP7tqF6I8zwfmSy8U/WklEUs8jlavzyjYzQFG6/N W1ZQ== X-Gm-Message-State: AOJu0YxIFOiJ4JrEU2fI3+aCPsvEFzXFt5ka3dVxHzoQeyvDXYWMH5iy V/tKexSG/k4CUYxUaGYkcQM8ds8jf/2MRA== X-Google-Smtp-Source: AGHT+IG6k+wVIj0K2JKxLZLxulFkAK0nylXhjou3GKX7C/Agv7d8uME0RBkFlBK8IkjuCN1QSTmHog== X-Received: by 2002:a50:d094:0:b0:53d:e5d7:4148 with SMTP id v20-20020a50d094000000b0053de5d74148mr731653edd.1.1697694792738; Wed, 18 Oct 2023 22:53:12 -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.11 for <66624@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Oct 2023 22:53:12 -0700 (PDT) Message-ID: <843522e76fa05eb41297fe7e4ed00d56f143f99d.1697694142.git.liliana.prikler@gmail.com> In-Reply-To: References: From: Liliana Marie Prikler Date: Thu, 19 Oct 2023 07:38:00 +0200 Subject: [PATCH emacs-team 15/15] gnu: emacs-pdf-tools: Build autoloads before installing them. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Debbugs-Cc: andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com to: 66624@debbugs.gnu.org X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 66624 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/emacs-xyz.scm (emacs-pdf-tools)[#:phases]: Move ‘emacs-make-autoloads’ after ‘enter-lisp-dir’. --- gnu/packages/emacs-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 113d6ce2bf..f540d66f2a 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -5228,6 +5228,8 @@ (define-public emacs-pdf-tools ;; upgrading" that pdf-tools tries to perform. (emacs-substitute-variables "pdf-tools.el" ("pdf-tools-handle-upgrades" '())))) + (add-after 'enter-lisp-dir 'emacs-make-autoloads + (assoc-ref emacs:%standard-phases 'make-autoloads)) (add-after 'emacs-patch-variables 'emacs-expand-load-path (assoc-ref emacs:%standard-phases 'expand-load-path)) (add-after 'emacs-expand-load-path 'emacs-add-install-to-native-load-path @@ -5235,9 +5237,7 @@ (define-public emacs-pdf-tools (add-after 'emacs-add-install-to-native-load-path 'emacs-install (assoc-ref emacs:%standard-phases 'install)) (add-after 'emacs-install 'emacs-build - (assoc-ref emacs:%standard-phases 'build)) - (add-after 'emacs-install 'emacs-make-autoloads - (assoc-ref emacs:%standard-phases 'make-autoloads))))) + (assoc-ref emacs:%standard-phases 'build))))) (native-inputs (list autoconf automake emacs-minimal pkg-config)) (inputs -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Oct 23 04:42:14 2023 Received: (at 66624) by debbugs.gnu.org; 23 Oct 2023 08:42:14 +0000 Received: from localhost ([127.0.0.1]:49003 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1quqVq-0002pj-00 for submit@debbugs.gnu.org; Mon, 23 Oct 2023 04:42:14 -0400 Received: from relay1-d.mail.gandi.net ([217.70.183.193]:36975) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1quqVl-0002pP-3j for 66624@debbugs.gnu.org; Mon, 23 Oct 2023 04:42:12 -0400 Received: by mail.gandi.net (Postfix) with ESMTPSA id 096A924001A; Mon, 23 Oct 2023 08:41:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=trop.in; s=gm1; t=1698050493; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=ENCACdBq1IKzp++45h3pz+EXCRXjKrFrlvBt3aQFodU=; b=PXVq6Vy2tO2DV2EHtrYr7wf+YOVdv3iWQWCJnkMOCZPRdr+a49IzuJuvK+zVD5weWVAz27 VU1/qRC0hjbPEICg4a2Ncl5ob0IfWkAiplbxNmRDEdzfeJxY0mqejSnM98bfXvTbJ8OCiM quRWIYyVb3b/567/ofcO4En+QPbLkYoVYJ9RMFf2EDPRwqQxh4daSmG5Oq2lyKCgdVsCMl JaQAJ0E1clhmqhCqvrSvf07zjKT3EQnoya5bUGSPfcCN8ctjAxdkUD0/l07dS7d7jDWc7N xIhF7N7s22y58g6EoZHngAkjS2jM+Tvw3VT77dY9cRD2QXM4ZRRPgJ5uQhcKnw== From: Andrew Tropin To: Liliana Marie Prikler , 66624@debbugs.gnu.org Subject: Re: [bug#66624] [PATCH emacs-team 01/15] guix: emacs-build-system: Process package source in build tree. In-Reply-To: References: Date: Mon, 23 Oct 2023 12:41:29 +0400 Message-ID: <8734y13f46.fsf@trop.in> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-GND-Sasl: andrew@trop.in X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 66624 Cc: cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable On 2023-10-19 06:06, Liliana Marie Prikler wrote: > * guix/build/emacs-build-system.scm (ensure-package-description) > (patch-el-files, make-autoloads): Operate on the current working director= y, > either implicitly, or through (getcwd). Sounds reasonable and seems to simplify build phases. > (enable-autoloads-compilation): Deleted variable, logic moved into > make-autoloads. > (%standard-phases): Adjust accordingly. > --- > guix/build/emacs-build-system.scm | 85 +++++++++++++------------------ > 1 file changed, 34 insertions(+), 51 deletions(-) > > diff --git a/guix/build/emacs-build-system.scm b/guix/build/emacs-build-s= ystem.scm > index 3808b60445..aa083c6409 100644 > --- a/guix/build/emacs-build-system.scm > +++ b/guix/build/emacs-build-system.scm > @@ -132,29 +132,25 @@ (define* (build #:key outputs inputs #:allow-other-= keys) > (parameterize ((%emacs emacs)) > (emacs-compile-directory (elpa-directory out))))) >=20=20 > -(define* (patch-el-files #:key outputs #:allow-other-keys) > - "Substitute the absolute \"/bin/\" directory with the right location i= n the > -store in '.el' files." > - > - (let* ((out (assoc-ref outputs "out")) > - (elpa-name-ver (store-directory->elpa-name-version out)) > - (el-dir (string-append out %install-dir "/" elpa-name-ver)) > - (el-files (find-files (getcwd) "\\.el$"))) > - (define (substitute-program-names) > - (substitute* el-files > - (("\"/bin/([^.]\\S*)\"" _ cmd-name) > - (let ((cmd (which cmd-name))) > - (unless cmd > - (error "patch-el-files: unable to locate " cmd-name)) > - (string-append "\"" cmd "\""))))) > - > - (with-directory-excursion el-dir > - ;; Some old '.el' files (e.g., tex-buf.el in AUCTeX) are still > - ;; ISO-8859-1-encoded. > - (unless (false-if-exception (substitute-program-names)) > - (with-fluids ((%default-port-encoding "ISO-8859-1")) > - (substitute-program-names)))) > - #t)) > +(define* (patch-el-files #:key inputs outputs #:allow-other-keys) > + "Substitute the absolute \"/bin/\" and \"/sbin\" directories with the = right > +locations in the store in '.el' files." > + > + (define substitute-program-names > + (let ((el-files (find-files (getcwd) "\\.el$"))) > + (lambda () > + (substitute* el-files > + (("\"/(s?bin/[^.]\\S*)\"" _ cmd) > + (let ((cmd (search-input-file inputs cmd))) > + (unless cmd > + (error "patch-el-files: unable to locate " (basename cmd)= )) > + (string-append "\"" cmd "\""))))))) > + > + (unless (false-if-exception (substitute-program-names)) > + ;; Some old '.el' files (e.g., tex-buf.el in AUCTeX) are still > + ;; ISO-8859-1-encoded. > + (with-fluids ((%default-port-encoding "ISO-8859-1")) > + (substitute-program-names)))) >=20=20 > (define (find-root-library-file name) > (let loop ((parts (string-split > @@ -224,10 +220,8 @@ (define* (ensure-package-description #:key outputs #= :allow-other-keys) > (emacs-batch-edit-file (string-append name ".el") > %write-pkg-file-form))) >=20=20 > - (let* ((out (assoc-ref outputs "out")) > - (elpa-name-ver (store-directory->elpa-name-version out))) > - (with-directory-excursion (elpa-directory out) > - (and=3D> (find-root-library-file elpa-name-ver) write-pkg-file)))) > + (let ((name (store-directory->elpa-name-version (assoc-ref outputs "ou= t")))) > + (and=3D> (find-root-library-file name) write-pkg-file))) >=20=20 > (define* (check #:key tests? (test-command '("make" "check")) > (parallel-tests? #t) #:allow-other-keys) > @@ -306,24 +300,15 @@ (define* (move-doc #:key outputs #:allow-other-keys) > info-files))) > #t)) >=20=20 > -(define* (make-autoloads #:key outputs inputs #:allow-other-keys) > +(define* (make-autoloads #:key outputs #:allow-other-keys) > "Generate the autoloads file." > - (let* ((emacs (search-input-file inputs "/bin/emacs")) > - (out (assoc-ref outputs "out")) > - (elpa-name-ver (store-directory->elpa-name-version out)) > - (elpa-name (package-name->name+version elpa-name-ver)) > - (el-dir (elpa-directory out))) > - (parameterize ((%emacs emacs)) > - (emacs-generate-autoloads elpa-name el-dir)))) > - > -(define* (enable-autoloads-compilation #:key outputs #:allow-other-keys) > - "Remove the NO-BYTE-COMPILATION local variable embedded in the generat= ed > -autoload files." > - (let* ((out (assoc-ref outputs "out")) > - (autoloads (find-files out "-autoloads.el$"))) > - (substitute* autoloads > - ((";; no-byte-compile.*") "")) > - #t)) > + (emacs-generate-autoloads > + (package-name->name+version (store-directory->elpa-name-version > + (assoc-ref outputs "out"))) > + (getcwd)) > + ;; Ensure that autoloads can be byte-compiled. > + (substitute* (find-files "." "-autoloads\\.el$") > + ((";; no-byte-compile.*") ""))) >=20=20 > (define* (validate-compiled-autoloads #:key outputs #:allow-other-keys) > "Verify whether the byte compiled autoloads load fine." > @@ -358,7 +343,11 @@ (define (elpa-directory store-dir) > (define %standard-phases > (modify-phases gnu:%standard-phases > (replace 'unpack unpack) > + (add-after 'unpack 'ensure-package-description > + ensure-package-description) > (add-after 'unpack 'expand-load-path expand-load-path) > + (add-after 'unpack 'patch-el-files patch-el-files) > + (add-after 'expand-load-path 'make-autoloads make-autoloads) > (add-after 'expand-load-path 'add-install-to-native-load-path > add-install-to-native-load-path) > (delete 'bootstrap) > @@ -366,14 +355,8 @@ (define %standard-phases > (delete 'build) > (replace 'check check) > (replace 'install install) > - (add-after 'install 'make-autoloads make-autoloads) > - (add-after 'make-autoloads 'enable-autoloads-compilation > - enable-autoloads-compilation) > - (add-after 'enable-autoloads-compilation 'patch-el-files patch-el-fi= les) > - (add-after 'patch-el-files 'ensure-package-description > - ensure-package-description) > ;; The .el files are byte compiled directly in the store. > - (add-after 'ensure-package-description 'build build) > + (add-after 'install 'build build) > (add-after 'build 'validate-compiled-autoloads validate-compiled-aut= oloads) > (add-after 'validate-compiled-autoloads 'move-doc move-doc))) I didn't spot any obvious issues with the patch series. Thank you for work= ing on it! =2D-=20 Best regards, Andrew Tropin --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEKEGaxlA4dEDH6S/6IgjSCVjB3rAFAmU2MbkACgkQIgjSCVjB 3rAlFRAAlsvHuiPUOFl/H1bkfMtKZKlffx+gU3u7glfUwJ/qeIOG7S1AplxcJ6Qj KK61lpSOYJoQjardbTXQ/LL5yyifB8v+oh0pDGALJHrS8HFzJ//TO83qtdXxrrM5 pow74JurhZ3szx1ruOjdV5zD4VcxLEbRuH8hcItOi69Mni1jX88f5oqfoBOD89tR itvMbEVM+PepgTNqpwUNA8pak71qwleN1tZrAzVQayVM8bdSyIG18THuiY99jaWD ORnzDvZI1tH1YymOYVWIMmVWdgJQUChFBwW/TDH00C76j8qISv28ncAtxhIE7HaV aYva2KzMNRy4sC4Woaxe2xGCPGg+Nn6F2I3yb2Azc7Kp+YfhF/qmMbpBIyyH3C0k axQUSft0dpSBjv4lARwKa7x0JmSQfPckiVUrwcEsmSyZri8T9ulLD2/n/2ln0Vg0 WE+qMqlbIHYUszN2B/9mk4arJ4iIbNZA6dhvx8CglzNx5b4fKyy9nb1+/865W07Q MAD8ICvK3RGbXwyVIO3Bbmybe9Jr+89c2e4M3PhJcgkh4J2Fan9LfFhKji71h51D 6STXXZg0BaMNh4h5Y3V9K4Cn7XYVEnM+rXMZJvaqP2qerQveBr7krdMSjd3acD65 5/H33FE25Y7rcIQZwAPpd2mjMS9FAihaT1l4Yq5/twx+eWLzJqI= =x7AG -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Wed Nov 01 15:55:16 2023 Received: (at 66624) by debbugs.gnu.org; 1 Nov 2023 19:55:16 +0000 Received: from localhost ([127.0.0.1]:52666 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qyHJ6-0003BJ-1p for submit@debbugs.gnu.org; Wed, 01 Nov 2023 15:55:16 -0400 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:48303) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qyHJ2-0003B1-1e for 66624@debbugs.gnu.org; Wed, 01 Nov 2023 15:55:14 -0400 Received: by mail-wr1-x442.google.com with SMTP id ffacd0b85a97d-32dd70c5401so77873f8f.0 for <66624@debbugs.gnu.org>; Wed, 01 Nov 2023 12:54:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1698868471; x=1699473271; darn=debbugs.gnu.org; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:from:to:cc:subject :date:message-id:reply-to; bh=ci31jSLdVYDwKgyEwyyC/h95+MM298dUp3ogN2dBApU=; b=MbOR62XUF7vm7YRnQg7oxyIQLEPrUy+8UsSQJVU+zFvOuOf+vKz5J2N+8DSMpj+gG7 2WMB1RzojNi8Qjr8AsCf2tvRhxKlqk2lrJtYZI3EQ7fFQRyAW7IeVr/FxKnByh3QEbH1 8wW4lYjMihnoANldezh+VAC9qEQrN9D9rSX2oLLLSOsINqIn/XDJOqR6rJJKBpDMgemr dlUz1ae/80mGb72F7ipRukhZYsSdWAVDlnQmbtWuhV9NMXbNKQ+VstDXfpBjllZDhmj0 oktzPzlfw9A3+DbDI51Tq6d6WvZKVWVSX4HeC9ADCwrZXr/rZyJivj2L4/7a2Q40zsKr 2Bjw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698868471; x=1699473271; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=ci31jSLdVYDwKgyEwyyC/h95+MM298dUp3ogN2dBApU=; b=MEEij0Di8gtqNxIVlaxgVOjJ9CjaHQwyGjp6N/hbktSe3yeG+hrL5r70dM0vzA8jhY iHBMcrPIe9xLB+13KJ2qptvPDDME6SlOaJ3PiPcAr7GOaP/JRgqs9EMKB9y6QgeTPI20 ZNDCH+JZGNvqv2bhCG0tiIW6K1s72SMZzNmBr5mu+0VGABbWQ5VwH0mVyZjriCSdNBFX riYsPpKz58VkoN3li9b8Ii8GXgvUorZSZ48SYdVK8H0q2iCqfSii4rQU0eEel0lTtM8g VNXWAa/RUWmbHu1JszeSJHtkrvqEHYHrJwpWGNaIesAxRIW1SAQZZ8aXhSJz2m/P8pqb fYIg== X-Gm-Message-State: AOJu0Ywui/OGubUSzhwO5wp3ULURH4sIGdUm2e2uBxce5lJmKbHRu7wb j+Ogn0cV7fDsjg/kNNC9X2c= X-Google-Smtp-Source: AGHT+IEVCnc6sh2EXkzr9nkt7z2gCO62isfiKrflYHk/wecHEDBUj2P6S/HWyNGtnh8PoY6+uRKqMw== X-Received: by 2002:a5d:47c2:0:b0:32f:7793:bb80 with SMTP id o2-20020a5d47c2000000b0032f7793bb80mr13504610wrc.23.1698868470750; Wed, 01 Nov 2023 12:54:30 -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 d9-20020adfef89000000b0032d893d8dc8sm579683wro.2.2023.11.01.12.54.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Nov 2023 12:54:29 -0700 (PDT) Message-ID: <55f089ff8ce97bba1a25e83df2c7e70a9cf6aed2.camel@gmail.com> Subject: Re: [bug#66624] [PATCH emacs-team 01/15] guix: emacs-build-system: Process package source in build tree. From: Liliana Marie Prikler To: Andrew Tropin , 66624@debbugs.gnu.org Date: Wed, 01 Nov 2023 20:54:28 +0100 In-Reply-To: <8734y13f46.fsf@trop.in> References: <8734y13f46.fsf@trop.in> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.4 MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 66624 Cc: cox.katherine.e+guix@gmail.com X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Am Montag, dem 23.10.2023 um 12:41 +0400 schrieb Andrew Tropin: > On 2023-10-19 06:06, Liliana Marie Prikler wrote: >=20 > > * guix/build/emacs-build-system.scm (ensure-package-description) > > (patch-el-files, make-autoloads): Operate on the current working > > directory either implicitly, or through (getcwd). >=20 > Sounds reasonable and seems to simplify build phases. >=20 > > [...] >=20 > I didn't spot any obvious issues with the patch series.=C2=A0 Thank you > for working on it! Thanks for checking. Pushed to emacs-team now. Cheers From debbugs-submit-bounces@debbugs.gnu.org Thu Nov 02 05:32:50 2023 Received: (at 66624-done) by debbugs.gnu.org; 2 Nov 2023 09:32:51 +0000 Received: from localhost ([127.0.0.1]:53912 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qyU4I-0008IB-JY for submit@debbugs.gnu.org; Thu, 02 Nov 2023 05:32:50 -0400 Received: from mail-ej1-x644.google.com ([2a00:1450:4864:20::644]:46547) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qyU4F-0008Hx-64 for 66624-done@debbugs.gnu.org; Thu, 02 Nov 2023 05:32:48 -0400 Received: by mail-ej1-x644.google.com with SMTP id a640c23a62f3a-9c53e8b7cf4so101854466b.1 for <66624-done@debbugs.gnu.org>; Thu, 02 Nov 2023 02:32:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1698917526; x=1699522326; darn=debbugs.gnu.org; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:from:to:cc:subject :date:message-id:reply-to; bh=beTWHnVq0k88bZIYaZ77QOT1A0v1hpEmXogAg+ad2Ho=; b=OuZgPjd7r1RYXaA73UBr7F9LJ6/Hwo65Drm3vp7y9jEmCsa0jDV+7HurnMZahqWhFS TNsSiG1ZAKpanIuDX2tRr4TOG9vlYCiwfYe3y4YI5UvL1/I1MNWrNr3hgFed5Eyx4EG+ MwKoRIXk3Vy8rUAjWH0xHf/ySzPmwGCb0XmvNUmzbKLgKky4GeZoUhSEcjh4tYe8srJl yCa4PNhUc0BhM0t2uderU7mFKab8q+XjYF2uo3vXjeFU4tv9siZsiqXf6q/1bUpH0s5q 7PFOmBiTkHHN29awDgS9Gh58KbWrN5c83BMIOd0thVilJM3jHnN9ZMKJ+D9ersulOVXQ 8BFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698917526; x=1699522326; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=beTWHnVq0k88bZIYaZ77QOT1A0v1hpEmXogAg+ad2Ho=; b=Wtyyghitu9UUzpG+Z7JATo2oIOLO2ahPlpPJoyqH3H7MMSWn5FFGkuBVmtd7b5pvBB Lu+dTUpZTwZeqbRlQyXs7Wf8Z50RWhkFb4HYlDmTuggyGCRU8LmmsCAPEij73F3WNEkT caT64rg2p8h5d81z5TcUtdujexJ/XxmmxO89lmlWip20cIfIT5HufOi2W0OX8agP9hc+ jLUrntwdA4vJ040vauxr+MHpPADL/u9GkFEWXagogfr5fm3DTsD4Ass+H5GXT9Hhw/OS QmT5gJ3Ezo9t4RqTk5OyMkObHv3PiKqrMjatLW7KdvyZXeM2HxZsOq5XppFK/BIAIoCK KShg== X-Gm-Message-State: AOJu0Yw/yZEvKCeDeyuah238FzzaINzdFqguhTrdqiY2kydCXDNLznXh N/fiCTA0Yzvu+BbHkIIfA4w= X-Google-Smtp-Source: AGHT+IGJaoVkJ54AFMkWPOyiD0U/5UDvCBAES5CH5muA4h2pQzNTvp5bkSfA62oy4EIU2KouuJ2lHg== X-Received: by 2002:a17:907:26ce:b0:9be:cdca:dadb with SMTP id bp14-20020a17090726ce00b009becdcadadbmr3676798ejc.69.1698917525984; Thu, 02 Nov 2023 02:32:05 -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 fo19-20020a05600c691300b0040836519dd9sm2163247wmb.25.2023.11.02.02.32.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Nov 2023 02:32:04 -0700 (PDT) Message-ID: <73472e6649ea1c5e663300ea2de82b72ba7cb08e.camel@gmail.com> Subject: Re: [bug#66624] [PATCH emacs-team 01/15] guix: emacs-build-system: Process package source in build tree. From: Liliana Marie Prikler To: Andrew Tropin , 66624-done@debbugs.gnu.org Date: Thu, 02 Nov 2023 10:32:03 +0100 In-Reply-To: <55f089ff8ce97bba1a25e83df2c7e70a9cf6aed2.camel@gmail.com> References: <8734y13f46.fsf@trop.in> <55f089ff8ce97bba1a25e83df2c7e70a9cf6aed2.camel@gmail.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.4 MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 66624-done Cc: cox.katherine.e+guix@gmail.com X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Am Mittwoch, dem 01.11.2023 um 20:54 +0100 schrieb Liliana Marie Prikler: > Am Montag, dem 23.10.2023 um 12:41 +0400 schrieb Andrew Tropin: > > On 2023-10-19 06:06, Liliana Marie Prikler wrote: > >=20 > > > * guix/build/emacs-build-system.scm (ensure-package-description) > > > (patch-el-files, make-autoloads): Operate on the current working > > > directory either implicitly, or through (getcwd). > >=20 > > Sounds reasonable and seems to simplify build phases. > >=20 > > > [...] > >=20 > > I didn't spot any obvious issues with the patch series.=C2=A0 Thank you > > for working on it! > Thanks for checking. >=20 > Pushed to emacs-team now. >=20 > Cheers Forgot to mark as done. From unknown Sun Jun 22 11:38:33 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Thu, 30 Nov 2023 12:24:06 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator