diff mbox series

[bug#33471] gnu: elogind: Update to 239.2.

Message ID 87zhtluhs5.fsf@fastmail.com
State Accepted
Headers show
Series [bug#33471] gnu: elogind: Update to 239.2. | expand

Checks

Context Check Description
cbaines/applying patch fail Apply failed

Commit Message

Marius Bakke Dec. 4, 2018, 9:02 p.m. UTC 
Stefan Stefanović <stefanx2ovic@gmail.com> writes:

> Hello,
> Marius.
>
> Thanks to your input and suggestions I managed to simplify the original patch.
> I will attach the second patch to this e-mail.
>
> I tried to stick to the suggestions you gave me,
> and tried to make this patch as small as possible.
> The "--novalid" option is not necessary for this build so, I removed it.
> Please comment on this patch, and point out other areas I need to improve.
>
> I will try to test this patch on my main system.
> I expect it to work, we will see. ;)

Thanks!  I can confirm that this patch works for me.

I've applied these changes in my local branch:
The 'clean-runpath' phase should be unnecessary now.  The other changes
are mostly adjustments to make the final diff clearer (i.e. no sorting
of regular inputs, or synopsis change).

I will push this to 'master' tomorrow unless there are objections :-)

Comments

Meiyo Peng Dec. 5, 2018, 1:18 a.m. UTC | #1 
Hi,

Marius Bakke <mbakke@fastmail.com> writes:

> I will push this to 'master' tomorrow unless there are objections :-)

Great! I have been waiting for elogind(>=239), wayland(>=1.16) and
meson(>=0.48) in order to build sway window manager 1.0-beta. Thank you
all.

--
Meiyo Peng
Marius Bakke Dec. 6, 2018, 7:25 p.m. UTC | #2 
Marius Bakke <mbakke@fastmail.com> writes:

> I will push this to 'master' tomorrow unless there are objections :-)

Pushed as 4163f2467bce1a6123f0da1c49e88751d93e634b.  Thank you Stefan!
diff mbox series

Patch

1 file changed, 9 insertions(+), 17 deletions(-)
gnu/packages/freedesktop.scm | 26 +++++++++-----------------

modified   gnu/packages/freedesktop.scm
@@ -239,16 +239,14 @@  the freedesktop.org XDG Base Directory specification.")
                 "17khwbzqmkfd3hcscs51kzdpvq9p2llm08vbpsdhy9yxgwfzlfa6"))))
     (build-system meson-build-system)
     (arguments
-     `(#:tests? #t
-       #:configure-flags
+     `(#:configure-flags
        (let* ((out (assoc-ref %outputs "out"))
               (sysconf (string-append out "/etc"))
               (libexec (string-append out "/libexec/elogind"))
               (dbuspolicy (string-append out "/etc/dbus-1/system.d"))
               (shepherd (assoc-ref %build-inputs "shepherd"))
               (halt-path (string-append shepherd "/sbin/halt"))
-              (kexec-path "") ;; NOTE: We need to package kexec-tools,
-              ;;                       or support kexec with shepherd.
+              (kexec-path "")           ;not available in Guix yet
               (poweroff-path (string-append shepherd "/sbin/shutdown"))
               (reboot-path (string-append shepherd "/sbin/reboot")))
          (list
@@ -268,11 +266,6 @@  the freedesktop.org XDG Base Directory specification.")
           "-Dslow-tests=false"))
        #:phases
        (modify-phases %standard-phases
-         (add-after 'unpack 'clean-runpath
-           (lambda _
-             (substitute* "meson.build"
-               (("install_rpath :") "#install_rpath :"))
-             #t))
          (add-after 'unpack 'fix-pkttyagent-path
            (lambda _
              (substitute* "meson.build"
@@ -290,22 +283,21 @@  the freedesktop.org XDG Base Directory specification.")
        ("docbook-xsl" ,docbook-xsl)
        ("gettext" ,gettext-minimal)
        ("gperf" ,gperf)
-       ("libxml2" ,libxml2)             ;for XML_CATALOG_FILES
+       ("libxml2" ,libxml2)                     ;for XML_CATALOG_FILES
        ("m4" ,m4)
        ("pkg-config" ,pkg-config)
        ("python" ,python)
        ("xsltproc" ,libxslt)))
     (inputs
-     `(("acl" ,acl)                     ;to add individual users to ACLs on /dev nodes
+     `(("linux-pam" ,linux-pam)
+       ("libcap" ,libcap)
+       ("shepherd" ,shepherd)                ;for 'halt' and 'reboot', invoked
+                                             ;when pressing the power button
        ("dbus" ,dbus)
        ("eudev" ,eudev)
-       ("libcap" ,libcap)
-       ("linux-pam" ,linux-pam)
-       ("shepherd" ,shepherd)           ;for 'halt' and 'reboot', invoked
-                                        ;when pressing the power button
-       ))
+       ("acl" ,acl)))           ;to add individual users to ACLs on /dev nodes
     (home-page "https://github.com/elogind/elogind")
-    (synopsis "Elogind provides user, seat, and session management service")
+    (synopsis "User, seat, and session management service")
     (description "Elogind is the systemd project's \"logind\" service,
 extracted out as a separate project.  Elogind integrates with PAM to provide
 the org.freedesktop.login1 interface over the system bus, allowing other parts

[back]