guix_mirror_bot pushed a commit to branch gnome-team
in repository guix.

commit 77b42f21961da7d2511e9bc8196813bd64e40ecf
Author: Maxim Cournoyer <[email protected]>
AuthorDate: Sun Sep 13 19:53:36 2026 +0900

    gnu: elogind: Update to 256.16 and undo graft.
    
    * gnu/packages/freedesktop.scm: (elogind): Update to 256.16.
    * gnu/packages/patches/elogind-fix-logind-dbus-install.patch: Delete file.
    * gnu/local.mk (dist_patch_DATA): De-register it.
---
 gnu/local.mk                                       |  1 -
 gnu/packages/freedesktop.scm                       | 16 ++-----------
 .../patches/elogind-fix-logind-dbus-install.patch  | 26 ----------------------
 3 files changed, 2 insertions(+), 41 deletions(-)

diff --git a/gnu/local.mk b/gnu/local.mk
index fb291d8e4e1..92a65d38653 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1257,7 +1257,6 @@ dist_patch_DATA =                                         
\
   %D%/packages/patches/elm-offline-package-registry.patch      \
   %D%/packages/patches/elm-reactor-static-files.patch          \
   %D%/packages/patches/elm-bump-ansi-wl-pprint-dependency-fix-build.patch \
-  %D%/packages/patches/elogind-fix-logind-dbus-install.patch    \
   %D%/packages/patches/emacs-deferred-fix-number-of-arguments.patch    \
   %D%/packages/patches/emacs-disable-jit-compilation.patch                     
\
   %D%/packages/patches/emacs-doc-toc-shell-commands.patch      \
diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index 16a97be9b3e..2f66d95321a 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -796,8 +796,7 @@ the freedesktop.org XDG Base Directory specification.")
 (define-public elogind
   (package
     (name "elogind")
-    (version "257.14")
-    (replacement elogind/fixed)
+    (version "257.16")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -806,7 +805,7 @@ the freedesktop.org XDG Base Directory specification.")
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "16cbkkia2wmcjwqxgzl714igi9sgpcl4sdvag388vlh941136bs9"))))
+                "0sbggvmc3ni5pp5ybmxi0mxxgkyl84d539jsb6nf9qwqvxming8j"))))
     (build-system meson-build-system)
     (arguments
      `(#:configure-flags
@@ -984,17 +983,6 @@ the org.freedesktop.login1 interface over the system bus, 
allowing other parts
 of a the system to know what users are logged in, and where.")
     (license license:lgpl2.1+)))
 
-(define elogind/fixed
-  (package
-    (inherit elogind)
-    (source
-     (let ((s (package-source elogind)))
-       (origin
-         (inherit s)
-         (patches
-          (append (search-patches "elogind-fix-logind-dbus-install.patch")
-                  (origin-patches s))))))))
-
 (define-public basu
   (package
     (name "basu")
diff --git a/gnu/packages/patches/elogind-fix-logind-dbus-install.patch 
b/gnu/packages/patches/elogind-fix-logind-dbus-install.patch
deleted file mode 100644
index 463cbfe0976..00000000000
--- a/gnu/packages/patches/elogind-fix-logind-dbus-install.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From e8af22a28f3bb60854ea65a84681dd13541f8c90 Mon Sep 17 00:00:00 2001
-From: artoo <[email protected]>
-Date: Wed, 13 May 2026 15:39:13 +0200
-Subject: [PATCH 1/1] fix logind dbus install
-
----
- src/login/meson.build | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/login/meson.build b/src/login/meson.build
-index 275d336ad..6cd6b46e7 100644
---- a/src/login/meson.build
-+++ b/src/login/meson.build
-@@ -208,7 +208,8 @@ if enable_logind
-                 input: 'org.freedesktop.login1.service.in',
-                 output: 'org.freedesktop.login1.service',
-                 command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'],
--                install_dir : dbussystemservicedir)
-+                install_dir : dbussystemservicedir,
-+                install : true)
- #endif // 0
- 
-         install_data(
--- 
-2.54.0
-

Reply via email to