From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:403:4789::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id uPtwOvL0IGWLWwAAG6o9tA:P1 (envelope-from ) for ; Sat, 07 Oct 2023 08:04:35 +0200 Received: from aspmx1.migadu.com ([2001:41d0:403:4789::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id uPtwOvL0IGWLWwAAG6o9tA (envelope-from ) for ; Sat, 07 Oct 2023 08:04:35 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id BDE3A4BCD0 for ; Sat, 7 Oct 2023 08:04:34 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=trop.in header.s=gm1 header.b=ZGsLtFj1; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1696658674; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post: dkim-signature; bh=g6Kog383kKvY2nYlgR9mNO1rJHZ7kCcaAmy36jNP35U=; b=W9G6U7AbU/Tmiz1cYYu+JqzNqN4S5u5POPAcagtwUTC27S41FqJfGgtoiVE2izpH7ywVmH H0HbkYl3ARtvbrSMPHEhIHjxo3ppm+CNoeuaakpc3e+YwUIYp770sbNuXSGV8gmltHrrDK Msxnkq9RssSuJ3ulypXkJQ33kKPh0E/1BxNq/JqE4/EWwFghuZyZsbPFDA/nJljxAR5/Ws XbQf7a2Flnhf1o+rmqPb79cbeqSxoKX+XfSsejP60RFjMCzezG7IZNjG4BzU3HJa/W+S8G JAKlBy1yd6eN8050m3hoM2HHy3r0GU8iml19QCdVcgmcv0xxIRNpYz73/+GjkQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=trop.in header.s=gm1 header.b=ZGsLtFj1; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1696658674; a=rsa-sha256; cv=none; b=SP4Zb3ReZdRpl8h9D6jNqOb9D5+E3aigMETiJl4y+R7TXJz+9aF3G0RKN/QtEOgjecf8jN E/95U+aREOnoLoSQp7ea7KaPUkcp0nC8bz9aZzH43Muo+zLtOkoO3hy/5gGwJGUeXmU29D EVYwD1RebCN3YfcWeclwY20gTpTxcMaMHHZNQuc1/54QKXcgG4Gw5psiS86M64hemqLHS9 h6G6XMF23B6Tcq1wGR2Tswvn8V0p/V3bH0OscI1DTYxS23ryjqr+VkbOwlyGb+UtHxdobM b5Y+KbQxPQDUZEg+++nNwQxQt8xKG7WPMgO4NRrGm+tlHfK8ojtAALfKVbWLPQ== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qp0Jt-0004CV-3i; Sat, 07 Oct 2023 01:57:45 -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 1qp0Jr-0004C8-5i for guix-patches@gnu.org; Sat, 07 Oct 2023 01:57:43 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qp0Jq-0008Jq-TY for guix-patches@gnu.org; Sat, 07 Oct 2023 01:57:42 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qp0KA-0000h3-33 for guix-patches@gnu.org; Sat, 07 Oct 2023 01:58:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66225] [PATCH v3] gnu: emacs-next-minimal: Apply Guix patches. Resent-From: Andrew Tropin Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 07 Oct 2023 05:58:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66225 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Liliana Marie Prikler , 66225@debbugs.gnu.org Cc: 66227@debbugs.gnu.org, Nicolas Graves , cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com, Ricardo Wurmus , Akib Azmain Turja Received: via spool by 66225-submit@debbugs.gnu.org id=B66225.16966582462531 (code B ref 66225); Sat, 07 Oct 2023 05:58:02 +0000 Received: (at 66225) by debbugs.gnu.org; 7 Oct 2023 05:57:26 +0000 Received: from localhost ([127.0.0.1]:53195 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qp0JZ-0000eh-PN for submit@debbugs.gnu.org; Sat, 07 Oct 2023 01:57:26 -0400 Received: from relay7-d.mail.gandi.net ([2001:4b98:dc4:8::227]:48029) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qp0JW-0000dY-UD; Sat, 07 Oct 2023 01:57:24 -0400 Received: by mail.gandi.net (Postfix) with ESMTPSA id 35A0020008; Sat, 7 Oct 2023 05:56:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=trop.in; s=gm1; t=1696658216; 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=g6Kog383kKvY2nYlgR9mNO1rJHZ7kCcaAmy36jNP35U=; b=ZGsLtFj1joKuiyKPLUe1jl5jkMZig9Co8L4Qa1Vvv6FfGENyvKtG6J1mq/9dRu80CVfb1+ iCE8Lf1bkY/ciZeB0sb25Guz4ZMiYkZ+3o/+IcSV3LyGaFgWP9T9aktfbk4pguBVq6GqsZ pSgItQSk2yvpAYh+d51FXeyb1YojpwDnA9iCAlwPdgjbHeWRdpt6DFds3cgLW6UI9mCqDk vWtgupiIqDmFcmrZSTNoKai771pSIqy+4XAlX22hB+hf7TU4Q8Ab7xFRhfEtrK4gh1bSav 409r5W5ERAEnr5Sck9zs/GHGbNtwKCWX8MzlE1JXBQr0pyFnaEV+/AJz7Q8mug== From: Andrew Tropin In-Reply-To: References: <3d99a6a63e38a5ba24b75e6fd40130474881eaa3.1695778662.git.ngraves@ngraves.fr> Date: Sat, 07 Oct 2023 09:56:49 +0400 Message-ID: <87r0m7ug9q.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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Queue-Id: BDE3A4BCD0 X-Spam-Score: -2.94 X-Migadu-Spam-Score: -2.94 X-Migadu-Scanner: mx1.migadu.com X-TUID: TsQJfspmBSNN --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On 2023-10-06 17:58, Liliana Marie Prikler wrote: > * gnu/packages/patches/emacs-next-native-comp-driver-options.patch: Add f= ile. > * gnu/packages/patches/emacs-next-exec-path.patch: Add file. > * gnu/local.mk (dist_patch_DATA): Register them here. > * gnu/packages/emacs.scm (emacs-next-minimal)[origin](patches): Include t= he > same patches as emacs-minimal, save for the variants specific to emacs-ne= xt > introduced above. > > Co-Authored-By: Nicolas Graves > Fixes: =E2=80=98emacs-next=E2=80=99 is almost unusable > --- > Hi Guix, > > this bug was independently discovered in two locations, so I wanted to > inform both. A fix has already been proposed, but is not yet complete. > Here's to finally cover everything we need to have an Emacs as expected > by Guix. > > Feel free to bikeshed. > > Happy hacking > > gnu/local.mk | 2 ++ > gnu/packages/emacs.scm | 7 ++++++- > .../patches/emacs-next-exec-path.patch | 18 ++++++++++++++++++ > ...emacs-next-native-comp-driver-options.patch | 18 ++++++++++++++++++ > 4 files changed, 44 insertions(+), 1 deletion(-) > create mode 100644 gnu/packages/patches/emacs-next-exec-path.patch > create mode 100644 gnu/packages/patches/emacs-next-native-comp-driver-op= tions.patch > > diff --git a/gnu/local.mk b/gnu/local.mk > index 65d50abc71..43a528e937 100644 > --- a/gnu/local.mk > +++ b/gnu/local.mk > @@ -1110,6 +1110,8 @@ dist_patch_DATA =3D \ > %D%/packages/patches/emacs-highlight-stages-add-gexp.patch \ > %D%/packages/patches/emacs-lispy-fix-thread-last-test.patch \ > %D%/packages/patches/emacs-native-comp-driver-options.patch \ > + %D%/packages/patches/emacs-next-exec-path.patch \ > + %D%/packages/patches/emacs-next-native-comp-driver-options.patch \ > %D%/packages/patches/emacs-pasp-mode-quote-file-names.patch \ > %D%/packages/patches/emacs-polymode-fix-lexical-variable-error.patch \ > %D%/packages/patches/emacs-telega-path-placeholder.patch \ > diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm > index 72b2c7795e..b9d9e2b891 100644 > --- a/gnu/packages/emacs.scm > +++ b/gnu/packages/emacs.scm > @@ -498,7 +498,12 @@ (define-public emacs-next-minimal > (commit commit))) > (file-name (git-file-name name version)) > (sha256 > - (base32 "00mwpq1msr3jij281w5piqmbwq968xr8dn9hqbf4r947ck754kn9"))= ))))) > + (base32 "00mwpq1msr3jij281w5piqmbwq968xr8dn9hqbf4r947ck754kn9")) > + (patches > + (search-patches "emacs-next-exec-path.patch" > + "emacs-fix-scheme-indent-function.patch" > + "emacs-next-native-comp-driver-options.patch" > + "emacs-pgtk-super-key-fix.patch"))))))) >=20=20 > (define* (emacs->emacs-next emacs #:optional name > #:key (version (package-version emacs-next-m= inimal)) > diff --git a/gnu/packages/patches/emacs-next-exec-path.patch b/gnu/packag= es/patches/emacs-next-exec-path.patch > new file mode 100644 > index 0000000000..6e33e25258 > --- /dev/null > +++ b/gnu/packages/patches/emacs-next-exec-path.patch > @@ -0,0 +1,18 @@ > +Do not capture the build-time value of $PATH in the 'emacs' executable > +since this can noticeably increase the size of the closure of Emacs > +with things like GCC being referenced. > + > +Index: emacs-next/lisp/loadup.el > +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > +--- emacs-next.orig/lisp/loadup.el > ++++ emacs-next/lisp/loadup.el > +@@ -599,7 +599,8 @@ lost after dumping"))) > + ((equal dump-mode "dump") "emacs") > + ((equal dump-mode "bootstrap") "emacs") > + ((equal dump-mode "pbootstrap") "bootstrap-em= acs.pdmp") > +- (t (error "Unrecognized dump mode %s" dump-mo= de))))) > ++ (t (error "Unrecognized dump mode %s" dump-mo= de)))) > ++ (exec-path nil)) > + (when (and (featurep 'native-compile) > + (equal dump-mode "pdump")) > + ;; Don't enable this before bootstrap is completed, as the > diff --git a/gnu/packages/patches/emacs-next-native-comp-driver-options.p= atch b/gnu/packages/patches/emacs-next-native-comp-driver-options.patch > new file mode 100644 > index 0000000000..e4ed5a48f1 > --- /dev/null > +++ b/gnu/packages/patches/emacs-next-native-comp-driver-options.patch > @@ -0,0 +1,18 @@ > +We substitute this anyway, so let's make it easier to substitute. > + > +--- a/lisp/emacs-lisp/comp.el > ++++ b/lisp/emacs-lisp/comp.el > +@@ -203,9 +203,7 @@ and above." > + :type '(repeat string) > + :version "28.1") > +=20 > +-(defcustom native-comp-driver-options > +- (cond ((eq system-type 'darwin) '("-Wl,-w")) > +- ((eq system-type 'cygwin) '("-Wl,-dynamicbase"))) > ++(defcustom native-comp-driver-options nil > + "Options passed verbatim to the native compiler's back-end driver. > + Note that not all options are meaningful; typically only the options > + affecting the assembler and linker are likely to be useful. > +--=20 > +2.38.0 > + > > base-commit: e863274e67e2242b970845783172c9f4e49405ca Hi Liliana and Nicolas, the fixes looks good to me. =2D-=20 Best regards, Andrew Tropin --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEKEGaxlA4dEDH6S/6IgjSCVjB3rAFAmUg8yEACgkQIgjSCVjB 3rA2uRAAh258kOPjQsgHuK0WSxpuqH4scRPJ/dyY83xedblTGtMsxYaDETDfjavF FduLIyu9HvSw+xMBAkfMcyEB8Q0mO4US2GkoN6I+k8zmESqo6Ur4NAYuoPwQU6oy Gl8OUkaDczJxMQOUW130bcpNXPlh5YtzKJ+IPqXmXy09E8b8W5ntFO2hoiRwYGlC oYOc1QgTrqg0rURP/qNTEejYPyukpY3+W9sfupMYuyVwxdT4p+zUUiH9vVZ6i+6s +26XG7V37jF8EshMq5NE5J5L43Q1vyp2oGpK1JwTxuDKaGFRDphD5Lfpa0IOUqDS MbcNfMpMWnprVsOmwmHg3QyQ94G4V2LkFU+2rJcxUF7aCHPREk4kITJ5pzYS3FlZ f+GVwuF7oOe+odj+jgf/ri3RwAgvx8er9O3jnfcrReDLdczT9Ru+2nzy1Po+hWzs lme+8uwrvrmHf7C+ESxfNPkMy9jmMj3rJ9/pAf1Z+scM+LzF+QWoVrgdBIz7RRxI wZtAxfA4ncbeKFcybX/ED7vdRl/kOtFZOgLWx1d+GMmh3IoxNgaFDfE6Pie8k5DX VNEWdwz2FgxZo1932A1902nGTYLrWGWdB4olqx6h8pvi9T8La5jMoZYvjk8SIS82 KiDQIVMMTVgiqtEzQkPgnHQYXUwfm+zSwxXZKWTHsNcPKQDRlKs= =to+5 -----END PGP SIGNATURE----- --=-=-=--