From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id gAFkM6AtSF86HwAA0tVLHw (envelope-from ) for ; Thu, 27 Aug 2020 22:03:12 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id uA0zL6AtSF9HFQAA1q6Kng (envelope-from ) for ; Thu, 27 Aug 2020 22:03:12 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 2D6F194053D for ; Thu, 27 Aug 2020 22:03:12 +0000 (UTC) Received: from localhost ([::1]:50878 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kBPzB-0006IK-IU for larch@yhetil.org; Thu, 27 Aug 2020 18:03:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39394) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kBPz4-0006I9-ME for guix-patches@gnu.org; Thu, 27 Aug 2020 18:03:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:32823) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kBPz4-0003Ws-DI for guix-patches@gnu.org; Thu, 27 Aug 2020 18:03:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kBPz4-0003Zp-Au for guix-patches@gnu.org; Thu, 27 Aug 2020 18:03:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#42738] [PATCH v4] gnu: emacs: Update to 27.1. Resent-From: Morgan.J.Smith@outlook.com Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 27 Aug 2020 22:03:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 42738 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 42738@debbugs.gnu.org Cc: levenson@mmer.org, dnbarbato@posteo.de, cjpeople2013@gmail.com, Morgan Smith , guix-devel@gnu.org, jackhill@jackhill.us, mike@rohleder.de Received: via spool by 42738-submit@debbugs.gnu.org id=B42738.159856577013730 (code B ref 42738); Thu, 27 Aug 2020 22:03:02 +0000 Received: (at 42738) by debbugs.gnu.org; 27 Aug 2020 22:02:50 +0000 Received: from localhost ([127.0.0.1]:44369 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kBPyr-0003ZN-KT for submit@debbugs.gnu.org; Thu, 27 Aug 2020 18:02:50 -0400 Received: from mail-dm6nam08olkn2096.outbound.protection.outlook.com ([40.92.45.96]:1600 helo=NAM04-DM6-obe.outbound.protection.outlook.com) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kBPyp-0003Z8-FH for 42738@debbugs.gnu.org; Thu, 27 Aug 2020 18:02:48 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KUL6rhdY48Olqa/H62SDrmz8JEmscutKBgxLQRxpadRwukUEAjOoe+wbOjkU6YIaWFUyEzihFKPSLZgWsGbd9d76EpjjcEpVQaRSJdPRyNT2Ppxnq3MJCfiZdeuG2lznB2mc3Q0P4N3q5m2V6OHgWJyYJs0fy0mtenqAsRKTfzit8BqM0oeJ1K133yn3STI/cE3dJDR91BN00YaokcHITdp3/z1HQPaya7+O8733dTqwUakqv+zYD2rSJOqVu6I7gCBo4DV39My8Q4lv6CPxCvaLOIav4/cZ3gnTdrM+BjsGNbbEfSQYggC9KemgGXa5G+p9Bz/OAC8B93qqHDGogA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=0neZ+YVY41jC7SpOnnXZecW/Ad1MQXPSkFtM8wDr8ho=; b=SJLyso9LEg5Sfb3YaKCsfAUQGhUJavkicN7Gt3u8aAJRarRQbClGODeBU8tUAQZuMCW/UOTogEyMg1JHEKhngtpoFjcGQZXTP/EpElP7n0INZ2CV+aUSIfT6C4oz4iOH9Poj5qTili1DZuOpCYcp9naNnHeiiaxHPk2WRGkFBYjiVtATmxsWVr29xPD2rmGyGdB20EiK0OsidIxar8t21ri+I24dAfkzhPbuPutfmnOv6wKuLYGTQUKE8CM2ukeC6fs/HjSRt3HMdOeV8lIpCF3cHuzUu4RwMxrqF7nF5DDQmmqyz4KruKQmf5oCNzWGBYMMNingwHv2giWjmOtKFg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=0neZ+YVY41jC7SpOnnXZecW/Ad1MQXPSkFtM8wDr8ho=; b=mBUVX+fdw4SSjhze+qcHpmKoADvSwjStU2Y4/alsrJb5ADll6P+yHrZwItimTJd98Km8kmkJKS7iy7yC9uosq94QcIbwQ3ps69v6piCpjBXtsoXhU105IgCPtobL4io4mR2W3q+Or0yUmhX7dHsMytyJVAEMLsCB9BPHju8heJtM1rEnoX+y24UelJouoA9Y9SCXdjsUjDUcYtq3sNpNtv8G/BCc/VjHHaMmt1CHbQmiKPwr0WwZ+LsBBl39kY9ezeSAnRMfJRy5lMo4AdhvswXBTXj0m5usfPzDGrxc561H8BmI9VospgS+3fXu90W0q8JGx/u7vBw4dYCYIPzfxw== Received: from BN8NAM04FT017.eop-NAM04.prod.protection.outlook.com (2a01:111:e400:7e85::52) by BN8NAM04HT213.eop-NAM04.prod.protection.outlook.com (2a01:111:e400:7e85::245) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3326.21; Thu, 27 Aug 2020 22:02:40 +0000 Received: from DM5PR1001MB2105.namprd10.prod.outlook.com (2a01:111:e400:7e85::4f) by BN8NAM04FT017.mail.protection.outlook.com (2a01:111:e400:7e85::392) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3326.19 via Frontend Transport; Thu, 27 Aug 2020 22:02:40 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:BF092E3B0751BABFC8AB06A57469C30DD42EE17AF56EC25C74F9C7C5FE139853; UpperCasedChecksum:54FB257B3D15F7740D497562ABC8D6680AC268E0AA5328B2BF11DED1CAB92312; SizeAsReceived:7649; Count:49 Received: from DM5PR1001MB2105.namprd10.prod.outlook.com ([fe80::cc1a:65a6:d74d:52f4]) by DM5PR1001MB2105.namprd10.prod.outlook.com ([fe80::cc1a:65a6:d74d:52f4%6]) with mapi id 15.20.3326.019; Thu, 27 Aug 2020 22:02:40 +0000 From: Morgan.J.Smith@outlook.com Date: Thu, 27 Aug 2020 17:59:36 -0400 Message-ID: X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200819040941.32696-1-jackhill@jackhill.us> References: <20200819040941.32696-1-jackhill@jackhill.us> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: YTXPR0101CA0042.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b00:1::19) To DM5PR1001MB2105.namprd10.prod.outlook.com (2603:10b6:4:2b::24) X-Microsoft-Original-Message-ID: <20200827215934.23925-1-Morgan.J.Smith@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from 255.255.255.255 (255.255.255.255) by YTXPR0101CA0042.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b00:1::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3326.19 via Frontend Transport; Thu, 27 Aug 2020 22:02:39 +0000 X-Mailer: git-send-email 2.28.0 X-Microsoft-Original-Message-ID: <20200827215934.23925-1-Morgan.J.Smith@outlook.com> X-TMN: [vzodF8eqdb2D9CyMSVQSUWzQmetebwHr] X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 49 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: f524517e-b85f-468d-b75b-08d84ad4ea71 X-MS-Exchange-SLBlob-MailProps: 7MJMDUNTCtxCBbA+2h8gbWQlKV9cILMkh6nR7C1NLvvCRn+KB7Wd9JvY9f71yPi9RBHlpX/eQ1Mv8ZTM03w1A9mmN3VEn9vS6AQwJ+C2vmjky+Acb6DAilfsYp4Ak/qwHCCqqJ4PtZS1YcM8Y30Xeq4L2IgWrcYLV65C12DAbZ6ZZjl3wAJsmGLShN1DUOCg8wK9HSCfwD5bNMDUyKSpt/v3iM3AKwfRSEetg1IM8Bpza0W/r/8Qg/KQXL8DxEAFr31WtDx/RnRIZN/nOyBZK4tDqdJQ8ilSf5m+b0j3LGbZn/JXzWnpP0kIg7T5CQQPGU9CAq0kR+XhKQonqU7wjCaQ0kC+7eYbhpO8XuwEryMoFJsEZrTR1AVUzdGrcQTY+8uF3NgmLPA3WDBpEYLj4Uk/AezDFY6rxVOLttwsSpQIBW3XwKHjH+nfn4Go/8hOQeFohwCxQel8NoF0xesb96uQGZh2hZ2hAf3JDWuWUe8IEmqfLfdguH+8Pv7tY2Vod47PKa01AbgNn1hPL6GJrXCw2BsxuwYO+hIBRLBiMy0RDtUGXcnlRu2r0HGwzgFLMGT4rWlPYqa/zk+klM6207++/cAsuuihuXb1iT7Hynd/v5dXXL7iPqEHCZ+ChT9v5uv+Og6wc/SioqoBQWyEv0oWyJjvIhiHwTx510/zCR4OzDuFlCnYC/RR5P3SRngZPW4DeRNMnynTaAddvOjFj0lumuoFDo0bcEJo3Tf1Zv7kAvSTDE0saQ== X-MS-TrafficTypeDiagnostic: BN8NAM04HT213: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: uJDrQSGadaX7lWRUeWmu5W9XD/jgwb1344BY4CBfRFgO6MXV299oaioouJngauEaLguRxMQ8qURHvOidmb2ySxtd8Hf0/Po84Hba8tBR0BKHNSkmk5rPAGr1k+SKNnPKQsVaI6grdMkrFLfCAsSqrVxaPTIEHDX5JibfF3rMzuLB7PoAk3KRZZN5nK1j9Y5zp7bkHaNCgYGWip8Mb5SZqQ== X-MS-Exchange-AntiSpam-MessageData: Or9blz+8vNJTEvdJOg6nQ5KuijdKYQzwCaQHSIiwD69b4KJQ79/nISbJNA9Jjl2MeRa8SjiY84PLpMv+FvO2HuBbZparQSf8LL9Xef9F8XxdWMv38YGLQOLzcHNVFn0uWIOVFsvd4F3HUkfE5nV7Pw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: f524517e-b85f-468d-b75b-08d84ad4ea71 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Aug 2020 22:02:40.8513 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: BN8NAM04FT017.eop-NAM04.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN8NAM04HT213 X-Spam-Score: 1.3 (+) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: 0.3 (/) X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=fail (rsa verify failed) header.d=outlook.com header.s=selector1 header.b=mBUVX+fd; dmarc=fail reason="SPF not aligned (relaxed)" header.from=outlook.com (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Spam-Score: 4.59 X-TUID: 5I67UDGRonw5 From: Morgan Smith * gnu/packages/emacs.scm (emacs): Update to 27.1. [arguments]: Add --with-cairo and --with-modules to #:configure-flags. Add restore-emacs-pdump phase. [inputs]: Add cairo, libxaw, jansson, gmp, and harfbuzz. Remove imagemagick and libxft. [native-inputs]: Add texlive. (emacs-wide-int): Mark as deprecated package. (emacs-no-x): [arguments]: Add --with-jpeg=no --with-gif=no --with-tiff=no to #:configure-flags. --- Hello! Your patch didn't build for me so I made some slight changes. I added libxaw as an input, and added some configure flags to emacs-no-x. I'm now using this patch to run Emacs 27.1 on my main machine (inadvisable I know), and my personal config is running flawlessy with the exception of emacs-clojure-mode, emacs-elisp-regs, and emacs-helpful. Hopefully this helps! Morgan gnu/packages/emacs.scm | 76 +++++++++++++++++++++++++----------------- 1 file changed, 46 insertions(+), 30 deletions(-) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index ad8d4b0606..48ae899dcf 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -58,9 +58,9 @@ #:use-module (gnu packages gtk) #:use-module (gnu packages guile) #:use-module (gnu packages image) - #:use-module (gnu packages imagemagick) #:use-module (gnu packages linux) ; alsa-lib #:use-module (gnu packages mail) ; for mailutils + #:use-module (gnu packages multiprecision) #:use-module (gnu packages ncurses) #:use-module (gnu packages pkg-config) #:use-module (gnu packages texinfo) @@ -75,15 +75,14 @@ (define-public emacs (package (name "emacs") - (version "26.3") + (version "27.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/emacs/emacs-" version ".tar.xz")) (sha256 - (base32 - "119ldpk7sgn9jlpyngv5y4z3i7bb8q3xp4p0qqi7i5nq39syd42d")) - (patches (search-patches "emacs-exec-path.patch" + (base32 "0h9f2wpmp6rb5rfwvqwv1ia1nw86h74p7hnz3vb3gjazj67i4k2a")) + (patches (search-patches "emacs27-exec-path.patch" "emacs-fix-scheme-indent-function.patch" "emacs-ignore-empty-xim-styles.patch" "emacs-source-date-epoch.patch")) @@ -94,16 +93,7 @@ ;; autoloads. (for-each delete-file (append (find-files "." "\\.elc$") - (find-files "." "loaddefs\\.el$") - ;; This is the only "autoloads" file that - ;; does not have "*loaddefs.el" name. - ;; TODO: Next time changing this package, - ;; replace the following with a call to - ;; `find-files', so that `delete-file' - ;; wouldn't error out when the file is - ;; missing, making the entire snippet field - ;; reusable as-is for `emacs-next' below. - '("eshell/esh-groups.el"))) + (find-files "." "loaddefs\\.el$"))) ;; Make sure Tramp looks for binaries in the right places on ;; remote Guix System machines, where 'getconf PATH' returns @@ -130,6 +120,9 @@ (arguments `(#:tests? #f ; no check target #:configure-flags (list "--with-modules" + ;; --with-cairo will become the default in + ;; Emacs 28 + "--with-cairo" "--disable-build-details") #:phases (modify-phases %standard-phases @@ -180,9 +173,35 @@ ;; which leads to conflicts. (delete-file (string-append lisp-dir "/subdirs.el")) ;; Byte compile the site-start files. - (emacs-byte-compile-directory lisp-dir))))))) + (emacs-byte-compile-directory lisp-dir)))) + ;; Needed when building from git + (add-before + 'reset-gzip-timestamps + 'make-compressed-files-writable + (lambda _ + (for-each make-file-writable + (find-files %output ".*\\.t?gz$")) + #t)) + ;; restore the dump file that Emacs installs somewhere in + ;; libexec/ to its original state + (add-after 'glib-or-gtk-wrap 'restore-emacs-pdmp + (lambda* (#:key outputs target #:allow-other-keys) + (let* ((libexec (string-append (assoc-ref outputs "out") + "/libexec")) + ;; each of these find-files should return one file + (pdmp (find-files libexec "^emacs\\.pdmp$")) + (pdmp-real (find-files libexec + "^\\.emacs\\.pdmp-real$"))) + (when (not (null? pdmp-real)) + (for-each (lambda (wrapper real) + (delete-file wrapper) + (rename-file real wrapper)) + pdmp pdmp-real)) + #t)))))) (inputs `(("gnutls" ,gnutls) + ("jansson" ,jansson) + ("harfbuzz" ,harfbuzz) ("ncurses" ,ncurses) ;; Avoid Emacs's limited movemail substitute that retrieves POP3 email @@ -190,13 +209,14 @@ ("mailutils" ,mailutils) ;; TODO: Add the optional dependencies. + ("cairo" ,cairo) ("libx11" ,libx11) + ("libxaw" ,libxaw) ("gtk+" ,gtk+) - ("libxft" ,libxft) ("libtiff" ,libtiff) ("giflib" ,giflib) + ("gmp" ,gmp) ("libjpeg" ,libjpeg-turbo) - ("imagemagick" ,imagemagick) ("acl" ,acl) ;; When looking for libpng `configure' links with `-lpng -lz', so we @@ -360,7 +380,8 @@ languages.") `(("guix-emacs.el" ,(search-auxiliary-file "emacs/guix-emacs.el")) ("ncurses" ,ncurses))) (native-inputs - `(("pkg-config" ,pkg-config))))) + `(("pkg-config" ,pkg-config) + ("texinfo" ,texinfo))))) (define-public emacs-xwidgets (package @@ -384,11 +405,14 @@ editor (with xwidgets support)") (synopsis "The extensible, customizable, self-documenting text editor (console only)") (build-system gnu-build-system) + (arguments + (substitute-keyword-arguments (package-arguments emacs) + ((#:configure-flags flags ''()) + `(list "--with-jpeg=no" "--with-gif=no" "--with-tiff=no")))) (inputs (fold alist-delete (package-inputs emacs) '("libx11" "gtk+" "libxft" "libtiff" "giflib" "libjpeg" - "imagemagick" "libpng" "librsvg" "libxpm" "libice" - "libsm" + "libpng" "librsvg" "libxpm" "libice" "libsm" ;; These depend on libx11, so remove them as well. "libotf" "m17n-lib" "dbus"))))) @@ -407,15 +431,7 @@ editor (without an X toolkit)" ) `(cons "--with-x-toolkit=no" ,cf))))))) (define-public emacs-wide-int - (package - (inherit emacs) - (name "emacs-wide-int") - (synopsis "The extensible, customizable, self-documenting text -editor (with wide ints)" ) - (arguments - (substitute-keyword-arguments (package-arguments emacs) - ((#:configure-flags flags) - `(cons "--with-wide-int" ,flags)))))) + (deprecated-package "emacs-wide-int" emacs)) (define-public guile-emacs (let ((commit "41120e0f595b16387eebfbf731fff70481de1b4b") -- 2.28.0