From c1a4ef98932799adbd278068fa4fdd8c24fff714 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 22 Aug 2022 17:39:01 -0400 Subject: gnu: libsecret: Update to 0.20.5, use gexps and remove input labels. * gnu/packages/gnome.scm (libsecret): Update to 0.20.5. [outputs]: Delete doc output. [configure-flags]: Use gexps. Remove --with-html-dir and add -Dgtk_doc. [phases]{disable-problematic-tests}: New phase. {check}: Override and move after the install phase. [inputs]: Move docbook-xsl and libxml2 to... [native-inputs]: ... here. Remove input labels. Add dbus, docbook-xml-4.2, python, python-dbus and python-pygobject. --- gnu/packages/gnome.scm | 59 ++++++++++++++++++++++++++++++++++---------------- 1 file changed, 40 insertions(+), 19 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index ae46e55c51..da123eefe8 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4997,7 +4997,7 @@ (define-public libsoup (define-public libsecret (package (name "libsecret") - (version "0.20.4") + (version "0.20.5") (source (origin (method url-fetch) (uri (string-append @@ -5006,28 +5006,49 @@ (define-public libsecret "libsecret-" version ".tar.xz")) (sha256 (base32 - "0a4xnfmraxchd9cq5ai66j12jv2vrgjmaaxz25kl031jvda4qnij")))) - (build-system gnu-build-system) - (outputs '("out" "doc")) + "0k9bs47rzb3dwvznb4179d6nw7rbzjdyd4y8hx6vazfd1wscxcrz")))) + (build-system meson-build-system) (arguments - `(#:tests? #f ; FIXME: Testing hangs. - #:configure-flags - (list (string-append "--with-html-dir=" - (assoc-ref %outputs "doc") - "/share/gtk-doc/html")))) + (list + #:configure-flags + #~(list "-Dgtk_doc=false") ;requires gi-docgen + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'disable-problematic-tests + (lambda _ + (substitute* "libsecret/meson.build" + ;; The test-collection test fails non-deterministically (see: + ;; https://gitlab.gnome.org/GNOME/libsecret/-/issues/80). + ((".*'test-collection',.*") "")))) + (delete 'check) + (add-after 'install 'check + (lambda* (#:key tests? test-options #:allow-other-keys) + (when tests? + (setenv "HOME" "/tmp") + (setenv "XDG_DATA_DIRS" ;for /org/freedesktop/secrets/collection + (string-append #$output "/share:" + (getenv "XDG_DATA_DIRS"))) + (apply invoke "dbus-run-session" "--" + "meson" "test" "--print-errorlogs" "-t" "0" + test-options))))))) (native-inputs - `(("gettext" ,gettext-minimal) - ("glib:bin" ,glib "bin") ; for gdbus-codegen, etc. - ("gobject-introspection" ,gobject-introspection) - ("pkg-config" ,pkg-config) - ("vala" ,vala) - ("xsltproc" ,libxslt))) + (list dbus + docbook-xml-4.2 + docbook-xsl + gettext-minimal + `(,glib "bin") ;for gdbus-codegen, etc. + gobject-introspection + libxml2 ;for XML_CATALOG_FILES + libxslt + pkg-config + python + python-dbus + python-pygobject + vala)) (propagated-inputs - (list glib)) ; required by libsecret-1.pc + (list glib)) ;required by libsecret-1.pc (inputs - ;; The ‘build’ phase complains about missing docbook-xml-4.2 but adding it - ;; doesn't seem to affect the build result. - (list docbook-xsl libgcrypt libxml2)) ; for XML_CATALOG_FILES + (list libgcrypt)) (home-page "https://wiki.gnome.org/Projects/Libsecret/") (synopsis "GObject bindings for \"Secret Service\" API") (description -- cgit v1.2.3 From ad99842136dbf43d9645bfff73e465a32212488e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 27 Aug 2022 04:04:22 +0200 Subject: gnu: libsecret: Propagate libgcrypt. This is a follow-up to commit c1a4ef98932799adbd278068fa4fdd8c24fff714. * gnu/packages/gnome.scm (libsecret)[inputs]: Remove. [propagated-inputs]: Add LIBGCRYPT. --- gnu/packages/gnome.scm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index da123eefe8..d44a222ed7 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5046,9 +5046,7 @@ (define-public libsecret python-pygobject vala)) (propagated-inputs - (list glib)) ;required by libsecret-1.pc - (inputs - (list libgcrypt)) + (list glib libgcrypt)) ;required by libsecret-1.pc (home-page "https://wiki.gnome.org/Projects/Libsecret/") (synopsis "GObject bindings for \"Secret Service\" API") (description -- cgit v1.2.3 From de2dbbcda5df0612523bbfd50a8d0dad56c9813d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 27 Aug 2022 04:05:57 +0200 Subject: gnu: gjs: Build with mozjs 78. This is a follow-up to commit d6fa3ac7a8203173b125390aed596832565a3687. * gnu/packages/gnome.scm (gjs)[propagated-inputs]: Change from MOZJS to MOZJS-78. --- gnu/packages/gnome.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index d44a222ed7..124d7f6952 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -7287,7 +7287,7 @@ (define-public gjs ("xvfb" ,xorg-server-for-tests))) (propagated-inputs ;; These are all in the Requires.private field of gjs-1.0.pc. - (list cairo gobject-introspection mozjs)) + (list cairo gobject-introspection mozjs-78)) (inputs (list gtk+ readline)) (synopsis "Javascript bindings for GNOME") -- cgit v1.2.3 From 8888e9bfb2f101261e4c4b6e8152c2a35df87952 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 27 Aug 2022 04:09:40 +0200 Subject: gnu: gjs: Remove input labels. * gnu/packages/gnome.scm (gjs)[native-inputs]: Remove labels. --- gnu/packages/gnome.scm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 124d7f6952..a349f106bb 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -7277,14 +7277,14 @@ (define-public gjs ;; For the missing /etc/machine-id. (setenv "DBUS_FATAL_WARNINGS" "0")))))) (native-inputs - `(("glib:bin" ,glib "bin") ; for glib-compile-resources - ("pkg-config" ,pkg-config) - ("xmllint" ,libxml2) - ;; For testing - ("dbus-launch" ,dbus) - ("dconf" ,dconf) ; required to properly store settings - ("uuidgen" ,util-linux) - ("xvfb" ,xorg-server-for-tests))) + (list `(,glib "bin") ;for glib-compile-resources + pkg-config + libxml2 + ;; For testing + dbus + dconf ;required to properly store settings + util-linux + xorg-server-for-tests)) (propagated-inputs ;; These are all in the Requires.private field of gjs-1.0.pc. (list cairo gobject-introspection mozjs-78)) -- cgit v1.2.3 From bff11d6ac2d99cc5e6964acbf7d94861ba98ea86 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 27 Aug 2022 15:49:48 +0200 Subject: gnu: gjs: Update to 1.72.2. * gnu/packages/gnome.scm (gjs): Update to 1.72.2. [arguments]: Remove #:meson. [propagated-inputs]: Change from MOZJS-78 to MOZJS-91. --- gnu/packages/gnome.scm | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index a349f106bb..44effe2b2b 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -7245,7 +7245,7 @@ (define-public gnome-session (define-public gjs (package (name "gjs") - (version "1.70.0") + (version "1.72.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -7253,7 +7253,7 @@ (define-public gjs name "-" version ".tar.xz")) (sha256 (base32 - "0pqwhq0znprs0h5ixz396912acwzk9zvjfhi9qvh52ii38s2j1jb")) + "0xrrv9lsi087yb9yf146a1aarf5yh6rf4jw9blx30zasvjdkgvnx")) (modules '((guix build utils))) (snippet '(begin @@ -7262,10 +7262,7 @@ (define-public gjs (("☭") "")))))) (build-system meson-build-system) (arguments - ;; Use meson-0.59, otherwise we'd get "ERROR: "install_dir" must be - ;; specified when installing a target". - `(#:meson ,meson-0.59 - #:configure-flags '("-Dinstalled_tests=false") + '(#:configure-flags '("-Dinstalled_tests=false") #:phases (modify-phases %standard-phases (add-before 'check 'pre-check @@ -7287,7 +7284,7 @@ (define-public gjs xorg-server-for-tests)) (propagated-inputs ;; These are all in the Requires.private field of gjs-1.0.pc. - (list cairo gobject-introspection mozjs-78)) + (list cairo gobject-introspection mozjs-91)) (inputs (list gtk+ readline)) (synopsis "Javascript bindings for GNOME") -- cgit v1.2.3