gnu: gcr: Update to 3.41.1, delete trailing #t and input labels.
* gnu/packages/gnome.scm (gcr): Update to 3.41.1. [phases]: Delete trailing #t. {disable-failing-tests}: Delete phase. {fix-systemd-detection}: Likewise. {remove-fatal-warnings-option}: New phase. {check}: New phase override. [native-inputs, propagated-inputs]: Delete input labels. [native-inputs]: Sort inputs. Add gi-docgen. Remove autoconf, automake and libtool.
This commit is contained in:
parent
abfa74c68b
commit
bfcd2a86fb
|
@ -2325,7 +2325,7 @@ (define-public gnome-font-viewer
|
||||||
(define-public gcr
|
(define-public gcr
|
||||||
(package
|
(package
|
||||||
(name "gcr")
|
(name "gcr")
|
||||||
(version "3.41.0")
|
(version "3.41.1")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (string-append "mirror://gnome/sources/" name "/"
|
(uri (string-append "mirror://gnome/sources/" name "/"
|
||||||
|
@ -2333,56 +2333,62 @@ (define-public gcr
|
||||||
name "-" version ".tar.xz"))
|
name "-" version ".tar.xz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"00fsf82ycac8qi0kkiq759p6jrn63pyz4ksn4wnq7m4ax94zq289"))))
|
"0kx2pv272p0qc0nq1287gciyn34d95yxg41vq3lzxfzyqaijhwdv"))))
|
||||||
(build-system meson-build-system)
|
(build-system meson-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
`(#:meson ,meson-0.60
|
(list
|
||||||
#:phases
|
#:phases
|
||||||
(modify-phases %standard-phases
|
#~(modify-phases %standard-phases
|
||||||
;; These fail because /var/lib/dbus/machine-id is not present in the
|
(add-after 'unpack 'remove-fatal-warnings-option
|
||||||
;; build environment.
|
;; Otherwise, the gi-docgen tool would fail because of the
|
||||||
(add-after 'unpack 'disable-failing-tests
|
;; "Fontconfig error: No writable cache directories" warnings.
|
||||||
(lambda _
|
(lambda _
|
||||||
(substitute* "gcr/meson.build"
|
(substitute* (find-files "." "^meson\\.build$")
|
||||||
(("[[:blank:]]+'system-prompt',")
|
((".*'--fatal-warnings',.*") ""))))
|
||||||
""))
|
(add-after 'unpack 'skip-gtk-update-icon-cache
|
||||||
#t))
|
;; Don't create 'icon-theme.cache'.
|
||||||
(add-after 'unpack 'skip-gtk-update-icon-cache
|
(lambda _
|
||||||
;; Don't create 'icon-theme.cache'.
|
(substitute* "meson_post_install.py"
|
||||||
(lambda _
|
(("gtk-update-icon-cache") "true"))))
|
||||||
(substitute* "meson_post_install.py"
|
(add-before 'check 'pre-check
|
||||||
(("gtk-update-icon-cache") "true"))
|
(lambda _
|
||||||
#t))
|
;; Some tests expect to write to $HOME.
|
||||||
(add-after 'unpack 'fix-systemd-detection
|
(setenv "HOME" "/tmp")))
|
||||||
(lambda _
|
(replace 'check
|
||||||
(substitute* "gcr/gcr-ssh-agent-service.c"
|
(lambda* (#:key parallel-tests? tests? #:allow-other-keys)
|
||||||
(("#ifdef WITH_SYSTEMD")
|
(when tests?
|
||||||
"#if (WITH_SYSTEMD)"))))
|
(setenv "MESON_TESTTHREADS"
|
||||||
(add-before 'check 'pre-check
|
(if parallel-tests?
|
||||||
(lambda _
|
(number->string (parallel-job-count))
|
||||||
;; Some tests expect to write to $HOME.
|
"1"))
|
||||||
(setenv "HOME" "/tmp")
|
;; Work around the "mock prompter couldn't get session bus
|
||||||
#t)))))
|
;; address: Cannot spawn a message bus without a machine-id"
|
||||||
|
;; error by manually creating the session bus via
|
||||||
|
;; 'dbus-run-session'.
|
||||||
|
(invoke "dbus-run-session" "--"
|
||||||
|
"meson" "test" "-t" "0")))))))
|
||||||
(inputs
|
(inputs
|
||||||
(list dbus gnupg ;called as a child process during tests
|
(list dbus
|
||||||
libgcrypt libsecret))
|
gnupg
|
||||||
|
libgcrypt
|
||||||
|
libsecret))
|
||||||
(native-inputs
|
(native-inputs
|
||||||
`(("python" ,python-wrapper) ;for tests
|
(list gettext-minimal
|
||||||
("openssh" ,openssh) ;for tests
|
gi-docgen
|
||||||
("pkg-config" ,pkg-config)
|
`(,glib "bin")
|
||||||
("gettext" ,gettext-minimal)
|
gobject-introspection
|
||||||
("autoconf" ,autoconf)
|
gtk-doc
|
||||||
("automake" ,automake)
|
libxml2
|
||||||
("libtool" ,libtool)
|
libxslt
|
||||||
("gtk-doc" ,gtk-doc)
|
openssh
|
||||||
("glib" ,glib "bin")
|
pkg-config
|
||||||
("gobject-introspection" ,gobject-introspection)
|
python-wrapper
|
||||||
("libxml2" ,libxml2)
|
vala))
|
||||||
("vala" ,vala)
|
|
||||||
("xsltproc" ,libxslt)))
|
|
||||||
;; mentioned in gck.pc, gcr.pc and gcr-ui.pc
|
;; mentioned in gck.pc, gcr.pc and gcr-ui.pc
|
||||||
(propagated-inputs
|
(propagated-inputs
|
||||||
(list p11-kit glib gtk+))
|
(list glib
|
||||||
|
gtk+
|
||||||
|
p11-kit))
|
||||||
(home-page "https://www.gnome.org")
|
(home-page "https://www.gnome.org")
|
||||||
(synopsis "Libraries for displaying certificates and accessing key stores")
|
(synopsis "Libraries for displaying certificates and accessing key stores")
|
||||||
(description
|
(description
|
||||||
|
|
Loading…
Reference in a new issue