From patchwork Sat Apr 9 08:15:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 38477 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 F071327BBE9; Sun, 10 Apr 2022 00:25:16 +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 4058327BBEA for ; Sun, 10 Apr 2022 00:25:13 +0100 (BST) Received: from localhost ([::1]:55620 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ndKS8-0001eo-Ci for patchwork@mira.cbaines.net; Sat, 09 Apr 2022 19:25:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54544) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ndKRy-0001eJ-U8 for guix-patches@gnu.org; Sat, 09 Apr 2022 19:25:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45050) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ndKRy-0001gH-JK for guix-patches@gnu.org; Sat, 09 Apr 2022 19:25:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ndKRy-0007WW-Eo for guix-patches@gnu.org; Sat, 09 Apr 2022 19:25:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#54829] [PATCH 1/2] 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: Sat, 09 Apr 2022 23:25: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: 54829@debbugs.gnu.org Received: via spool by 54829-submit@debbugs.gnu.org id=B54829.164954664528841 (code B ref 54829); Sat, 09 Apr 2022 23:25:02 +0000 Received: (at 54829) by debbugs.gnu.org; 9 Apr 2022 23:24:05 +0000 Received: from localhost ([127.0.0.1]:38945 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ndKR2-0007V1-1e for submit@debbugs.gnu.org; Sat, 09 Apr 2022 19:24:05 -0400 Received: from mail-ej1-f66.google.com ([209.85.218.66]:37662) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ndKQz-0007UV-JS for 54829@debbugs.gnu.org; Sat, 09 Apr 2022 19:24:02 -0400 Received: by mail-ej1-f66.google.com with SMTP id bg10so24021094ejb.4 for <54829@debbugs.gnu.org>; Sat, 09 Apr 2022 16:24:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:date:subject:mime-version:to:content-transfer-encoding :message-id; bh=lYw7zvSI8oo+co2NBf0JspBnP38668g1sGoyPK4ayp8=; b=B/wt2rtM38WRki/a4NDXf53sxnEl4pzQd+OJ9MzOiOI6FMe9P7DGbck7Yy7O1HM+od 3Ekoy3AFhYMkFwzvn3sScdjnkQwIYmcVYV8shzTYzNl41lZGZSeeggalDxoNsQH8O1Bx lt0cuiKiSt2rMYvNcPsLNybwy2Z3ekvbX1uRFJU9COTCbgx0LwMzVtc8I9uCDKsb2+W9 Lf29lX5yq3l+cKYBLnuIxxtBU4/mV9EsQRVC7ZAbRunwXqSttS/JPrXMPOtu9CwgZjQF 8b+lBfmy4iWsOMS7GLlaQhtH31pdM4LZCWCd6HjWRAhuV+bpHfVIn65Ho+V5m9HkVTlF EEGg== 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:mime-version:to :content-transfer-encoding:message-id; bh=lYw7zvSI8oo+co2NBf0JspBnP38668g1sGoyPK4ayp8=; b=4+qCjV+XPKsVNrpQ9Z+zZACBCx2zyKCsfcb8Z8ghv98clsMsVQ77O5lIUIJr+0VViq wjTFFf7tN/roZmvFoi99nMfnZP1K9YZent5H8gWYMlOhdK4+q97CnF8+IUr6ym+VsNtt VWNHNjHMQzn2s+ubfqgTetupPiIqlGoxkTCvZ4jMx6F19Tx+tgEdgQdY509dNhH7ku43 8V0fUR5l9g+oS/woZLC8Ah1NRThNOD/EyQQWes6pnGKptdYmrtHsEijkcVUirpAplJZ1 jX3yfaVr2jRyqLnXQ15KTVQ17hkanCGMPBBtCjbE34INgWDuhrLwA5RV3RChLXRm+v3Q xzhQ== X-Gm-Message-State: AOAM533HMQF11Fnyij716SuZQKCeTg+XYwn/FnUpZhWQ8axKXvoSmfgS 9500Mgz5uuYwHjO6VdLpiiiL3dQxfYE= X-Google-Smtp-Source: ABdhPJzBXuRziPC4WzDzGvyQkpbXv/naRI6F1xpN61sdbr9oC8vwGR5NduOuUBz9TcC3nsEWLZ/lZw== X-Received: by 2002:a17:906:2bc5:b0:6cd:e676:3624 with SMTP id n5-20020a1709062bc500b006cde6763624mr24380512ejg.277.1649546635409; Sat, 09 Apr 2022 16:23:55 -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 c5-20020a170906d18500b006ce371f09d4sm10093054ejz.57.2022.04.09.16.23.54 for <54829@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 09 Apr 2022 16:23:54 -0700 (PDT) From: Liliana Marie Prikler Date: Sat, 9 Apr 2022 10:15:03 +0200 MIME-Version: 1.0 Message-ID: <3bb794afd978e935896fe3df65cee98dbf940224.camel@gmail.com> 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 [origin]: Drop ‘emacs-ignore-empty-xim-styles.patch’. [arguments]: Convert to list of G-Expressions. Use search-input-file instead of input labels. Inline reference to auxiliary files. [inputs, native-inputs]: Drop labels. * gnu/packages/patches/emacs-exec-path.patch: Update accordingly. * gnu/packages/patches/emacs-ignore-empty-xim-styles.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it from here. --- gnu/local.mk | 1 - gnu/packages/emacs.scm | 330 +++++++++--------- gnu/packages/patches/emacs-exec-path.patch | 12 +- .../emacs-ignore-empty-xim-styles.patch | 24 -- 4 files changed, 169 insertions(+), 198 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..894b9cd7de 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -41,6 +41,7 @@ (define-module (gnu packages emacs) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) + #:use-module (guix gexp) #:use-module (guix download) #:use-module (guix git-download) #:use-module (guix build-system gnu) @@ -79,17 +80,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 @@ -124,179 +124,175 @@ (define-public emacs #t)))) (build-system glib-or-gtk-build-system) (arguments - `(#:tests? #f ; no check target - #:configure-flags (list "--with-modules" - "--with-cairo" - "--disable-build-details") - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-program-file-names - (lambda* (#:key inputs #:allow-other-keys) - (substitute* '("src/callproc.c" - "lisp/term.el" - "lisp/htmlfontify.el" - "lisp/textmodes/artist.el" - "lisp/progmodes/sh-script.el") - (("\"/bin/sh\"") - (format #f "~s" (which "sh")))) - (substitute* "lisp/doc-view.el" - (("\"(gs|dvipdf|ps2pdf)\"" all what) - (let ((ghostscript (assoc-ref inputs "ghostscript"))) - (if ghostscript - (string-append "\"" ghostscript "/bin/" what "\"") - all))) - (("\"(pdftotext)\"" all what) - (let ((poppler (assoc-ref inputs "poppler"))) - (if poppler - (string-append "\"" poppler "/bin/" what "\"") - all)))) - ;; match ".gvfs-fuse-daemon-real" and ".gvfsd-fuse-real" - ;; respectively when looking for GVFS processes. - (substitute* "lisp/net/tramp-gvfs.el" - (("\\(tramp-compat-process-running-p \"(.*)\"\\)" all process) - (format #f "(or ~a (tramp-compat-process-running-p ~s))" - all (string-append "." process "-real")))) - #t)) - (add-before 'configure 'fix-/bin/pwd - (lambda _ - ;; Use `pwd', not `/bin/pwd'. - (substitute* (find-files "." "^Makefile\\.in$") - (("/bin/pwd") - "pwd")) - #t)) - (add-after 'install 'install-site-start - ;; Use 'guix-emacs' in "site-start.el", which is used autoload the - ;; Elisp packages found in EMACSLOADPATH. - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (lisp-dir (string-append out "/share/emacs/site-lisp")) - (emacs (string-append out "/bin/emacs"))) + (list + #:tests? #f ; no check target + #:configure-flags #~(list "--with-modules" + "--with-cairo" + "--disable-build-details") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-program-file-names + (lambda* (#:key inputs #:allow-other-keys) + (substitute* '("src/callproc.c" + "lisp/term.el" + "lisp/htmlfontify.el" + "lisp/textmodes/artist.el" + "lisp/progmodes/sh-script.el") + (("\"/bin/sh\"") + (format #f "~s" (which "sh")))) + (substitute* "lisp/doc-view.el" + (("\"(gs|dvipdf|ps2pdf|pdftotext)\"" all what) + (let ((replacement (search-input-file + inputs + (string-append "/bin/" what)))) + (if replacement + (string-append "\"" replacement "\"") + all)))) + ;; match ".gvfs-fuse-daemon-real" and ".gvfsd-fuse-real" + ;; respectively when looking for GVFS processes. + (substitute* "lisp/net/tramp-gvfs.el" + (("\\(tramp-compat-process-running-p \"(.*)\"\\)" all process) + (format #f "(or ~a (tramp-compat-process-running-p ~s))" + all (string-append "." process "-real")))))) + (add-before 'configure 'fix-/bin/pwd + (lambda _ + ;; Use `pwd', not `/bin/pwd'. + (substitute* (find-files "." "^Makefile\\.in$") + (("/bin/pwd") + "pwd")))) + (add-after 'install 'install-site-start + ;; Use 'guix-emacs' in "site-start.el", which is used autoload the + ;; Elisp packages found in EMACSLOADPATH. + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (lisp-dir (string-append out "/share/emacs/site-lisp")) + (emacs (string-append out "/bin/emacs"))) - ;; This is duplicated from emacs-utils to prevent coupling. - (define* (emacs-byte-compile-directory dir) - (let ((expr `(progn - (setq byte-compile-debug t) - (byte-recompile-directory - (file-name-as-directory ,dir) 0 1)))) - (invoke emacs "--quick" "--batch" - (format #f "--eval=~s" expr)))) + ;; This is duplicated from emacs-utils to prevent coupling. + (define* (emacs-byte-compile-directory dir) + (let ((expr `(progn + (setq byte-compile-debug t) + (byte-recompile-directory + (file-name-as-directory ,dir) 0 1)))) + (invoke emacs "--quick" "--batch" + (format #f "--eval=~s" expr)))) - (copy-file (assoc-ref inputs "guix-emacs.el") - (string-append lisp-dir "/guix-emacs.el")) - (with-output-to-file (string-append lisp-dir "/site-start.el") - (lambda () - (display - (string-append - "(when (require 'guix-emacs nil t)\n" - " (guix-emacs-autoload-packages)\n" - " (advice-add 'package-load-all-descriptors" - " :after #'guix-emacs-load-package-descriptors))")))) - ;; Remove the extraneous subdirs.el file, as it causes Emacs to - ;; add recursively all the the sub-directories of a profile's - ;; share/emacs/site-lisp union when added to EMACSLOADPATH, - ;; which leads to conflicts. - (delete-file (string-append lisp-dir "/subdirs.el")) - ;; Byte compile the site-start files. - (emacs-byte-compile-directory lisp-dir)) - #t)) - (add-after 'glib-or-gtk-wrap 'restore-emacs-pdmp - ;; restore the dump file that Emacs installs somewhere in - ;; libexec/ to its original state - (lambda* (#:key outputs target #:allow-other-keys) - (let* ((libexec (string-append (assoc-ref outputs "out") - "/libexec")) - ;; each of these ought to only match a single file, - ;; but even if not (find-files) sorts by string<, - ;; so the Nth element in one maps to the Nth element of - ;; the other - (pdmp (find-files libexec "\\.pdmp$")) - (pdmp-real (find-files libexec "\\.pdmp-real$"))) - (for-each rename-file pdmp-real pdmp)))) - (add-after 'glib-or-gtk-wrap 'strip-double-wrap - (lambda* (#:key outputs #:allow-other-keys) - ;; Directly copy emacs-X.Y to emacs, so that it is not wrapped - ;; twice. This also fixes a minor issue, where WMs would not be - ;; able to track emacs back to emacs.desktop. - (with-directory-excursion (assoc-ref outputs "out") - (copy-file - (car (find-files "bin" "^emacs-([0-9]+\\.)+[0-9]+$")) - "bin/emacs") - #t))) - (add-after 'strip-double-wrap 'wrap-emacs-paths - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (lisp-dirs (find-files (string-append out "/share/emacs") - "^lisp$" - #:directories? #t))) - (for-each - (lambda (prog) - (wrap-program prog - ;; emacs-next and variants rely on uname being in PATH for - ;; Tramp. Tramp paths can't be hardcoded, because they - ;; need to be portable. - `("PATH" suffix - ,(map (lambda (in) (string-append in "/bin")) - (list (assoc-ref inputs "gzip") - (assoc-ref inputs "coreutils")))) - `("EMACSLOADPATH" suffix ,lisp-dirs))) - (find-files (string-append out "/bin") - ;; Matches versioned and unversioned emacs binaries. - ;; We don't patch emacsclient, because it takes its - ;; environment variables from emacs. - ;; Likewise, we don't need to patch helper binaries - ;; like etags, ctags or ebrowse. - "^emacs(-[0-9]+(\\.[0-9]+)*)?$")))))))) + (copy-file #$(local-file + (search-auxiliary-file "emacs/guix-emacs.el")) + (string-append lisp-dir "/guix-emacs.el")) + (with-output-to-file (string-append lisp-dir "/site-start.el") + (lambda () + (display + (string-append + "(when (require 'guix-emacs nil t)\n" + " (guix-emacs-autoload-packages)\n" + " (advice-add 'package-load-all-descriptors" + " :after #'guix-emacs-load-package-descriptors))")))) + ;; Remove the extraneous subdirs.el file, as it causes Emacs to + ;; add recursively all the the sub-directories of a profile's + ;; share/emacs/site-lisp union when added to EMACSLOADPATH, + ;; which leads to conflicts. + (delete-file (string-append lisp-dir "/subdirs.el")) + ;; Byte compile the site-start files. + (emacs-byte-compile-directory lisp-dir)) + #t)) + (add-after 'glib-or-gtk-wrap 'restore-emacs-pdmp + ;; restore the dump file that Emacs installs somewhere in + ;; libexec/ to its original state + (lambda* (#:key outputs target #:allow-other-keys) + (let* ((libexec (string-append (assoc-ref outputs "out") + "/libexec")) + ;; each of these ought to only match a single file, + ;; but even if not (find-files) sorts by string<, + ;; so the Nth element in one maps to the Nth element of + ;; the other + (pdmp (find-files libexec "\\.pdmp$")) + (pdmp-real (find-files libexec "\\.pdmp-real$"))) + (for-each rename-file pdmp-real pdmp)))) + (add-after 'glib-or-gtk-wrap 'strip-double-wrap + (lambda* (#:key outputs #:allow-other-keys) + ;; Directly copy emacs-X.Y to emacs, so that it is not wrapped + ;; twice. This also fixes a minor issue, where WMs would not be + ;; able to track emacs back to emacs.desktop. + (with-directory-excursion (assoc-ref outputs "out") + (copy-file + (car (find-files "bin" "^emacs-([0-9]+\\.)+[0-9]+$")) + "bin/emacs") + #t))) + (add-after 'strip-double-wrap 'wrap-emacs-paths + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (lisp-dirs (find-files (string-append out "/share/emacs") + "^lisp$" + #:directories? #t))) + (for-each + (lambda (prog) + (wrap-program prog + ;; emacs-next and variants rely on uname being in PATH for + ;; Tramp. Tramp paths can't be hardcoded, because they + ;; need to be portable. + `("PATH" suffix + ,(map dirname + (list (search-input-file inputs "/bin/gzip") + ;; for coreutils + (search-input-file inputs "/bin/yes")))) + `("EMACSLOADPATH" suffix ,lisp-dirs))) + (find-files (string-append out "/bin") + ;; Matches versioned and unversioned emacs binaries. + ;; We don't patch emacsclient, because it takes its + ;; environment variables from emacs. + ;; Likewise, we don't need to patch helper binaries + ;; like etags, ctags or ebrowse. + "^emacs(-[0-9]+(\\.[0-9]+)*)?$")))))))) (inputs - `(("gnutls" ,gnutls) - ("ncurses" ,ncurses) + (list gnutls + ncurses - ;; Required for "core" functionality, such as dired and compression. - ("coreutils" ,coreutils) - ("gzip" ,gzip) + ;; Required for "core" functionality, such as dired and compression. + coreutils + gzip - ;; Avoid Emacs's limited movemail substitute that retrieves POP3 email - ;; only via insecure channels. This is not needed for (modern) IMAP. - ("mailutils" ,mailutils) + ;; Avoid Emacs's limited movemail substitute that retrieves POP3 + ;; email only via insecure channels. + ;; This is not needed for (modern) IMAP. + mailutils - ;; TODO: Add the optional dependencies. - ("gpm" ,gpm) - ("libx11" ,libx11) - ("gtk+" ,gtk+) - ("cairo" ,cairo) - ("pango" ,pango) - ("harfbuzz" ,harfbuzz) - ("libxft" ,libxft) - ("libtiff" ,libtiff) - ("giflib" ,giflib) - ("libjpeg" ,libjpeg-turbo) - ("acl" ,acl) - ("jansson" ,jansson) - ("gmp" ,gmp) - ("ghostscript" ,ghostscript) - ("poppler" ,poppler) + ;; TODO: Add the optional dependencies. + gpm + libx11 + gtk+ + cairo + pango + harfbuzz + libxft + libtiff + giflib + libjpeg-turbo + acl + jansson + gmp + ghostscript + poppler - ;; When looking for libpng `configure' links with `-lpng -lz', so we - ;; must also provide zlib as an input. - ("libpng" ,libpng) - ("zlib" ,zlib) - ("librsvg" ,@(if (target-x86-64?) - (list librsvg-bootstrap) - (list librsvg-2.40))) - ("libxpm" ,libxpm) - ("libxml2" ,libxml2) - ("libice" ,libice) - ("libsm" ,libsm) - ("alsa-lib" ,alsa-lib) - ("dbus" ,dbus) + ;; When looking for libpng `configure' links with `-lpng -lz', so we + ;; must also provide zlib as an input. + libpng + zlib + (if (target-x86-64?) + librsvg-bootstrap + librsvg-2.40) + libxpm + libxml2 + libice + libsm + alsa-lib + dbus - ;; multilingualization support - ("libotf" ,libotf) - ("m17n-lib" ,m17n-lib))) + ;; multilingualization support + libotf + m17n-lib)) (native-inputs - `(("guix-emacs.el" ,(search-auxiliary-file "emacs/guix-emacs.el")) - ("pkg-config" ,pkg-config) - ("texinfo" ,texinfo))) - + (list pkg-config texinfo)) (native-search-paths (list (search-path-specification (variable "EMACSLOADPATH") 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; - } From patchwork Sat Apr 9 10:28:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 38476 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 AE9FB27BBEC; Sun, 10 Apr 2022 00:25:13 +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 6169927BBEB for ; Sun, 10 Apr 2022 00:25:13 +0100 (BST) Received: from localhost ([::1]:55626 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ndKS8-0001ex-Dx for patchwork@mira.cbaines.net; Sat, 09 Apr 2022 19:25:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54546) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ndKRz-0001eR-DV for guix-patches@gnu.org; Sat, 09 Apr 2022 19:25:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45051) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ndKRz-0001lj-3k for guix-patches@gnu.org; Sat, 09 Apr 2022 19:25:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ndKRy-0007Wf-WF for guix-patches@gnu.org; Sat, 09 Apr 2022 19:25:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#54829] [PATCH 2/2] gnu: emacs: Add support for socket activation. References: In-Reply-To: Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 09 Apr 2022 23:25: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: 54829@debbugs.gnu.org Received: via spool by 54829-submit@debbugs.gnu.org id=B54829.164954664628849 (code B ref 54829); Sat, 09 Apr 2022 23:25:02 +0000 Received: (at 54829) by debbugs.gnu.org; 9 Apr 2022 23:24:06 +0000 Received: from localhost ([127.0.0.1]:38947 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ndKR4-0007VF-3p for submit@debbugs.gnu.org; Sat, 09 Apr 2022 19:24:06 -0400 Received: from mail-ed1-f66.google.com ([209.85.208.66]:40838) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ndKQz-0007UW-Oi for 54829@debbugs.gnu.org; Sat, 09 Apr 2022 19:24:04 -0400 Received: by mail-ed1-f66.google.com with SMTP id v4so527207edl.7 for <54829@debbugs.gnu.org>; Sat, 09 Apr 2022 16:24:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:date:subject:mime-version:to:content-transfer-encoding :message-id; bh=q36bRmF+eC9h1qfmMSeFbGI5nHD2xYdyXwBVGcEocUg=; b=b8adMV70u7MCE6XyzpveI8AzRZv0hvddtlcPa7R9q/8LSo6HIwtD5ksAOU18MLZ3cH A6t+nztEi0V3a6sZt4e1zQ5Mv7GWdTzzZwvEpBCMbfrll7ALCl9wf18wDpYVopDUOPy8 9mn9xQGkoKhw9Az8NqDu2PoZpx498oV1XWU8XKiwKmVs9IlUz3cs+x0Ga5cwcXetNMG1 wyRD+FVUd/ibO4jvlDF9+M9TRGAzTTYyYwfHOwq+HoCk3N99UsDnK3LjP1zcfxJ1N6sD DgFyWeoAkYdrtgSp9IOQUDaL+D2Bxh3tK94viidrhEgQdl+Yw0ee2CU+trJ9wEwUUHzU KtaQ== 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:mime-version:to :content-transfer-encoding:message-id; bh=q36bRmF+eC9h1qfmMSeFbGI5nHD2xYdyXwBVGcEocUg=; b=6L/KAOMRY/iGAMEsD/6CdZ2FUidKnSAUJ1u5VTESXF8DKM12ugvBC7wx7+6OV0WF89 okdvhHFP4viHLLo2JGUqmjV1/8HJvO8EzKzaBLR4wdmTIHQ76mxwiYNlwflPFN6znywZ dLI7gnng3Obq+RikDhrgzbueTxbsoOVuslrbb8VJQHUmHf85rx4Q3KMJZYqPofjCP7WO 0Iq5toazLjEoriS1ixCw3+umKW0M4ODebt21pqmGIrBQHxPKq7G81umDhnairA2yo8HG 2OZ0QY+U9MlhQ9A4wvXE9Au9f/FhEU7s/tjUf2B9h5MWJKTKxGvkX2UmOJZ/Bo3/3RMQ S/IA== X-Gm-Message-State: AOAM531d5H4zpiZERgZRN4AyNj2u5K4ip8mNr0KHudCVj4c8AEcPNm1D DeuIByXUos1CvXOiCpMS73w1WRkeiVE= X-Google-Smtp-Source: ABdhPJwSzDUrgblvaszlXWNf84/hI48rwXWGMRX+7lDGOKro5HWFv0F0kQqE85m8/IENyhwb+nVBzw== X-Received: by 2002:a05:6402:40c9:b0:419:4b81:162e with SMTP id z9-20020a05640240c900b004194b81162emr26577143edb.380.1649546636137; Sat, 09 Apr 2022 16:23:56 -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 c5-20020a170906d18500b006ce371f09d4sm10093054ejz.57.2022.04.09.16.23.55 for <54829@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 09 Apr 2022 16:23:55 -0700 (PDT) From: Liliana Marie Prikler Date: Sat, 9 Apr 2022 12:28:15 +0200 MIME-Version: 1.0 Message-ID: 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)[#:phases]: Add ‘enable-elogind’. [inputs]: Add elogind. [native-inputs]: Add autoconf. --- gnu/packages/emacs.scm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 894b9cd7de..818166c552 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -52,6 +52,7 @@ (define-module (gnu packages emacs) #:use-module (gnu packages base) #:use-module (gnu packages compression) #:use-module (gnu packages fontutils) + #:use-module (gnu packages freedesktop) #:use-module (gnu packages fribidi) #:use-module (gnu packages gd) #:use-module (gnu packages gettext) @@ -131,6 +132,11 @@ (define-public emacs "--disable-build-details") #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'enable-elogind + (lambda _ + (substitute* "configure.ac" + (("libsystemd") "libelogind")) + (delete-file "configure"))) (add-after 'unpack 'patch-program-file-names (lambda* (#:key inputs #:allow-other-keys) (substitute* '("src/callproc.c" @@ -273,6 +279,7 @@ (define* (emacs-byte-compile-directory dir) gmp ghostscript poppler + elogind ;; When looking for libpng `configure' links with `-lpng -lz', so we ;; must also provide zlib as an input. @@ -292,7 +299,7 @@ (define* (emacs-byte-compile-directory dir) libotf m17n-lib)) (native-inputs - (list pkg-config texinfo)) + (list autoconf pkg-config texinfo)) (native-search-paths (list (search-path-specification (variable "EMACSLOADPATH") From patchwork Sun Apr 10 11:32:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 38480 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 9C6AD27BBE9; Sun, 10 Apr 2022 12:37:19 +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 140FD27BBEA for ; Sun, 10 Apr 2022 12:37:15 +0100 (BST) Received: from localhost ([::1]:36660 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ndVsY-0001we-7n for patchwork@mira.cbaines.net; Sun, 10 Apr 2022 07:37:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51314) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ndVsN-0001vq-Uv for guix-patches@gnu.org; Sun, 10 Apr 2022 07:37:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45664) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ndVsN-0000Xq-9l for guix-patches@gnu.org; Sun, 10 Apr 2022 07:37:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ndVsN-000813-84 for guix-patches@gnu.org; Sun, 10 Apr 2022 07:37:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#54829] [PATCH v2 3/3] gnu: emacs: Add support for socket activation. 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:03 +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.164959059730760 (code B ref 54829); Sun, 10 Apr 2022 11:37:03 +0000 Received: (at 54829) by debbugs.gnu.org; 10 Apr 2022 11:36:37 +0000 Received: from localhost ([127.0.0.1]:39559 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ndVrw-0007zz-G4 for submit@debbugs.gnu.org; Sun, 10 Apr 2022 07:36:36 -0400 Received: from mail-ej1-f66.google.com ([209.85.218.66]:35387) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ndVrs-0007zG-8Z for 54829@debbugs.gnu.org; Sun, 10 Apr 2022 07:36:32 -0400 Received: by mail-ej1-f66.google.com with SMTP id l7so20109683ejn.2 for <54829@debbugs.gnu.org>; Sun, 10 Apr 2022 04:36:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:date:subject:mime-version:to:content-transfer-encoding :message-id; bh=yznvqZ9j3RC0nMwG/4I1Yv4ax8YBZOn/kLSxJwds8xY=; b=RGuAM9NaMxVXeLEiWcNApUZZnegjlco9ErCKQDSQ9nqBljrMMaU6LdCm2eM3b4/WEP XxsyAFTkN7YPJ4mSfFAj8i/yBasvZeopbYpL9drZaPJeBkvsP051X+M2bsTVuq4Cn3KE SB7IXbBecFD//auYenql9EUaDzqIzFcjgNH6v6dtFwIUOnH2WJd+iZia5ynVqEcycUhW i1g+AIChAqaF15HWnjzSZrBBEVhwsZErQxM6S5fclM3xw4DlCWuzqv3EDJhHTg3jcZX4 AhLQgF9J0csQM0Z16uRy/ofaGSvsXc+UEAqNWWxoBpul/nkN/Odo2qOhW0eyv0W+WuKF YUag== 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:mime-version:to :content-transfer-encoding:message-id; bh=yznvqZ9j3RC0nMwG/4I1Yv4ax8YBZOn/kLSxJwds8xY=; b=Dw1z1qGUmLbN1lmfnPw3NAtjeoCgQMSnpZvH0UDbWuEjb7LCI/V9cFkr4wDtl6wn7Y pfljLEBGMb/0eHWxnK2wmNRmdgJD6XCAS/kATAhyFDAPon4yM/1ABnxQ+ZVqXEqQ6sC5 7N3mzLWMm3rRTSIkZ4tDIXcHAVGAeGBqP9kP8zE2Z4MxsmjEavC9jxRtaULjReo2D9kq n40zufUVWoeekYI+93EMFb+7GdBuZAzTGmU0xFOicL0zzW0PG1VEP7VbdIoAlRwY7REV eXauay1NDRjBpjcCzybHtlHdxmcQnR22RY10TpnbezSLJGcL8hFQfZiN1oSP5cTtq+qf FROw== X-Gm-Message-State: AOAM533vHSDsmlgzKiUU0esbWarv3A7f6DYC8yVm53XNmuMkK/zzxssK cmz+yh/m3AseoXhSUojZq5+WFJgA2v4= X-Google-Smtp-Source: ABdhPJyCiebGcLOmj0FKXuJQmU6LNtAciUNvrKmHGO3yxlKRW/5zhlyIzO7Gu6UNc5f1vBRIU7zCaQ== X-Received: by 2002:a17:907:8692:b0:6e8:8d83:c25c with SMTP id qa18-20020a170907869200b006e88d83c25cmr1292030ejc.38.1649590586554; Sun, 10 Apr 2022 04:36:26 -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.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 10 Apr 2022 04:36:26 -0700 (PDT) From: Liliana Marie Prikler Date: Sun, 10 Apr 2022 13:32:27 +0200 MIME-Version: 1.0 Message-ID: <51a736cdfab0f0d15ab57e5eb01f784a3b125786.camel@gmail.com> 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)[#:phases]: Add ‘enable-elogind’. [inputs]: Add elogind. [native-inputs]: Add autoconf. --- gnu/packages/emacs.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index ae062dadf1..85154da72b 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -132,6 +132,11 @@ (define-public emacs "--disable-build-details") #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'enable-elogind + (lambda _ + (substitute* "configure.ac" + (("libsystemd") "libelogind")) + (delete-file "configure"))) (add-after 'unpack 'patch-program-file-names (lambda* (#:key inputs #:allow-other-keys) (substitute* '("src/callproc.c" @@ -274,6 +279,7 @@ (define* (emacs-byte-compile-directory dir) gmp ghostscript poppler + elogind ;; When looking for libpng `configure' links with `-lpng -lz', so we ;; must also provide zlib as an input. @@ -293,7 +299,7 @@ (define* (emacs-byte-compile-directory dir) libotf m17n-lib)) (native-inputs - (list pkg-config texinfo)) + (list autoconf pkg-config texinfo)) (native-search-paths (list (search-path-specification (variable "EMACSLOADPATH")