From patchwork Sat Aug 19 06:46:00 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: 1735 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 B182427BBE9; Sat, 19 Aug 2023 07:49:26 +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 D087227BBE2 for ; Sat, 19 Aug 2023 07:49:24 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qXFlh-0006xt-1A; Sat, 19 Aug 2023 02:49:05 -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 1qXFle-0006xc-J7 for guix-patches@gnu.org; Sat, 19 Aug 2023 02:49:02 -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 1qXFle-0004oC-9P for guix-patches@gnu.org; Sat, 19 Aug 2023 02:49:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qXFle-00029D-A7; Sat, 19 Aug 2023 02:49:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65376] [PATCH emacs-team 0/7] Fix some more builds Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: andrew@trop.in, liliana.prikler@gmail.com, guix-patches@gnu.org Resent-Date: Sat, 19 Aug 2023 06:49:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 65376 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65376@debbugs.gnu.org Cc: andrew@trop.in, liliana.prikler@gmail.com X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: andrew@trop.in, liliana.prikler@gmail.com Received: via spool by submit@debbugs.gnu.org id=B.16924276918069 (code B ref -1); Sat, 19 Aug 2023 06:49:02 +0000 Received: (at submit) by debbugs.gnu.org; 19 Aug 2023 06:48:11 +0000 Received: from localhost ([127.0.0.1]:49261 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qXFko-000264-R7 for submit@debbugs.gnu.org; Sat, 19 Aug 2023 02:48:11 -0400 Received: from lists.gnu.org ([2001:470:142::17]:32858) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qXFkm-00025C-TB for submit@debbugs.gnu.org; Sat, 19 Aug 2023 02:48:09 -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 1qXFka-0006tY-W9 for guix-patches@gnu.org; Sat, 19 Aug 2023 02:48:00 -0400 Received: from mail-ed1-x543.google.com ([2a00:1450:4864:20::543]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qXFkY-0004kG-S0 for guix-patches@gnu.org; Sat, 19 Aug 2023 02:47:56 -0400 Received: by mail-ed1-x543.google.com with SMTP id 4fb4d7f45d1cf-5280ef23593so1945665a12.3 for ; Fri, 18 Aug 2023 23:47:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1692427672; x=1693032472; h=to:content-transfer-encoding:mime-version:subject:date:from :message-id:from:to:cc:subject:date:message-id:reply-to; bh=pBgcFpWU6/De+UCRLG72CsjFh3g2ORbdQr0VbPU3EEI=; b=Oz1iyJAgd9blPHen2bhLri+3HIqnfmkitvZwFxA3zjoiWsqw/evLaRHpfjRGhOv7mJ L5TFZMaiueEGl8LWPJetFSuTWxf8SFE3j1G2uRzDNE7o2mNLUtS/DZoRqxrU2Pf0veVr VjIVYCA3TO9rhXt+Lo6Y4h3hgmpLqet1lmLzoG4ZTopRpBglQQmvLCS0E2nORy9BY6pO oDyQOTwci2gAk+qUPixSBNtM9UrlXIACSpNkPrtxxYWQYn4PI9IAU0Pc0H1xAFyNVI8N kwxFLJk2RbPovO6AsKVlFpwS9AoG0vER8w5lPG5H7eI6mdbWhvw50saD7u4B51WtZENR 5NYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692427672; x=1693032472; 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=pBgcFpWU6/De+UCRLG72CsjFh3g2ORbdQr0VbPU3EEI=; b=KNXQDo9D5QeeoxuewD/wM1hKbGSV8FRjRE4qaHirZWReTB66NbnSc7JOe3Grh+xkwu 8wL2/j6y9s1oV2IyUMYZI9C5G+is4bO2j6yZvv9qSQesuWn34zh23DXtmUuAMXjeoKjJ 9gIPwlvmdrZDdBiznJ18Rn/3Dua/1wZrfMiaeBHa2MCCmXHKfIatBP9SVHNDmXEvrhNM 01Cv1+iSqTwX3vFikKIBSFZt1y1HWj6GY+/8nna83QdJKrZR+xIIJJIoJv6LtL2QvJH8 +qSJtfWvv9KNcHu6ljMSghiUkOsPhDGaBi0WicgQ0u1e7cZl4278YrqC9WaIL8mURvo7 NxMw== X-Gm-Message-State: AOJu0Yy4e5LMAN9QMyk75FEGl6Ha7nyUBP6j+GyxLpuScdQ0FFZYmRmL 4YklvBl8sa6cxORYMgkyqCqgnLMbjHyDaQ== X-Google-Smtp-Source: AGHT+IHeEz31gOiyy2ivvozT6yB+sQARHL3YN+wYCL/2fT8QV05L0KiC1OFwVnPt8ChfcKVEyTm6ZA== X-Received: by 2002:a17:906:8a68:b0:9a1:64b9:d374 with SMTP id hy8-20020a1709068a6800b009a164b9d374mr883230ejc.68.1692427671974; Fri, 18 Aug 2023 23:47:51 -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 lf26-20020a170907175a00b0098733a40bb7sm2167129ejc.155.2023.08.18.23.47.50 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Aug 2023 23:47:51 -0700 (PDT) Message-ID: From: Liliana Marie Prikler Date: Sat, 19 Aug 2023 08:46:00 +0200 MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::543; envelope-from=liliana.prikler@gmail.com; helo=mail-ed1-x543.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-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 Hi Andrew, hi other Guixers Since we're planning to make Emacs 29 the new default soon™, we should probably take care of some packages that fail to build. Here's a batch to do so. Cheers Liliana Marie Prikler (7): gnu: emacs-all-the-icons: Honour #:tests? gnu: emacs-haskell-mode: Update to 17.4. gnu: emacs-helpful: Update to 0.21. guix: emacs-utils: Add ert-number-tests. gnu: emacs-libgit: Fix build. gnu: emacs-all-the-icons: Fix build. gnu: emacs-yasnippet: Fix build. gnu/local.mk | 4 + gnu/packages/emacs-xyz.scm | 252 +++++++++--------- ...cs-all-the-icons-remove-duplicate-rs.patch | 21 ++ ...acs-haskell-mode-no-redefine-builtin.patch | 75 ++++++ .../patches/emacs-helpful-fix-tests.patch | 28 ++ ...acs-yasnippet-fix-empty-snippet-next.patch | 59 ++++ .../patches/emacs-yasnippet-fix-tests.patch | 14 + guix/build/emacs-utils.scm | 14 + 8 files changed, 345 insertions(+), 122 deletions(-) create mode 100644 gnu/packages/patches/emacs-all-the-icons-remove-duplicate-rs.patch create mode 100644 gnu/packages/patches/emacs-haskell-mode-no-redefine-builtin.patch create mode 100644 gnu/packages/patches/emacs-helpful-fix-tests.patch create mode 100644 gnu/packages/patches/emacs-yasnippet-fix-empty-snippet-next.patch base-commit: d58c6e25ff3d1e70fd9b0e07bdad1b335de8a979 prerequisite-patch-id: db4b84876b1a475e9e7846dd33ecd6d33dc14907