From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
To: 57168@debbugs.gnu.org
Cc: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Subject: [bug#57168] [PATCH 02/14] gnu: accountsservice: Update to 22.08.8, enable doc and test suite.
Date: Sat, 13 Aug 2022 02:54:21 -0400 [thread overview]
Message-ID: <20220813065433.27319-2-maxim.cournoyer@gmail.com> (raw)
In-Reply-To: <20220813065433.27319-1-maxim.cournoyer@gmail.com>
* gnu/packages/freedesktop.scm (accountsservice): Update to 22.08.8.
[tests?]: Delete argument.
[configure-flags]: Remove obsolete "-Dsystemd" flag. Add "-Ddocbook=true" and
"-Dgtk_doc=true".
[phases]{patch-docbook-references}: New phase.
{patch-/bin/cat}: Delete and merge into...
[patch-paths]: ... this phase, renamed from pre-configure. Use
search-input-file.
[native-inputs]: Add docbook-xml-4.1.2, docbook-xsl, gtk-doc, libxml2,
libxslt, python-dbusmock, python-pygobject, vala and xmlto.
---
gnu/packages/freedesktop.scm | 85 +++++++++++++++++++++---------------
1 file changed, 51 insertions(+), 34 deletions(-)
diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index 037a247243..8ebd0e5359 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -27,7 +27,7 @@
;;; Copyright © 2021 Robby Zambito <contact@robbyzambito.me>
;;; Copyright © 2021, 2022 Maxime Devos <maximedevos@telenet.be>
;;; Copyright © 2021 John Kehayias <john.kehayias@protonmail.com>
-;;; Copyright © 2021, 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;; Copyright © 2021, 2021, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2022 Daniel Meißner <daniel.meissner-i4k@ruhr-uni-bochum.de>
;;; Copyright © 2022 muradm <mail@muradm.net>
;;;
@@ -1435,7 +1435,7 @@ (define-public udisks
(define-public accountsservice
(package
(name "accountsservice")
- (version "0.6.55")
+ (version "22.08.8")
(source
(origin
(method url-fetch)
@@ -1443,45 +1443,62 @@ (define-public accountsservice
"accountsservice/accountsservice-"
version ".tar.xz"))
(sha256
- (base32 "16wwd633jak9ajyr1f1h047rmd09fhf3kzjz6g5xjsz0lwcj8azz"))))
+ (base32 "14d3lwik048h62qrzg1djdd2sqmxf3m1r859730pvzhrd6krg6ch"))))
(build-system meson-build-system)
(arguments
- `(#:tests? #f ; XXX: tests require DocBook 4.1.2
- #:configure-flags
+ `(#:configure-flags
'("--localstatedir=/var"
- "-Dsystemdsystemunitdir=/tmp/empty"
- "-Dsystemd=false"
- "-Delogind=true")
+ "-Delogind=true"
+ "-Ddocbook=true"
+ "-Dgtk_doc=true"
+ "-Dsystemdsystemunitdir=/tmp/empty")
#:phases
(modify-phases %standard-phases
- (add-after 'unpack 'patch-/bin/cat
- (lambda _
- (substitute* "src/user.c"
- (("/bin/cat") (which "cat")))))
- (add-before
- 'configure 'pre-configure
- (lambda* (#:key inputs #:allow-other-keys)
- (substitute* "meson_post_install.py"
- (("in dst_dirs") "in []"))
- (let ((shadow (assoc-ref inputs "shadow")))
- (substitute* '("src/user.c" "src/daemon.c")
- (("/usr/sbin/usermod")
- (string-append shadow "/sbin/usermod"))
- (("/usr/sbin/useradd")
- (string-append shadow "/sbin/useradd"))
- (("/usr/sbin/userdel")
- (string-append shadow "/sbin/userdel"))
- (("/usr/bin/passwd")
- (string-append shadow "/bin/passwd"))
- (("/usr/bin/chage")
- (string-append shadow "/bin/chage")))))))))
+ (add-after 'unpack 'patch-docbook-references
+ ;; Having XML_CATALOG_FILES set is not enough; xmlto does not seem
+ ;; to honor it.
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* (find-files "." "\\.xml(\\.in)?$")
+ (("http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd")
+ (search-input-file inputs "share/xml/dbus-1/introspect.dtd"))
+ (("http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd")
+ (search-input-file inputs "xml/dtd/docbook/docbookx.dtd")))))
+ (add-after 'unpack 'patch-paths
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "meson_post_install.py"
+ (("in dst_dirs") "in []"))
+ (substitute* '("src/user.c" "src/daemon.c")
+ (("/bin/cat")
+ (search-input-file inputs "bin/cat"))
+ (("/usr/sbin/usermod")
+ (search-input-file inputs "sbin/usermod"))
+ (("/usr/sbin/useradd")
+ (search-input-file inputs "sbin/useradd"))
+ (("/usr/sbin/userdel")
+ (search-input-file inputs "sbin/userdel"))
+ (("/usr/bin/passwd")
+ (search-input-file inputs "bin/passwd"))
+ (("/usr/bin/chage")
+ (search-input-file inputs "bin/chage"))))))))
(native-inputs
- `(("glib:bin" ,glib "bin") ; for gdbus-codegen, etc.
- ("gobject-introspection" ,gobject-introspection)
- ("intltool" ,intltool)
- ("pkg-config" ,pkg-config)))
+ (list docbook-xml-4.1.2
+ docbook-xsl
+ `(,glib "bin") ; for gdbus-codegen, etc.
+ gobject-introspection
+ gtk-doc
+ intltool
+ libxml2 ;for XML_CATALOG_FILES
+ libxslt
+ pkg-config
+ python-dbusmock
+ python-pygobject
+ vala
+ xmlto))
(inputs
- (list dbus elogind polkit shadow))
+ (list dbus
+ elogind
+ polkit
+ shadow))
(home-page "https://www.freedesktop.org/wiki/Software/AccountsService/")
(synopsis "D-Bus interface for user account query and manipulation")
(description
--
2.36.1
next prev parent reply other threads:[~2022-08-13 6:55 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-13 6:50 [bug#57168] [PATCH 00/14] Add a LightDM service Maxim Cournoyer
2022-08-13 6:54 ` [bug#57168] [PATCH 01/14] services: configuration: Add a 'maybe-value-set?' procedure Maxim Cournoyer
2022-08-13 6:54 ` Maxim Cournoyer [this message]
2022-08-13 6:54 ` [bug#57168] [PATCH 03/14] gnu: accountsservice: Provide a means to locate extensions Maxim Cournoyer
2022-08-13 6:54 ` [bug#57168] [PATCH 04/14] gnu: lightdm-gtk-greeter: Add GDK_PIXBUF_MODULE_FILE to wrapper Maxim Cournoyer
2022-08-13 6:54 ` [bug#57168] [PATCH 05/14] gnu: lightdm-gtk-greeter: Use the glib-or-gtk-wrap phase as-is Maxim Cournoyer
2022-08-13 6:54 ` [bug#57168] [PATCH 06/14] gnu: lightdm-gtk-greeter: Enable libklavier support Maxim Cournoyer
2022-08-13 6:54 ` [bug#57168] [PATCH 07/14] gnu: lightdm-gtk-greeter: Adjust default config file path Maxim Cournoyer
2022-08-13 6:54 ` [bug#57168] [PATCH 08/14] gnu: lightdm-gtk-greeter: Adjust --enable-at-spi-command value Maxim Cournoyer
2022-08-13 6:54 ` [bug#57168] [PATCH 09/14] gnu: lightdm: Apply patch to fix a problem with VNC integration Maxim Cournoyer
2022-08-13 6:54 ` [bug#57168] [PATCH 10/14] gnu: lightdm: Apply patch to allow using VNC options Maxim Cournoyer
2022-08-13 6:54 ` [bug#57168] [PATCH 11/14] gnu: lightdm: Apply patch to fix color depth issue with VNC Maxim Cournoyer
2022-08-13 6:54 ` [bug#57168] [PATCH 12/14] marionette: Improve the error message of 'wait-for-screen-text' Maxim Cournoyer
2022-08-13 6:54 ` [bug#57168] [PATCH 13/14] build: marionette: Add support for Tesseract OCR Maxim Cournoyer
2022-08-13 6:54 ` [bug#57168] [PATCH 14/14] services: Add lightdm-service-type Maxim Cournoyer
2022-08-26 16:54 ` Maxime Devos
2022-08-29 2:33 ` bug#57168: [PATCH 00/14] Add a LightDM service Maxim Cournoyer
2022-08-30 19:44 ` [bug#57168] " Maxime Devos
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220813065433.27319-2-maxim.cournoyer@gmail.com \
--to=maxim.cournoyer@gmail.com \
--cc=57168@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).