guix_mirror_bot pushed a commit to branch gnome-team
in repository guix.
commit 668b1ca8c01f54b33d0136dae6379f43426e97bb
Author: Maxim Cournoyer <[email protected]>
AuthorDate: Mon May 19 14:01:20 2025 +0900
gnu: gnome-keyring: Update to 48.0.
* gnu/packages/gnome.scm (gnome-keyring): Update to 48.0.
[build-system]: Switch to meson-build-system.
[arguments]<#:configure-flags>: Adjust accordingly. Add
“-Dsystemd=disabled”.
<#:phases>: Drop ‘fix-/bin/sh-reference’.
Use “meson test” in ‘check’.
[inputs]: Add libselinux.
---
gnu/packages/gnome.scm | 20 +++++++++-----------
1 file changed, 9 insertions(+), 11 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index cf553a2b47..9a7762f1e9 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -2551,7 +2551,7 @@ GNOME Desktop.")
(define-public gnome-keyring
(package
(name "gnome-keyring")
- (version "46.2")
+ (version "48.0")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/"
@@ -2559,23 +2559,20 @@ GNOME Desktop.")
name "-" version ".tar.xz"))
(sha256
(base32
- "098ryv7xsnf5r58w8kdr6nahzhmrczjb72ycbqlg7dx8p1kcj9mz"))))
- (build-system gnu-build-system)
+ "17gbzfj2rgbp1yb28mnxs3ngxmyqa26bwi4bkff3zsp9434ih1gj"))))
+ (build-system meson-build-system)
(arguments
(list
#:configure-flags
#~(list
- (string-append "--with-pkcs11-config="
+ (string-append "-Dpkcs11-config="
#$output "/share/p11-kit/modules/")
- (string-append "--with-pkcs11-modules="
- #$output "/share/p11-kit/modules/"))
+ (string-append "-Dpkcs11-modules="
+ #$output "/share/p11-kit/modules/")
+ "-Dsystemd=disabled")
#:parallel-tests? #f ; XXX: concurrency in dbus tests
#:phases
#~(modify-phases %standard-phases
- (add-after 'unpack 'fix-/bin/sh-reference
- (lambda _
- (substitute* "po/Makefile.in.in"
- (("/bin/sh") (which "sh")))))
(delete 'check)
(add-after 'install 'check
(lambda* (#:key tests? parallel-tests? #:allow-other-keys)
@@ -2583,7 +2580,7 @@ GNOME Desktop.")
(setenv "HOME" "/tmp") ;some tests require a writable HOME
(setenv "XDG_DATA_DIRS" (string-append (getenv "XDG_DATA_DIRS")
":" #$output "/share"))
- (invoke "dbus-run-session" "make" "check" "-j"
+ (invoke "dbus-run-session" "meson" "test" "-j"
(if parallel-tests?
(number->string (parallel-job-count))
"1"))))))))
@@ -2601,6 +2598,7 @@ GNOME Desktop.")
gettext-minimal
`(,glib "bin")
glib ;for m4 macros
+ libselinux
libxslt ;for documentation
pkg-config
python-wrapper)) ;for tests
