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

commit 1fb321ee4a75e32dc61a3df3afd777c664e0cccf
Author: Maxim Cournoyer <[email protected]>
AuthorDate: Wed Sep 2 16:14:50 2026 +0900

    gnu: appstream: Add support for elogind.
    
    * gnu/packages/patches/appstream-elogind.patch: New file.
    * gnu/local.mk (dist_patch_DATA): Register it.
    * gnu/packages/freedesktop.scm (appstream) [source]: Apply it.
    [#:configure-flags]: Delete.
    
    Signed-off-by: Liliana Marie Prikler <[email protected]>
---
 gnu/local.mk                                 |  1 +
 gnu/packages/freedesktop.scm                 |  6 ++++--
 gnu/packages/patches/appstream-elogind.patch | 28 ++++++++++++++++++++++++++++
 3 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/gnu/local.mk b/gnu/local.mk
index ad9fffa1a9c..98d843d62a0 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1021,6 +1021,7 @@ dist_patch_DATA =                                         
\
   %D%/packages/patches/antiword-CVE-2014-8123.patch                    \
   %D%/packages/patches/antlr3-3_1-fix-java8-compilation.patch  \
   %D%/packages/patches/antlr3-3_3-fix-java8-compilation.patch  \
+  %D%/packages/patches/appstream-elogind.patch                  \
   %D%/packages/patches/appstream-libstemmer-include-dir.patch   \
   %D%/packages/patches/apr-fix-atomics.patch                   \
   %D%/packages/patches/apr-skip-getservbyname-test.patch       \
diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index d93f37ff0ba..bd71000ce90 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -175,12 +175,13 @@
                        "AppStream-" version ".tar.xz"))
        (sha256
         (base32 "0ifblpdmvlynsc2dw66j78pm5xls9h1jdn5jzrqh4m8hi4vij6ch"))
-       (patches (search-patches "appstream-libstemmer-include-dir.patch"))))
+       (patches (search-patches
+                 "appstream-elogind.patch"
+                 "appstream-libstemmer-include-dir.patch"))))
     (build-system meson-build-system)
     (arguments
      (list
       #:glib-or-gtk? #t
-      #:configure-flags #~(list "-Dsystemd=false")
       #:phases
       #~(modify-phases %standard-phases
           (add-before 'check 'check-setup
@@ -203,6 +204,7 @@
     (inputs
      (list bash-completion
            curl
+           elogind
            libstemmer
            libxmlb
            libxml2
diff --git a/gnu/packages/patches/appstream-elogind.patch 
b/gnu/packages/patches/appstream-elogind.patch
new file mode 100644
index 00000000000..98ab5717d60
--- /dev/null
+++ b/gnu/packages/patches/appstream-elogind.patch
@@ -0,0 +1,28 @@
+Upstream-status: <https://github.com/ximion/appstream/pull/786>
+
+diff --git a/meson.build b/meson.build
+index c84392ee..b1bc44ee 100644
+--- a/meson.build
++++ b/meson.build
+@@ -202,7 +202,7 @@ else
+     zstd_dep = dependency('', required: false)
+ endif
+ if get_option('systemd')
+-    libsystemd_dep = dependency('libsystemd', required: get_option('systemd'))
++    libsystemd_dep = dependency('libsystemd', 'libelogind', required: 
get_option('systemd'))
+ else
+     libsystemd_dep = dependency('', required: false)
+ endif
+diff --git a/meson_options.txt b/meson_options.txt
+index ac364979..62d4102b 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -6,7 +6,7 @@ option('stemming',
+ option('systemd',
+        type : 'boolean',
+        value : true,
+-       description : 'Build with systemd support'
++       description : 'Build with systemd/elogind support'
+ )
+ option('vapi',
+        type : 'boolean',

Reply via email to