From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id gElHISGmPF/7ZwAA0tVLHw (envelope-from ) for ; Wed, 19 Aug 2020 04:10:09 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id UHBFHSGmPF9WJQAAB5/wlQ (envelope-from ) for ; Wed, 19 Aug 2020 04:10:09 +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 1D5289403EE for ; Wed, 19 Aug 2020 04:10:09 +0000 (UTC) Received: from localhost ([::1]:41918 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k8FQO-00018x-3W for larch@yhetil.org; Wed, 19 Aug 2020 00:10:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34542) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k8FQJ-000179-Hj for guix-patches@gnu.org; Wed, 19 Aug 2020 00:10:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54198) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k8FQJ-0003eI-8j for guix-patches@gnu.org; Wed, 19 Aug 2020 00:10:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1k8FQJ-0002wY-3g for guix-patches@gnu.org; Wed, 19 Aug 2020 00:10:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#42738] [PATCH v3] gnu: emacs: Update to 27.1. Resent-From: Jack Hill Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 19 Aug 2020 04:10:03 +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 Received: via spool by 42738-submit@debbugs.gnu.org id=B42738.159781019711288 (code B ref 42738); Wed, 19 Aug 2020 04:10:03 +0000 Received: (at 42738) by debbugs.gnu.org; 19 Aug 2020 04:09:57 +0000 Received: from localhost ([127.0.0.1]:37510 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k8FQD-0002w0-Di for submit@debbugs.gnu.org; Wed, 19 Aug 2020 00:09:57 -0400 Received: from minsky.hcoop.net ([104.248.1.95]:34892) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k8FQC-0002vo-Mo for 42738@debbugs.gnu.org; Wed, 19 Aug 2020 00:09:57 -0400 Received: from cpe-107-15-18-231.nc.res.rr.com ([107.15.18.231] helo=alperton.home.eronel.org) by minsky.hcoop.net with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.89) (envelope-from ) id 1k8FQ7-0006Hl-Gh for 42738@debbugs.gnu.org; Wed, 19 Aug 2020 00:09:51 -0400 From: Jack Hill Date: Wed, 19 Aug 2020 00:09:41 -0400 Message-Id: <20200819040941.32696-1-jackhill@jackhill.us> X-Mailer: git-send-email 2.28.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -1.0 (-) 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=none; dmarc=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: 3.99 X-TUID: P+RgIv7lV4ap * 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, jansson, gmp, and harfbuzz. Remove imagemagick and libxft. [native-inputs]: Add texlive. (emacs-wide-int): Mark as deprecated package. --- gnu/packages/emacs.scm | 71 ++++++++++++++++++++++++------------------ 1 file changed, 41 insertions(+), 30 deletions(-) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index ad8d4b0606..98d60dfd24 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,13 @@ ("mailutils" ,mailutils) ;; TODO: Add the optional dependencies. + ("cairo" ,cairo) ("libx11" ,libx11) ("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 +379,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 @@ -387,8 +407,7 @@ editor (console only)") (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 +426,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