From patchwork Fri Oct 6 15:58:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 54529 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 8C6D827BBEA; Fri, 6 Oct 2023 17:11:18 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 78E8427BBE2 for ; Fri, 6 Oct 2023 17:11:17 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qonPd-0005II-1r; Fri, 06 Oct 2023 12:10:49 -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 1qonPZ-00055z-7s for guix-patches@gnu.org; Fri, 06 Oct 2023 12:10:45 -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 1qonPY-0002Up-RB for guix-patches@gnu.org; Fri, 06 Oct 2023 12:10:45 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qonPq-0006Gl-0Z; Fri, 06 Oct 2023 12:11:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66225] [PATCH v3] gnu: emacs-next-minimal: Apply Guix patches. References: <3d99a6a63e38a5ba24b75e6fd40130474881eaa3.1695778662.git.ngraves@ngraves.fr> In-Reply-To: <3d99a6a63e38a5ba24b75e6fd40130474881eaa3.1695778662.git.ngraves@ngraves.fr> Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com, guix-patches@gnu.org Resent-Date: Fri, 06 Oct 2023 16:11:01 +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: 66225@debbugs.gnu.org Cc: 66227@debbugs.gnu.org, Ricardo Wurmus , Nicolas Graves , Akib Azmain Turja , andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com X-Debbugs-Original-Xcc: andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com Received: via spool by 66225-submit@debbugs.gnu.org id=B66225.169660861924013 (code B ref 66225); Fri, 06 Oct 2023 16:11:01 +0000 Received: (at 66225) by debbugs.gnu.org; 6 Oct 2023 16:10:19 +0000 Received: from localhost ([127.0.0.1]:52487 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qonP8-0006FD-T8 for submit@debbugs.gnu.org; Fri, 06 Oct 2023 12:10:19 -0400 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]:50491) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qonP4-0006Es-L3; Fri, 06 Oct 2023 12:10:18 -0400 Received: by mail-wm1-x343.google.com with SMTP id 5b1f17b1804b1-406619b53caso20662785e9.1; Fri, 06 Oct 2023 09:09:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696608589; x=1697213389; darn=debbugs.gnu.org; h=cc:to:content-transfer-encoding:mime-version:subject:date:from :message-id:from:to:cc:subject:date:message-id:reply-to; bh=5bFahZm7HJ+z1cjrHbKr96DbstNRt6Qj4Z0c4jbBQj8=; b=bajoMvIrM0AyhxpvDQxvK+g5u9BseW4ZlCW44FfvzEaiYbN8wMCLqLvCIVDUcZpwhF AT6/pQzpCN6ikkEuRvo/Uzad635NKCqUCittTlEKbgvhaYYmkzi3ycM8OjznTM/5HUAa LIj4D3qJe2PFI6YRhd79FbbdDy3r1hhg7TxKyOJ3Xrk7dDeypjRTP3ySI91QeXZhGjsV lMypIBPMKzAJ0VO65Md4Lc4FpYye9iLxHQ0CJzX1CDmcUP0WlNjAgmXDfivya6T81z// kKjVh5spyRyAqz14m8iyFzxw5EA3O2YOpEy0b7M5XsbLGjpSmrYApIZ3ePA3BtSAvS2M +sow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696608589; x=1697213389; h=cc: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=5bFahZm7HJ+z1cjrHbKr96DbstNRt6Qj4Z0c4jbBQj8=; b=GGYUI32l+KGF7RVp9uYTjrTFo5hQlqyOaVup22kWnBJIWCgRTIVHkY7Y1tuOxSTwKd 27TSMRUkGOI07aAF10p48pPviilEKHWfgllCA65CdWgWpXxmYiPRg3Nj/voEqntyXni7 dJ95yLvLrDek49MeESEi9FD4TsbuNQd0mqdmM6ZF+AwPjFO5HkFU3jfMJY3KgViPs8AJ fvwEWQeytMqGRANXxKQeXvRqa2VrhW3YaQIUukgbQz02kZSfjbElfXpEsP3tCYzDjIpR RN0ax0X/ZcT/0RvK6L+JbTzaAShUAN5J8N4ip4+y3g8Or8NwN0ACcUOXWmduIQbZoumQ x7dw== X-Gm-Message-State: AOJu0YwJ6BrMGbVtVikEtY3StLZpGn9pxPpXmYi3kxQ4v7GjppE4CYgH 3Uwu6dtPamr6E1wmsJjPRZOhVDrO3te1/A== X-Google-Smtp-Source: AGHT+IG+5eMqq6Hg3rVIQ/GodYRo7mbxgR1CBxXTmacYv/W3KW/XNV5eTugjCgJl5TNiOPf28Vg/Aw== X-Received: by 2002:a05:600c:3ba1:b0:406:872d:7725 with SMTP id n33-20020a05600c3ba100b00406872d7725mr6797859wms.1.1696608589161; Fri, 06 Oct 2023 09:09:49 -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 z18-20020a05600c221200b0040607da271asm6267892wml.31.2023.10.06.09.09.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Oct 2023 09:09:48 -0700 (PDT) Message-ID: From: Liliana Marie Prikler Date: Fri, 6 Oct 2023 17:58:13 +0200 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/patches/emacs-next-native-comp-driver-options.patch: Add file. * 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 the same patches as emacs-minimal, save for the variants specific to emacs-next introduced above. Co-Authored-By: Nicolas Graves Fixes: ‘emacs-next’ 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-options.patch base-commit: e863274e67e2242b970845783172c9f4e49405ca 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 = \ %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"))))))) (define* (emacs->emacs-next emacs #:optional name #:key (version (package-version emacs-next-minimal)) diff --git a/gnu/packages/patches/emacs-next-exec-path.patch b/gnu/packages/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 +=================================================================== +--- 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-emacs.pdmp") +- (t (error "Unrecognized dump mode %s" dump-mode))))) ++ (t (error "Unrecognized dump mode %s" dump-mode)))) ++ (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.patch 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") + +-(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. +-- +2.38.0 +