From 18bfe44ef6f008983e85ffdb10b2f511045dc5ad Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sat, 11 Dec 2021 03:08:24 +0100
Subject: gnu: fprintd: Update to 1.94.1.

* 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.
---
 gnu/packages/freedesktop.scm | 31 ++++++++++---------------------
 1 file changed, 10 insertions(+), 21 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index 27b2600af7..1f38ea3bc5 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -1683,16 +1683,16 @@ software.")
 (define-public fprintd
   (package
     (name "fprintd")
-    (version "1.90.1")
+    (version "1.94.1")
     (source
      (origin
        (method git-fetch)
        (uri (git-reference
              (url "https://gitlab.freedesktop.org/libfprint/fprintd")
-             (commit version)))
+             (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0mbzk263x7f58i9cxhs44mrngs7zw5wkm62j5r6xlcidhmfn03cg"))))
+        (base32 "015j8ikyv48qz8vn6kfvkwwg5ydzppl1lzf7vkali9ymywywfxsw"))))
     (build-system meson-build-system)
     (arguments
      `(#:configure-flags
@@ -1716,25 +1716,19 @@ software.")
                  (("(dbus_data_dir = ).*" _ set)
                   (string-append set "get_option('prefix')"
                                  " / 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
            (lambda _
              (substitute* "meson.build"
-               (("'(libsystemd|systemd)'") "'libelogind'"))))
+               (("(dependency\\(')(libsystemd|systemd)" _ prefix)
+                (string-append prefix "libelogind")))))
          (add-before 'configure 'ignore-test-dependencies
            (lambda _
              (substitute* "meson.build"
+               ((".*gi\\.repository\\..*") "")
                (("pam_wrapper_dep .*") "")
-               ((".*'(cairo|dbus|dbusmock|gi|pypamtest)': .*,.*") ""))))
-         (add-before 'install 'no-polkit-magic
-           ;; Meson ‘magically’ invokes pkexec, which fails (not setuid).
-           (lambda _
-             (setenv "PKEXEC_UID" "something"))))
+               ((".*'(cairo|dbus|dbusmock|gi|pypamtest)': .*,.*") ""))
+             (substitute* "tests/pam/meson.build"
+               ((".*pam_wrapper.*") "")))))
        #:tests? #f))                    ; XXX depend on unpackaged packages
     (native-inputs
      `(("gettext" ,gettext-minimal)
@@ -1754,12 +1748,7 @@ software.")
            elogind
            libfprint
            linux-pam
-           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))
+           polkit))
     (home-page "https://fprint.freedesktop.org/")
     (synopsis "D-Bus daemon that exposes fingerprint reader functionality")
     (description
-- 
cgit v1.2.3