From patchwork Sun Apr 10 11:23:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 38479 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 8004927BBEB; Sun, 10 Apr 2022 12:37:15 +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 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 C7AD727BBE9 for ; Sun, 10 Apr 2022 12:37:14 +0100 (BST) Received: from localhost ([::1]:36654 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ndVsW-0001wD-H2 for patchwork@mira.cbaines.net; Sun, 10 Apr 2022 07:37:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51304) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ndVsM-0001vZ-QG for guix-patches@gnu.org; Sun, 10 Apr 2022 07:37:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45662) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ndVsM-0000Xf-Hv for guix-patches@gnu.org; Sun, 10 Apr 2022 07:37:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ndVsM-00080o-FK for guix-patches@gnu.org; Sun, 10 Apr 2022 07:37:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#54829] [PATCH v2 1/3] gnu: emacs: Update to 28.1. References: In-Reply-To: Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 10 Apr 2022 11:37:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54829 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Maxime Devos , 54829@debbugs.gnu.org Received: via spool by 54829-submit@debbugs.gnu.org id=B54829.164959059330743 (code B ref 54829); Sun, 10 Apr 2022 11:37:02 +0000 Received: (at 54829) by debbugs.gnu.org; 10 Apr 2022 11:36:33 +0000 Received: from localhost ([127.0.0.1]:39555 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ndVrt-0007zi-9a for submit@debbugs.gnu.org; Sun, 10 Apr 2022 07:36:33 -0400 Received: from mail-ej1-f67.google.com ([209.85.218.67]:45687) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ndVrq-0007zD-Vo for 54829@debbugs.gnu.org; Sun, 10 Apr 2022 07:36:32 -0400 Received: by mail-ej1-f67.google.com with SMTP id lc2so4973509ejb.12 for <54829@debbugs.gnu.org>; Sun, 10 Apr 2022 04:36:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:date:subject:to:content-transfer-encoding:message-id :mime-version; bh=CQtZW/j2jU8jWol/g/kF6I5G4wNyL4sZ4U7G0Cg/sOg=; b=BM+GpQkTk88qih/PYuJC++GdhCycNWi9DimOExlx1WM1xZ96ehTCYNB2I9IsVky6vm LFc8orwyjXOBp+7H26y+mBcVHLFeyyn6E7vIlP2P/OXQrq81vC7mSyL/qPoNrAKv3LZq wk7QgwkUo4hKhVx0O9FD35gQU1KAjaevA6OW4ou6umshOQslnktSoteL5wH4Ti1JJfoI ei+bX4Dsa/2dzEQSoNgBgLdE1mHcA0sVEA+kCS4wKSUdKJeZYvJPfuyUS9WV12uduCV8 Zcp+PAEHnbOGFr/V+/7ie/oo/suCozn5ci9vzbf18ZrwPVzWH0QLv+LX3A8VcSkceGmw vImA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:date:subject:to:content-transfer-encoding :message-id:mime-version; bh=CQtZW/j2jU8jWol/g/kF6I5G4wNyL4sZ4U7G0Cg/sOg=; b=HFlDOxJuKxw6E47rkiZ0UhZU+m8F86tHxevWAgNERF9PrI50M+srYJdHbgSTeW6Q/I pfpcR6c1Imec4dD33gOOaZwSi6C/+ZS4BTsrCPcxnc4IO9aoPul5/VzkPnEoKb8rTfrj WUNX/KiTuNgeLDDpwvz1MKubeL7O7fJ2A8D8TM8WkOu2wquTOSmbSxgBOLXRLCHAaUx5 EE/a0/IDODyfMmXN8J+Zn144Cizfyb9sBnrRcRCzgQnowiX24DALD/GEFHuZd94221Uz lv7LL2fH4zWmyIdexAy7ELqSMMzHdQ/wAVWIbVljt/tLbT/q1IBofQtpPpht8oWw52B/ xPWQ== X-Gm-Message-State: AOAM530WX0VDuY/qtzTOMI8GQpdR9biXhGL/uPDPX1AeG9QzVrvM1C+S 6LT02Wbh5t6D6TpgmFHB2D0= X-Google-Smtp-Source: ABdhPJwcMRAtnGBnKKsZYplscIxfp6OYDdmrh9SsvzjrQ0jFVqI81snwjKIys65iVc9qY5t5wlepNQ== X-Received: by 2002:a17:906:c14c:b0:6e8:6526:7647 with SMTP id dp12-20020a170906c14c00b006e865267647mr5078798ejc.257.1649590584892; Sun, 10 Apr 2022 04:36:24 -0700 (PDT) Received: from nijino.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id q16-20020a056402519000b0041d77e14005sm913302edd.82.2022.04.10.04.36.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 10 Apr 2022 04:36:24 -0700 (PDT) From: Liliana Marie Prikler Date: Sun, 10 Apr 2022 13:23:43 +0200 Message-ID: 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/emacs.scm (emacs): Update to 28.1 * gnu/packages/patches/emacs-exec-path.patch: Adjust accordingly. * gnu/packages/patches/emacs-ignore-empty-xim-styles.patch: Delete file. * gnu/local.mk: Remove it here. --- gnu/local.mk | 1 - gnu/packages/emacs.scm | 5 ++-- gnu/packages/patches/emacs-exec-path.patch | 12 +++++----- .../emacs-ignore-empty-xim-styles.patch | 24 ------------------- 4 files changed, 8 insertions(+), 34 deletions(-) delete mode 100644 gnu/packages/patches/emacs-ignore-empty-xim-styles.patch diff --git a/gnu/local.mk b/gnu/local.mk index a44815bdbb..9d6d81b3e0 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1028,7 +1028,6 @@ dist_patch_DATA = \ %D%/packages/patches/elogind-revert-polkit-detection.patch \ %D%/packages/patches/emacs-exec-path.patch \ %D%/packages/patches/emacs-fix-scheme-indent-function.patch \ - %D%/packages/patches/emacs-ignore-empty-xim-styles.patch \ %D%/packages/patches/emacs-json-reformat-fix-tests.patch \ %D%/packages/patches/emacs-highlight-stages-add-gexp.patch \ %D%/packages/patches/emacs-hyperbole-toggle-messaging.patch \ diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index bfb3f9790e..7d791250d2 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -79,17 +79,16 @@ (define-module (gnu packages emacs) (define-public emacs (package (name "emacs") - (version "27.2") + (version "28.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/emacs/emacs-" version ".tar.xz")) (sha256 (base32 - "1ff182gjw9wqsbx1kj5gl2r5pbqhp4ar54g04j33fgz6g17cr9xl")) + "1qbmmmhnjhn4lvzsnyk7l5ganbi6wzbm38jc1a7hhyh3k78b7c98")) (patches (search-patches "emacs-exec-path.patch" "emacs-fix-scheme-indent-function.patch" - "emacs-ignore-empty-xim-styles.patch" "emacs-source-date-epoch.patch")) (modules '((guix build utils))) (snippet diff --git a/gnu/packages/patches/emacs-exec-path.patch b/gnu/packages/patches/emacs-exec-path.patch index 7303599df1..9a76b0237d 100644 --- a/gnu/packages/patches/emacs-exec-path.patch +++ b/gnu/packages/patches/emacs-exec-path.patch @@ -4,13 +4,13 @@ with things like GCC being referenced. --- a/lisp/loadup.el +++ b/lisp/loadup.el -@@ -481,7 +481,8 @@ lost after dumping"))) +@@ -530,7 +530,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)))) +- (t (error "Unrecognized dump mode %s" dump-mode))))) ++ (t (error "Unrecognized dump mode %s" dump-mode)))) + (exec-path nil)) - (message "Dumping under the name %s" output) - (condition-case () - (delete-file output) + (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-ignore-empty-xim-styles.patch b/gnu/packages/patches/emacs-ignore-empty-xim-styles.patch deleted file mode 100644 index 398e65bdc8..0000000000 --- a/gnu/packages/patches/emacs-ignore-empty-xim-styles.patch +++ /dev/null @@ -1,24 +0,0 @@ -Fix contributed upstream here: -https://debbugs.gnu.org/cgi/bugreport.cgi?bug=42694. - -Index: emacs-26.3/src/xfns.c -=================================================================== ---- emacs-26.3.orig/src/xfns.c -+++ emacs-26.3/src/xfns.c -@@ -2628,6 +2628,8 @@ xic_free_xfontset (struct frame *f) - static XIMStyle - best_xim_style (XIMStyles *xim) - { -+ if (xim == NULL) goto out; -+ - int i, j; - int nr_supported = ARRAYELTS (supported_xim_styles); - -@@ -2636,6 +2638,7 @@ best_xim_style (XIMStyles *xim) - if (supported_xim_styles[i] == xim->supported_styles[j]) - return supported_xim_styles[i]; - -+ out: - /* Return the default style. */ - return XIMPreeditNothing | XIMStatusNothing; - }