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: 38591 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 E228F27BBED; Thu, 14 Apr 2022 20:48:29 +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 4725C27BBEA for ; Thu, 14 Apr 2022 20:48:29 +0100 (BST) Received: from localhost ([::1]:39514 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nf5S8-0008Fu-DX for patchwork@mira.cbaines.net; Thu, 14 Apr 2022 15:48:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52188) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nf5Ri-0008Dk-7K for guix-patches@gnu.org; Thu, 14 Apr 2022 15:48:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:35294) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nf5Rh-0005Hj-Sk for guix-patches@gnu.org; Thu, 14 Apr 2022 15:48:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nf5Rh-0001WA-P2 for guix-patches@gnu.org; Thu, 14 Apr 2022 15:48:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#54829] [PATCH v3 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: Thu, 14 Apr 2022 19:48:01 +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: 54829@debbugs.gnu.org Cc: Maxime Devos , zimoun Received: via spool by 54829-submit@debbugs.gnu.org id=B54829.16499656665727 (code B ref 54829); Thu, 14 Apr 2022 19:48:01 +0000 Received: (at 54829) by debbugs.gnu.org; 14 Apr 2022 19:47:46 +0000 Received: from localhost ([127.0.0.1]:57420 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nf5RS-0001UJ-2q for submit@debbugs.gnu.org; Thu, 14 Apr 2022 15:47:46 -0400 Received: from mail-ed1-f65.google.com ([209.85.208.65]:42896) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nf5RP-0001TO-Bv for 54829@debbugs.gnu.org; Thu, 14 Apr 2022 15:47:44 -0400 Received: by mail-ed1-f65.google.com with SMTP id t25so7654631edt.9 for <54829@debbugs.gnu.org>; Thu, 14 Apr 2022 12:47:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:date:subject:to:cc:content-transfer-encoding:message-id :mime-version; bh=47LkbGbbD+vZWFCdP0Cz1ewJtvZhKMkXN8N3Ma298KY=; b=Mn9ydIAy7lpWkDuwgbIWune+gabfacjaWJWxtr8Rc9oC7Btn09iHEA0StMZwDBjX9C rmOVIFNmuuZ4vdYuZvQRQu7qFpq5ZS76OY1BiSztfSI47liMHLvuz4pk6ErSo6etQNvU 1nUJjJFCGHLOTqCeeHSdfqm25qhlkU2GGs9gfWC6vjDyKnax1lzaReLK6GO/7go9/xsh 7DqjsilMXWj+4X0n9TN6BCLOb2910kb013eQiKsouZ3in9GIdX5Oo1p87gSkfYXYy11b EfPtDcuHBtE5D+vM4U6S17sdu1QLBtMaFaoakud/nstnss0pooMAA65rKWGqRwTJpp9w D4pg== 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:cc :content-transfer-encoding:message-id:mime-version; bh=47LkbGbbD+vZWFCdP0Cz1ewJtvZhKMkXN8N3Ma298KY=; b=wX9Co2oslVQx/XRCbAXaeEhcTXBHIuh5M6tTcCxnEqNaykch/N2WUE3snUN83NQgtu D2hNZHe4YKTmXBR9GaB4/Qi2qOUveuAQixoFHuqYsATmbKxyUyCgbrZFMk3E1C8H3wxc 4iOIUhx44mZo6YTT7kxii/vR6oIJCbKDz/gaclfaVNdiMOgxzUbV5YQ47pvj4JuGNiq4 5Qct30oZxgejOw2t0ftqhdwt4bsNUL283nF0UwoyH+RlpI/DXwl6RPg9MFxebiEde8sP bxi6IX/awc8+XdVN8pAkblJPSTAnNuYw2UCqmWCkPfEW+bUsaMXr3/YorB9B1/TS3fdY cCeg== X-Gm-Message-State: AOAM531fiZ/wk0f3nRKfaxVv+kJpYRWkwnAPB6bSRUMoIi7pS8i/Oirs EdNHQjx5dpsWM44hMROtCykKX036Qt4= X-Google-Smtp-Source: ABdhPJww9Eqm1ZYRtJb5XkbblBcRttS862nikr6N28aK/2mDsbdq7kAUUkX+hh6awpeCReahkPqf6g== X-Received: by 2002:a05:6402:910:b0:41d:9622:3297 with SMTP id g16-20020a056402091000b0041d96223297mr4701188edz.393.1649965657318; Thu, 14 Apr 2022 12:47:37 -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 u19-20020a17090617d300b006cea86ca384sm953906eje.40.2022.04.14.12.47.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Apr 2022 12:47:36 -0700 (PDT) From: Liliana Marie Prikler Date: Sun, 10 Apr 2022 13:23:43 +0200 Message-ID: <8e120cbce7a52dc7df88f2b53c0c5802439fa4d5.camel@gmail.com> 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 base-commit: 5059e7f01e1d299a2a52b1649251fa49f1992385 diff --git a/gnu/local.mk b/gnu/local.mk index 70133e6502..585a605138 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1029,7 +1029,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; - }