Message ID | ea79ad869b1630dd0ecd9cc5d5dd04b6333e8522.camel@gmail.com |
---|---|
State | New |
Headers |
Return-Path: <guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org> X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 35EB227BBE9; Thu, 14 Apr 2022 20:48:33 +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 7408A27BBEB for <patchwork@mira.cbaines.net>; Thu, 14 Apr 2022 20:48:28 +0100 (BST) Received: from localhost ([::1]:39494 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from <guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org>) id 1nf5S7-0008Ei-IJ for patchwork@mira.cbaines.net; Thu, 14 Apr 2022 15:48:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52198) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1nf5Ri-0008E6-T5 for guix-patches@gnu.org; Thu, 14 Apr 2022 15:48:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:35296) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1nf5Ri-0005I3-KW for guix-patches@gnu.org; Thu, 14 Apr 2022 15:48:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1nf5Ri-0001WQ-If for guix-patches@gnu.org; Thu, 14 Apr 2022 15:48:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#54829] [PATCH v3 3/3] gnu: emacs: Add support for socket activation. References: <a12fa139736fdba929f3460f26622928e9cc8eca.camel@gmail.com> In-Reply-To: <a12fa139736fdba929f3460f26622928e9cc8eca.camel@gmail.com> Resent-From: Liliana Marie Prikler <liliana.prikler@gmail.com> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org> Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 14 Apr 2022 19:48:02 +0000 Resent-Message-ID: <handler.54829.B54829.16499656725787@debbugs.gnu.org> 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 <maximedevos@telenet.be>, zimoun <zimon.toutoune@gmail.com> Received: via spool by 54829-submit@debbugs.gnu.org id=B54829.16499656725787 (code B ref 54829); Thu, 14 Apr 2022 19:48:02 +0000 Received: (at 54829) by debbugs.gnu.org; 14 Apr 2022 19:47:52 +0000 Received: from localhost ([127.0.0.1]:57424 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces@debbugs.gnu.org>) id 1nf5RY-0001VF-GX for submit@debbugs.gnu.org; Thu, 14 Apr 2022 15:47:52 -0400 Received: from mail-ed1-f68.google.com ([209.85.208.68]:41528) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <liliana.prikler@gmail.com>) id 1nf5RQ-0001TZ-Gp for 54829@debbugs.gnu.org; Thu, 14 Apr 2022 15:47:49 -0400 Received: by mail-ed1-f68.google.com with SMTP id c6so7651219edn.8 for <54829@debbugs.gnu.org>; Thu, 14 Apr 2022 12:47:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:date:subject:mime-version:to:cc:content-transfer-encoding :message-id; bh=eNfUBYYrenJaNg+D/SLGZ5m2IlQUdz5LxGGLA0MBaHs=; b=iAUtfGxoYGW/5fJ54IgVyDolWRpljQZvDcc5xGdDg/QwTiGFzk2S1ikwVMU+AirpoF LdvELrkYBSQtRH6HHCFlZy/+PYp70gD405FpbEDbDbPqsR3R2fvdFLzWllZajSPyiBuO Wbc1NKC9AJKAtvBzo6cOQHTOIqbCFE039qIU+eS+PKAA7Fh/QN5uL+n3iGQiKYVHMgXO IAWNPlDUBEZZODD6uLtUEeayWGCtHo5+Z7T8KRbgm+l3H/aTl1jAzQJqOyzAP70wgr1r sHKyDWBQhG5ddfniUm3AhfElq/mHFeJqsFlHoWeQv32wS+hGtLprSF/iuhAVndlQdv+m dYyg== 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:cc :content-transfer-encoding:message-id; bh=eNfUBYYrenJaNg+D/SLGZ5m2IlQUdz5LxGGLA0MBaHs=; b=yIK4wDlXy7JFZbbb+kyG58uUpUezk5Cd9BU2TwYzLKLtwT6rLQx4SN6DG1ediI/+iy MTitScnQFkmtVWigSkElgvqsXcG379dodiRoZkHfxDAVJ0+BC9X44q3p81O6ne4A8KOv /mhyyMuyNmS+R+1bB+5gy17x5ztWwm4v2kL2EnA6xHHeAaMlUbAEhcXAYMHgxUrOJ+4X D5TY11or1foQSDzqN7KVbDm8xyB7uPta3tRCmgkB1f79EC4GiceyJE0knonpyG8tajS5 0g3lHzZE0RNBkl/B0Rs8ezufzbjSLhdxOV8N0I2qnjLg/tLrpSBr5awcetgD/cdx3Ld7 XucQ== X-Gm-Message-State: AOAM532PequaikbH7lIetxbVMcIltOFuGNwCmst5fZWfKC//rRLkY9TV 7tyxGX6xtb2EqfMluBPt3Gu2IJkkCHQ= X-Google-Smtp-Source: ABdhPJy/Dr7iopywnY8Xtfl6/z33A4l0qIyc8ePopLTUqOxaia31t/6ICkjmxLjjPFkrlFOBV2J/fw== X-Received: by 2002:a05:6402:354b:b0:419:4af8:c5c9 with SMTP id f11-20020a056402354b00b004194af8c5c9mr4814089edd.91.1649965658860; Thu, 14 Apr 2022 12:47:38 -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.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Apr 2022 12:47:38 -0700 (PDT) From: Liliana Marie Prikler <liliana.prikler@gmail.com> Date: Sun, 10 Apr 2022 13:32:27 +0200 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-ID: <ea79ad869b1630dd0ecd9cc5d5dd04b6333e8522.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: <guix-patches.gnu.org> List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-patches>, <mailto:guix-patches-request@gnu.org?subject=unsubscribe> List-Archive: <https://lists.gnu.org/archive/html/guix-patches> List-Post: <mailto:guix-patches@gnu.org> List-Help: <mailto:guix-patches-request@gnu.org?subject=help> List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-patches>, <mailto:guix-patches-request@gnu.org?subject=subscribe> Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" <guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org> X-getmail-retrieved-from-mailbox: Patches |
Series |
None
|
|
Commit Message
Liliana Marie Prikler
April 10, 2022, 11:32 a.m. UTC
* 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(-)
Comments
Hi, Liliana Marie Prikler <liliana.prikler@gmail.com> skribis: > * gnu/packages/emacs.scm (emacs)[#:phases]: Add ‘enable-elogind’. > [inputs]: Add elogind. > [native-inputs]: Add autoconf. [...] > + (add-after 'unpack 'enable-elogind > + (lambda _ > + (substitute* "configure.ac" > + (("libsystemd") "libelogind")) I suggest making that substitution in ‘configure’… > (native-inputs > - (list pkg-config texinfo)) > + (list autoconf pkg-config texinfo)) … so you don’t need this extra dependency. Otherwise it LGTM. Perhaps you can push to a ‘wip-emacs-28’ branch, and then ping me or another admin on #guix so we can tell ci.guix to build it. Once it’s built and we don’t see regressions, we can merge in ‘master’ (should take a day or two at most I suppose). Thanks, Ludo’. PS: First time it takes more than a few hours for a new Emacs version to land in Guix! :-)
Ludovic Courtès schreef op do 28-04-2022 om 14:15 [+0200]: > > + (add-after 'unpack 'enable-elogind > > + (lambda _ > > + (substitute* "configure.ac" > > + (("libsystemd") "libelogind")) > > I suggest making that substitution in ‘configure’… > > > (native-inputs > > - (list pkg-config texinfo)) > > + (list autoconf pkg-config texinfo)) > > … so you don’t need this extra dependency. I thought the idea was to, long term, build 'configure' from source (except for packages low on the graph where there would be bootstrap problems)? https://lists.gnu.org/archive/html/guix-devel/2022-04/msg00065.html Greetings, Maxime.
Am Donnerstag, dem 28.04.2022 um 17:06 +0200 schrieb Maxime Devos: > Ludovic Courtès schreef op do 28-04-2022 om 14:15 [+0200]: > > > + (add-after 'unpack 'enable-elogind > > > + (lambda _ > > > + (substitute* "configure.ac" > > > + (("libsystemd") "libelogind")) > > > > I suggest making that substitution in ‘configure’… > > > > > (native-inputs > > > - (list pkg-config texinfo)) > > > + (list autoconf pkg-config texinfo)) > > > > … so you don’t need this extra dependency. > > I thought the idea was to, long term, build 'configure' from source > (except for packages low on the graph where there would be bootstrap > problems)? > > https://lists.gnu.org/archive/html/guix-devel/2022-04/msg00065.html To add to this, configure doesn't exist in emacs-next variants, so I find it better to just wrap the existing code in a (when (file-exists? ...) ...) rather than boot from blessed blobs in this particular instance. Cheers
Hi, Am Donnerstag, dem 28.04.2022 um 14:15 +0200 schrieb Ludovic Courtès: > Perhaps you can push to a ‘wip-emacs-28’ branch, and then ping me or > another admin on #guix so we can tell ci.guix to build it. Once it’s > built and we don’t see regressions, we can merge in ‘master’ (should > take a day or two at most I suppose). I pushed an ‘emacs-28’ branch (dropped the ‘wip-’ by accident), in which emacs, emacs-next and emacs-next-pgtk are all updated. Native compilation in emacs is still missing though, but someone with commit access and enough time to spare could add it. Cheers
Maxime Devos <maximedevos@telenet.be> skribis: > Ludovic Courtès schreef op do 28-04-2022 om 14:15 [+0200]: >> > + (add-after 'unpack 'enable-elogind >> > + (lambda _ >> > + (substitute* "configure.ac" >> > + (("libsystemd") "libelogind")) >> >> I suggest making that substitution in ‘configure’… >> >> > (native-inputs >> > - (list pkg-config texinfo)) >> > + (list autoconf pkg-config texinfo)) >> >> … so you don’t need this extra dependency. > > I thought the idea was to, long term, build 'configure' from source > (except for packages low on the graph where there would be bootstrap > problems)? > > https://lists.gnu.org/archive/html/guix-devel/2022-04/msg00065.html Ah yes, that too. See? The power of habits, the beauty of self-contradiction. :-) Liliana: I guess Maxime is right, you can keep this version. Thanks, Ludo’.
Liliana Marie Prikler <liliana.prikler@gmail.com> writes: > Hi, > > Am Donnerstag, dem 28.04.2022 um 14:15 +0200 schrieb Ludovic Courtès: >> Perhaps you can push to a ‘wip-emacs-28’ branch, and then ping me or >> another admin on #guix so we can tell ci.guix to build it. Once it’s >> built and we don’t see regressions, we can merge in ‘master’ (should >> take a day or two at most I suppose). > I pushed an ‘emacs-28’ branch (dropped the ‘wip-’ by accident), in > which emacs, emacs-next and emacs-next-pgtk are all updated. Native What about add --with-xinput2 emacs-next, use version 2 of the X Input Extension for input > compilation in emacs is still missing though, but someone with commit > access and enough time to spare could add it. > > Cheers --
Am Freitag, dem 29.04.2022 um 11:22 +0800 schrieb Feng Shu: > Liliana Marie Prikler <liliana.prikler@gmail.com> writes: > > > Hi, > > > > Am Donnerstag, dem 28.04.2022 um 14:15 +0200 schrieb Ludovic > > Courtès: > > > Perhaps you can push to a ‘wip-emacs-28’ branch, and then ping me > > > or another admin on #guix so we can tell ci.guix to build it. > > > Once it’s built and we don’t see regressions, we can merge in > > > ‘master’ (should take a day or two at most I suppose). > > I pushed an ‘emacs-28’ branch (dropped the ‘wip-’ by accident), in > > which emacs, emacs-next and emacs-next-pgtk are all updated. > > Native > > What about add --with-xinput2 emacs-next, use version 2 of the X > Input Extension for input I'm probably not up to date to all the Emacs stuff, but given that "guix show xinput" only delivers 1.6, I don't think that's relevant yet. Or is it?
-- 发自我的网易邮箱手机智能版 <br/><br/><br/> ----- Original Message ----- From: "Liliana Marie Prikler" <liliana.prikler@gmail.com> To: "Feng Shu" <tumashu@163.com> Cc: "Ludovic Courtès" <ludo@gnu.org>, "Maxime Devos" <maximedevos@telenet.be>, 54829@debbugs.gnu.org, zimoun <zimon.toutoune@gmail.com> Sent: Fri, 29 Apr 2022 20:53:03 +0200 Subject: Re: [bug#54829] [PATCH 0/2] Update Emacs to 28.1 and add socket activation Am Freitag, dem 29.04.2022 um 11:22 +0800 schrieb Feng Shu: > Liliana Marie Prikler <liliana.prikler@gmail.com> writes: > > > Hi, > > > > Am Donnerstag, dem 28.04.2022 um 14:15 +0200 schrieb Ludovic > > Courtès: > > > Perhaps you can push to a ‘wip-emacs-28’ branch, and then ping me > > > or another admin on #guix so we can tell ci.guix to build it. > > > Once it’s built and we don’t see regressions, we can merge in > > > ‘master’ (should take a day or two at most I suppose). > > I pushed an ‘emacs-28’ branch (dropped the ‘wip-’ by accident), in > > which emacs, emacs-next and emacs-next-pgtk are all updated. > > Native > > What about add --with-xinput2 emacs-next, use version 2 of the X > Input Extension for input I'm probably not up to date to all the Emacs stuff, but given that "guix show xinput" only delivers 1.6, I don't think that's relevant yet. Or is it? no, i think it use X11/extensions/XInput2.h
Hi, Liliana Marie Prikler <liliana.prikler@gmail.com> writes: > Am Freitag, dem 29.04.2022 um 11:22 +0800 schrieb Feng Shu: >> Liliana Marie Prikler <liliana.prikler@gmail.com> writes: >> >> > Hi, >> > >> > Am Donnerstag, dem 28.04.2022 um 14:15 +0200 schrieb Ludovic >> > Courtès: >> > > Perhaps you can push to a ‘wip-emacs-28’ branch, and then ping me >> > > or another admin on #guix so we can tell ci.guix to build it. >> > > Once it’s built and we don’t see regressions, we can merge in >> > > ‘master’ (should take a day or two at most I suppose). >> > I pushed an ‘emacs-28’ branch (dropped the ‘wip-’ by accident), in >> > which emacs, emacs-next and emacs-next-pgtk are all updated. >> > Native >> >> What about add --with-xinput2 emacs-next, use version 2 of the X >> Input Extension for input > I'm probably not up to date to all the Emacs stuff, but given that > "guix show xinput" only delivers 1.6, I don't think that's relevant > yet. Or is it? As it seems this change was merge, don't forget to close it if everything mentioned here was taken care of :-) Thanks, Maxim
Am Mittwoch, dem 18.05.2022 um 00:13 -0400 schrieb Maxim Cournoyer: > As it seems this change was merge, don't forget to close it if > everything mentioned here was taken care of :-) Well, it's not literally "everything" related to Emacs 28, but it is at least this series, so I'll mark it as done. Also deleted the emacs-28 branch as it's no longer relevant. Cheers
diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index a32fe624dd..847731b95d 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -131,6 +131,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" @@ -271,6 +276,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. @@ -290,7 +296,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")