From patchwork Sat Mar 2 16:13:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 61303 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 C034C27BBEA; Sun, 3 Mar 2024 06:21:54 +0000 (GMT) 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,TVD_SPACE_RATIO autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 2F6C527BBE9 for ; Sun, 3 Mar 2024 06:21:54 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rgfE9-00016E-Cl; Sun, 03 Mar 2024 01:21:37 -0500 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 1rgfE6-0000y7-5b for guix-patches@gnu.org; Sun, 03 Mar 2024 01:21:34 -0500 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 1rgfE5-0005g1-To for guix-patches@gnu.org; Sun, 03 Mar 2024 01:21:33 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rgfEY-0008Nn-Gh; Sun, 03 Mar 2024 01:22:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69510] [PATCH emacs-team 2/2] gnu: emacs-next-minimal: Update to 30.0.50-2.170c655. 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: Sun, 03 Mar 2024 06:22:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69510 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69510@debbugs.gnu.org Cc: Mekeor Melire , 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 69510-submit@debbugs.gnu.org id=B69510.170944691532202 (code B ref 69510); Sun, 03 Mar 2024 06:22:02 +0000 Received: (at 69510) by debbugs.gnu.org; 3 Mar 2024 06:21:55 +0000 Received: from localhost ([127.0.0.1]:39648 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rgfER-0008NK-AC for submit@debbugs.gnu.org; Sun, 03 Mar 2024 01:21:55 -0500 Received: from mail-lf1-f66.google.com ([209.85.167.66]:51379) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rgfEL-0008Ml-O3 for 69510@debbugs.gnu.org; Sun, 03 Mar 2024 01:21:53 -0500 Received: by mail-lf1-f66.google.com with SMTP id 2adb3069b0e04-51320ca689aso4032589e87.2 for <69510@debbugs.gnu.org>; Sat, 02 Mar 2024 22:21:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709446815; x=1710051615; darn=debbugs.gnu.org; h=mime-version:cc:to:subject:date:from:references:in-reply-to :message-id:from:to:cc:subject:date:message-id:reply-to; bh=1KkDEgxzMybHhfeN/VRQDc/ytqPFrliL4P9xHn/QMPo=; b=E2Ds+WDh/WhIO31DB43GuePu/2QR81Tfae6nqK0a1EkJtN+pUDH229U0UXO8MNn1sz yo2gS8n/O0mfDk7raT/l1P1P+cIiFoQMp1ReaPICRYgFgte1dZATNiYW3Gl2sFFAWY0N femofuQt2UUG2ZkFDgSUdwMqnR07jmd+8Ba0cwrVCjXvPtUmRPCI4ubnNznBmxt4+Tt3 FOum7Op3qrs6MLhgfrF0nFv/SvQ8yMMWTAjxPxA3vPllPZMymilFIn9+1FcfnT11W7U5 Nv99kZRk4MDUhDCis4ESo04nx61/tUCdONWFrbVqA2yt93puKPae3AyKPaZ9A3ivx+pR x/QA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709446815; x=1710051615; h=mime-version:cc:to:subject:date:from:references:in-reply-to :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=1KkDEgxzMybHhfeN/VRQDc/ytqPFrliL4P9xHn/QMPo=; b=m2p9iueR4ovnxrP72N0gwjx4tXfoc2K4oIPQHiTVgP/qSZKTfeUq5e9cL0KkRiuACk oxRsbD7BNEs5+C+vVoeyOiKGSQqpUcEgLsWmLYh1y+ziMnxFpmbB4oEgWZ/e9/wJEaRL JPUVq8TgpWwPB7HabXy43jhALfbR4qP8Eb8qgKtrWcTJ8JIiwxhXoFumyl1F7DEqlnVB fpBf0ndWwZ7Nxzx/IB/rnYNetimiYP2wq503TN00RUa3uETaAPPtI8H2nnKWWv5LqNIj o2TG9dKxFbONr2yxGJ6tbkHJ8rAAG/0w8i9SGNbAJD8lMKJpLGF/hslMKqK1t/QffzmU ik5Q== X-Gm-Message-State: AOJu0Yz73siNaMdxJj1toRyAGK+y/hkodcvnvMfTMgQ+EgCOzVYTbl8m KK8fXoGGNWIOYbPcdO7S/2J1Vj3AwiqcfIwp0yCTQZ7rEAAs8GHRqSptFWo1Tm4= X-Google-Smtp-Source: AGHT+IGg1tqgRNRQzywkK3o8DQeDfF5pGY//JmI8LQL/RoAg6VAckEvVzs2TkFAhEIVDq7tCxs5jGQ== X-Received: by 2002:ac2:5f45:0:b0:512:f472:702f with SMTP id 5-20020ac25f45000000b00512f472702fmr3505592lfz.23.1709446814824; Sat, 02 Mar 2024 22:20:14 -0800 (PST) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id le6-20020a170906ae0600b00a449b4f4aefsm2114238ejb.178.2024.03.02.22.20.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 Mar 2024 22:20:14 -0800 (PST) Message-ID: <84e125eb27bc97dc00c260bb03238447134f6d5c.1709446767.git.liliana.prikler@gmail.com> In-Reply-To: <7f3f70eedbbec74481a0ca9fea4c19250961685e.1709446767.git.liliana.prikler@gmail.com> References: <7f3f70eedbbec74481a0ca9fea4c19250961685e.1709446767.git.liliana.prikler@gmail.com> From: Liliana Marie Prikler Date: Sat, 2 Mar 2024 17:13:32 +0100 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/emacs.scm (emacs-next-minimal): Update to 30.0.50-2.170c655. * gnu/packages/aux-files/emacs/comp-integrity.el: Adjust accordingly. --- gnu/packages/aux-files/emacs/comp-integrity.el | 5 ++++- gnu/packages/emacs.scm | 6 +++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/gnu/packages/aux-files/emacs/comp-integrity.el b/gnu/packages/aux-files/emacs/comp-integrity.el index ed6a348fed..9692d9bf97 100644 --- a/gnu/packages/aux-files/emacs/comp-integrity.el +++ b/gnu/packages/aux-files/emacs/comp-integrity.el @@ -89,7 +89,10 @@ (expect-native mouse-wheel-change-button) (expect-native advice-function-mapc) (expect-native comment-string-strip) -(expect-native obarray-make) +(if (>= emacs-major-version 30) + (expect-builtin obarray-make) + (expect-native obarray-make)) +(expect-native obarray-map) (expect-native oclosure-type) (expect-native forward-page) (expect-native sentence-end) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index e6f2b699ac..e89c6cff16 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -549,8 +549,8 @@ (define-public emacs-wide-int #~(cons "--with-wide-int" #$flags)))))) (define-public emacs-next-minimal - (let ((commit "9d27b95b263473fb41a30e3f6ea5607c99e93a61") - (revision "1")) + (let ((commit "170c6557922dad7e6e9bc0d6dadf6c080108fd42") + (revision "2")) (package (inherit emacs-minimal) (name "emacs-next-minimal") @@ -563,7 +563,7 @@ (define-public emacs-next-minimal (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 "00mwpq1msr3jij281w5piqmbwq968xr8dn9hqbf4r947ck754kn9")) + (base32 "04carva3b6h9fnlzazrsxsj41hcnjc26kxjij07l159azi40l6sk")) (patches (search-patches "emacs-next-exec-path.patch" "emacs-fix-scheme-indent-function.patch"