Subject: bug#78428: closed (Re: bug#78428: [PATCH] gnu: elogind: Adjust patch for pkttyagent path.)

From: [email-masked] (GNU bug Tracking System)
Date: Tue, 20 May 2025 23:15:04 +0000

Your bug report

#78428: [PATCH] gnu: elogind: Adjust patch for pkttyagent path.

which was filed against the guix-patches package, has been closed.

The explanation is attached below, along with your original report.
If you require more details, please reply to [email-masked].

-- 
78428: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=78428
GNU Bug Tracking System
Contact [email-masked] with problems

Subject: Re: bug#78428: [PATCH] gnu: elogind: Adjust patch for pkttyagent path.
From: Maxim Cournoyer <[email-masked]>
To: Sergey Trofimov <[email-masked]>
Cc: [email-masked]
Date: Wed, 21 May 2025 08:14:43 +0900
List-Id: <debbugs-submit.debbugs.gnu.org>

Hi,

Sergey Trofimov <[email-masked]> writes:

> * gnu/packages/freedesktop.scm (elogind/fixed): New variable.
> [#:phases]<fix-pkttyagent-path>: Adjust the regexp to work with source
> version 255.17.
>
> * gnu/packages/freedesktop.scm (elogind): Replace with elogind/fixed.
>
> Change-Id: I9c474291816aee7464db5cbe9398b589479e79cf
> ---
>  gnu/packages/freedesktop.scm | 16 ++++++++++++++++
>  1 file changed, 16 insertions(+)
>
> diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
> index de8fb975bc..bcddb6fd0c 100644
> --- a/gnu/packages/freedesktop.scm
> +++ b/gnu/packages/freedesktop.scm
> @@ -879,6 +879,7 @@ (define-public elogind
>    (package
>      (name "elogind")
>      (version "255.17")
> +    (replacement elogind/fixed)
>      (source (origin
>                (method git-fetch)
>                (uri (git-reference
> @@ -1065,6 +1066,21 @@ (define-public elogind
>  of a the system to know what users are logged in, and where.")
>      (license license:lgpl2.1+)))
>  
> +(define-public elogind/fixed
> +  (hidden-package
> +   (package
> +     (inherit elogind)
> +     (replacement elogind/fixed)
> +     (arguments
> +      (substitute-keyword-arguments (package-arguments elogind)
> +        ((#:phases phases)
> +         `(modify-phases ,phases
> +           (replace 'fix-pkttyagent-path
> +             (lambda _
> +               (substitute* "meson.build"
> +                 (("bindir / 'pkttyagent'")
> +                  "'/run/current-system/profile/bin/pkttyagent'")))))))))))
> +

Modified like this:

--8<---------------cut here---------------start------------->8---
modified   gnu/packages/freedesktop.scm
@@ -1070,16 +1070,15 @@ (define-public elogind/fixed
   (hidden-package
    (package
      (inherit elogind)
-     (replacement elogind/fixed)
      (arguments
       (substitute-keyword-arguments (package-arguments elogind)
         ((#:phases phases)
-         `(modify-phases ,phases
-           (replace 'fix-pkttyagent-path
-             (lambda _
-               (substitute* "meson.build"
-                 (("bindir / 'pkttyagent'")
-                  "'/run/current-system/profile/bin/pkttyagent'")))))))))))
+         #~(modify-phases #$phases
+             (replace 'fix-pkttyagent-path
+               (lambda _
+                 (substitute* "meson.build"
+                   (("bindir / 'pkttyagent'")
+                    "'/run/current-system/profile/bin/pkttyagent'")))))))))))
 
 (define-public basu
   (package
--8<---------------cut here---------------end--------------->8---

(the most important part is that 'replacement' field should be on the
package *being* replaced only, not onthe replacement package itself).

And pushed!

-- 
Thanks,
Maxim

Subject: [PATCH] gnu: elogind: Adjust patch for pkttyagent path.
From: Sergey Trofimov <[email-masked]>
To: [email-masked]
Cc: Sergey Trofimov <[email-masked]>
Date: Wed, 14 May 2025 19:50:28 +0200
List-Id: <debbugs-submit.debbugs.gnu.org>

* gnu/packages/freedesktop.scm (elogind):
[#:phases]<fix-pkttyagent-path>: Adjust the regexp to work with source
version 255.17.

Change-Id: I259c93d806482d10bd438a8ba47dcf5a270feeca
---
 gnu/packages/freedesktop.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index de8fb975bc..281c8b33ec 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -949,8 +949,8 @@ (define-public elogind
          (add-after 'unpack 'fix-pkttyagent-path
            (lambda _
              (substitute* "meson.build"
-               (("join_paths\\(bindir, 'pkttyagent'\\)")
-                "'\"/run/current-system/profile/bin/pkttyagent\"'"))))
+               (("bindir / 'pkttyagent'")
+                "'/run/current-system/profile/bin/pkttyagent'"))))
          (add-after 'unpack 'use-global-hook-directory
            ;; XXX There is no run-time setting to set this per-process, only a
            ;; build-time, hard-coded list of global directories.

base-commit: c5265b90b055ee15908298c5d463301f1aae2eb1
-- 
2.49.0