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 QCGqMFfJLF8nMQAA0tVLHw (envelope-from ) for ; Fri, 07 Aug 2020 03:24:07 +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 WN6NLFfJLF+OKwAAB5/wlQ (envelope-from ) for ; Fri, 07 Aug 2020 03:24:07 +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 4A2859404D3 for ; Fri, 7 Aug 2020 03:24:07 +0000 (UTC) Received: from localhost ([::1]:44552 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k3szG-0001dM-Ak for larch@yhetil.org; Thu, 06 Aug 2020 23:24:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50380) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k3szC-0001d1-Sm for guix-patches@gnu.org; Thu, 06 Aug 2020 23:24:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:43840) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k3szC-0001eM-I4 for guix-patches@gnu.org; Thu, 06 Aug 2020 23:24:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1k3szC-0006XP-DB for guix-patches@gnu.org; Thu, 06 Aug 2020 23:24:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#42738] [PATCH] gnu: emacs: Update to 27.1-rc1. References: In-Reply-To: Resent-From: Jack Hill Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 07 Aug 2020 03:24: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 Received: via spool by 42738-submit@debbugs.gnu.org id=B42738.159677060325083 (code B ref 42738); Fri, 07 Aug 2020 03:24:02 +0000 Received: (at 42738) by debbugs.gnu.org; 7 Aug 2020 03:23:23 +0000 Received: from localhost ([127.0.0.1]:55386 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k3syZ-0006WU-C7 for submit@debbugs.gnu.org; Thu, 06 Aug 2020 23:23:23 -0400 Received: from minsky.hcoop.net ([104.248.1.95]:49506) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k3syW-0006WF-Nb for 42738@debbugs.gnu.org; Thu, 06 Aug 2020 23:23:21 -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 1k3syR-0002Mn-AS for 42738@debbugs.gnu.org; Thu, 06 Aug 2020 23:23:15 -0400 From: Jack Hill Date: Thu, 6 Aug 2020 23:23:02 -0400 Message-Id: <20200807032302.27928-1-jackhill@jackhill.us> X-Mailer: git-send-email 2.28.0 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: Qcj9BXd0RTVq * gnu/packages/emacs.scm (emacs): Update to 27.1-rc1. [arguments]: Add --with-harfbuzz and --with-modules to #configure-flags. Add restore-emacs-pdump phase. [inputs]: Add jansson and harfbuzz. Remove imagemagick. --- gnu/packages/emacs.scm | 68 ++++++++++++++++++++++++++---------------- 1 file changed, 43 insertions(+), 25 deletions(-) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index ad8d4b0606..b809e90690 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -58,7 +58,6 @@ #: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 ncurses) @@ -75,18 +74,18 @@ (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" + (method git-fetch) + (uri (git-reference + (url "https://git.savannah.gnu.org/git/emacs.git") + (commit "emacs-27.1-rc1"))) + (patches (search-patches "emacs27-exec-path.patch" "emacs-fix-scheme-indent-function.patch" "emacs-ignore-empty-xim-styles.patch" "emacs-source-date-epoch.patch")) + (sha256 + (base32 "1vyw8bpairxfxim931xg3pwyl3afh2mmjxa2i1igsaiaaxyssbc6")) (modules '((guix build utils))) (snippet '(with-directory-excursion "lisp" @@ -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 @@ -129,7 +119,8 @@ (build-system glib-or-gtk-build-system) (arguments `(#:tests? #f ; no check target - #:configure-flags (list "--with-modules" + #:configure-flags (list "--with-harfbuzz" + "--with-modules" "--disable-build-details") #:phases (modify-phases %standard-phases @@ -180,9 +171,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 @@ -196,7 +213,6 @@ ("libtiff" ,libtiff) ("giflib" ,giflib) ("libjpeg" ,libjpeg-turbo) - ("imagemagick" ,imagemagick) ("acl" ,acl) ;; When looking for libpng `configure' links with `-lpng -lz', so we @@ -218,6 +234,7 @@ (native-inputs `(("guix-emacs.el" ,(search-auxiliary-file "emacs/guix-emacs.el")) ("pkg-config" ,pkg-config) + ("autoconf" ,autoconf) ;Needed when building from git ("texinfo" ,texinfo))) (native-search-paths @@ -360,7 +377,9 @@ languages.") `(("guix-emacs.el" ,(search-auxiliary-file "emacs/guix-emacs.el")) ("ncurses" ,ncurses))) (native-inputs - `(("pkg-config" ,pkg-config))))) + `(("pkg-config" ,pkg-config) + ("autoconf" ,autoconf) ;Needed when building from git + ("texinfo" ,texinfo))))) (define-public emacs-xwidgets (package @@ -387,8 +406,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"))))) -- 2.28.0