gnu: accountsservice: Update to 22.08.8, enable doc and test suite.
* 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.
			
			
This commit is contained in:
		
							parent
							
								
									3c2d2b4538
								
							
						
					
					
						commit
						12bb1c6db1
					
				
					 1 changed files with 51 additions and 34 deletions
				
			
		|  | @ -27,7 +27,7 @@ | ||||||
| ;;; Copyright © 2021 Robby Zambito <contact@robbyzambito.me> | ;;; Copyright © 2021 Robby Zambito <contact@robbyzambito.me> | ||||||
| ;;; Copyright © 2021, 2022 Maxime Devos <maximedevos@telenet.be> | ;;; Copyright © 2021, 2022 Maxime Devos <maximedevos@telenet.be> | ||||||
| ;;; Copyright © 2021 John Kehayias <john.kehayias@protonmail.com> | ;;; 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 Daniel Meißner <daniel.meissner-i4k@ruhr-uni-bochum.de> | ||||||
| ;;; Copyright © 2022 muradm <mail@muradm.net> | ;;; Copyright © 2022 muradm <mail@muradm.net> | ||||||
| ;;; | ;;; | ||||||
|  | @ -1435,7 +1435,7 @@ message bus.") | ||||||
| (define-public accountsservice | (define-public accountsservice | ||||||
|   (package |   (package | ||||||
|     (name "accountsservice") |     (name "accountsservice") | ||||||
|     (version "0.6.55") |     (version "22.08.8") | ||||||
|     (source |     (source | ||||||
|      (origin |      (origin | ||||||
|        (method url-fetch) |        (method url-fetch) | ||||||
|  | @ -1443,45 +1443,62 @@ message bus.") | ||||||
|                            "accountsservice/accountsservice-" |                            "accountsservice/accountsservice-" | ||||||
|                            version ".tar.xz")) |                            version ".tar.xz")) | ||||||
|        (sha256 |        (sha256 | ||||||
|         (base32 "16wwd633jak9ajyr1f1h047rmd09fhf3kzjz6g5xjsz0lwcj8azz")))) |         (base32 "14d3lwik048h62qrzg1djdd2sqmxf3m1r859730pvzhrd6krg6ch")))) | ||||||
|     (build-system meson-build-system) |     (build-system meson-build-system) | ||||||
|     (arguments |     (arguments | ||||||
|      `(#:tests? #f ; XXX: tests require DocBook 4.1.2 |      `(#:configure-flags | ||||||
|        #:configure-flags |  | ||||||
|        '("--localstatedir=/var" |        '("--localstatedir=/var" | ||||||
|          "-Dsystemdsystemunitdir=/tmp/empty" |          "-Delogind=true" | ||||||
|          "-Dsystemd=false" |          "-Ddocbook=true" | ||||||
|          "-Delogind=true") |          "-Dgtk_doc=true" | ||||||
|  |          "-Dsystemdsystemunitdir=/tmp/empty") | ||||||
|        #:phases |        #:phases | ||||||
|        (modify-phases %standard-phases |        (modify-phases %standard-phases | ||||||
|          (add-after 'unpack 'patch-/bin/cat |          (add-after 'unpack 'patch-docbook-references | ||||||
|            (lambda _ |            ;; Having XML_CATALOG_FILES set is not enough; xmlto does not seem | ||||||
|              (substitute* "src/user.c" |            ;; to honor it. | ||||||
|                (("/bin/cat") (which "cat"))))) |            (lambda* (#:key inputs #:allow-other-keys) | ||||||
|          (add-before |              (substitute* (find-files "." "\\.xml(\\.in)?$") | ||||||
|           'configure 'pre-configure |                (("http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd") | ||||||
|           (lambda* (#:key inputs #:allow-other-keys) |                 (search-input-file inputs "share/xml/dbus-1/introspect.dtd")) | ||||||
|             (substitute* "meson_post_install.py" |                (("http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd") | ||||||
|               (("in dst_dirs") "in []")) |                 (search-input-file inputs "xml/dtd/docbook/docbookx.dtd"))))) | ||||||
|             (let ((shadow (assoc-ref inputs "shadow"))) |          (add-after 'unpack 'patch-paths | ||||||
|               (substitute* '("src/user.c" "src/daemon.c") |            (lambda* (#:key inputs #:allow-other-keys) | ||||||
|                 (("/usr/sbin/usermod") |              (substitute* "meson_post_install.py" | ||||||
|                  (string-append shadow "/sbin/usermod")) |                (("in dst_dirs") "in []")) | ||||||
|                 (("/usr/sbin/useradd") |              (substitute* '("src/user.c" "src/daemon.c") | ||||||
|                  (string-append shadow "/sbin/useradd")) |                (("/bin/cat") | ||||||
|                 (("/usr/sbin/userdel") |                 (search-input-file inputs "bin/cat")) | ||||||
|                  (string-append shadow "/sbin/userdel")) |                (("/usr/sbin/usermod") | ||||||
|                 (("/usr/bin/passwd") |                 (search-input-file inputs "sbin/usermod")) | ||||||
|                  (string-append shadow "/bin/passwd")) |                (("/usr/sbin/useradd") | ||||||
|                 (("/usr/bin/chage") |                 (search-input-file inputs "sbin/useradd")) | ||||||
|                  (string-append shadow "/bin/chage"))))))))) |                (("/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 |     (native-inputs | ||||||
|      `(("glib:bin" ,glib "bin") ; for gdbus-codegen, etc. |      (list docbook-xml-4.1.2 | ||||||
|        ("gobject-introspection" ,gobject-introspection) |            docbook-xsl | ||||||
|        ("intltool" ,intltool) |            `(,glib "bin")               ; for gdbus-codegen, etc. | ||||||
|        ("pkg-config" ,pkg-config))) |            gobject-introspection | ||||||
|  |            gtk-doc | ||||||
|  |            intltool | ||||||
|  |            libxml2                      ;for XML_CATALOG_FILES | ||||||
|  |            libxslt | ||||||
|  |            pkg-config | ||||||
|  |            python-dbusmock | ||||||
|  |            python-pygobject | ||||||
|  |            vala | ||||||
|  |            xmlto)) | ||||||
|     (inputs |     (inputs | ||||||
|      (list dbus elogind polkit shadow)) |      (list dbus | ||||||
|  |            elogind | ||||||
|  |            polkit | ||||||
|  |            shadow)) | ||||||
|     (home-page "https://www.freedesktop.org/wiki/Software/AccountsService/") |     (home-page "https://www.freedesktop.org/wiki/Software/AccountsService/") | ||||||
|     (synopsis "D-Bus interface for user account query and manipulation") |     (synopsis "D-Bus interface for user account query and manipulation") | ||||||
|     (description |     (description | ||||||
|  |  | ||||||
		Reference in a new issue