futurile/guix-play
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gnu: fprintd: Update to 1.94.1.

Browse Source 
* gnu/packages/freedesktop.scm (fprintd): Update to 1.94.1.
[arguments]: Remove obsolete 'patch-mistake and 'no-polkit-magic phases.
Make 'patch-systemd-dependencies regexp more specific.
Remove gi.repository.FPrint in the 'ignore-test-dependencies regexp.
[native-inputs]: Remove unused libxslt.
[inputs]: Remove unused gusb, nss, and pixman.
This commit is contained in:
Tobias Geerinckx-Rice 2021-12-11 03:08:24 +01:00
parent 9cbf66b6c7
commit 18bfe44ef6
No known key found for this signature in database
GPG Key ID: 0DB0FF884F556D79
1 changed files with 10 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
gnu/packages/freedesktop.scm
View File

@ -1683,16 +1683,16 @@ software.")
(define-public fprintd (define-public fprintd
(package (package
(name "fprintd") (name "fprintd")
(version "1.90.1") (version "1.94.1")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://gitlab.freedesktop.org/libfprint/fprintd") (url "https://gitlab.freedesktop.org/libfprint/fprintd")
(commit version))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "0mbzk263x7f58i9cxhs44mrngs7zw5wkm62j5r6xlcidhmfn03cg")))) (base32 "015j8ikyv48qz8vn6kfvkwwg5ydzppl1lzf7vkali9ymywywfxsw"))))
(build-system meson-build-system) (build-system meson-build-system)
(arguments (arguments
`(#:configure-flags `(#:configure-flags
@ -1716,25 +1716,19 @@ software.")
(("(dbus_data_dir = ).*" _ set) (("(dbus_data_dir = ).*" _ set)
(string-append set "get_option('prefix')" (string-append set "get_option('prefix')"
" / get_option('datadir')\n")))))) " / get_option('datadir')\n"))))))
(add-before 'configure 'patch-mistake
(lambda _
(substitute* "meson.build"
(("(storage_path = )(get_option\\('prefix'\\))(.*)"
_ set mistake value)
(string-append set "''" value "\n")))))
(add-before 'configure 'patch-systemd-dependencies (add-before 'configure 'patch-systemd-dependencies
(lambda _ (lambda _
(substitute* "meson.build" (substitute* "meson.build"
(("'(libsystemd|systemd)'") "'libelogind'")))) (("(dependency\\(')(libsystemd|systemd)" _ prefix)
(string-append prefix "libelogind")))))
(add-before 'configure 'ignore-test-dependencies (add-before 'configure 'ignore-test-dependencies
(lambda _ (lambda _
(substitute* "meson.build" (substitute* "meson.build"
((".*gi\\.repository\\..*") "")
(("pam_wrapper_dep .*") "") (("pam_wrapper_dep .*") "")
((".*'(cairo|dbus|dbusmock|gi|pypamtest)': .*,.*") "")))) ((".*'(cairo|dbus|dbusmock|gi|pypamtest)': .*,.*") ""))
(add-before 'install 'no-polkit-magic (substitute* "tests/pam/meson.build"
;; Meson ‘magically’ invokes pkexec, which fails (not setuid). ((".*pam_wrapper.*") "")))))
(lambda _
(setenv "PKEXEC_UID" "something"))))
#:tests? #f)) ; XXX depend on unpackaged packages #:tests? #f)) ; XXX depend on unpackaged packages
(native-inputs (native-inputs
`(("gettext" ,gettext-minimal) `(("gettext" ,gettext-minimal)
@ -1754,12 +1748,7 @@ software.")
elogind elogind
libfprint libfprint
linux-pam linux-pam
polkit polkit))
;; XXX These are in libfprint's Requires.private. Meson refuses to grant
;; the ‘libfprint-2’ dependency if they are not provided here.
gusb
nss
pixman))
(home-page "https://fprint.freedesktop.org/") (home-page "https://fprint.freedesktop.org/")
(synopsis "D-Bus daemon that exposes fingerprint reader functionality") (synopsis "D-Bus daemon that exposes fingerprint reader functionality")
(description (description