me
/
guix
Archived
1
0
Fork 0

gnu: gjs: Update to 1.68.2.

* gnu/packages/gnome.scm (gjs): Update to 1.68.2.
[source]: Move a pre-check phase substitution to a snippet.
[build-system]: Switch to meson.
[arguments]<#:configure-flags>: Do not install tests.
<#:phases>: Remove pre-check phase substitutions.
[propagated-inputs]: Switch to mozjs 78.
Mathieu Othacehe 2021-08-19 11:00:34 +02:00
parent 410e9f1dbd
commit 2ecd8b2e0e
No known key found for this signature in database
GPG Key ID: 8354763531769CA6
1 changed files with 19 additions and 23 deletions

View File

@ -7088,7 +7088,7 @@ configuration program to choose applications starting on login.")
(define-public gjs (define-public gjs
(package (package
(name "gjs") (name "gjs")
(version "1.58.3") (version "1.68.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/" (uri (string-append "mirror://gnome/sources/" name "/"
@ -7096,30 +7096,26 @@ configuration program to choose applications starting on login.")
name "-" version ".tar.xz")) name "-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1bkksx362007zs8c31ydygb29spwa5g5kch1ad2grc2sp53wv7ya")))) "0c7fclm53v41n5vfndymp35fbh1x218lrk65iqrk1wc2lsnh5zvh"))
(build-system gnu-build-system) (modules '((guix build utils)))
(snippet
'(begin
(substitute* "installed-tests/scripts/testCommandLine.sh"
(("Valentín") "")
(("☭") ""))))))
(build-system meson-build-system)
(arguments (arguments
'(#:phases '(#:configure-flags '("-Dinstalled_tests=false")
#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-before (add-before 'check 'pre-check
'check 'pre-check
(lambda _ (lambda _
;; The test suite requires a running X server. ;; The test suite requires a running X server.
(system "Xvfb :1 &") (system "Xvfb :1 &")
(setenv "DISPLAY" ":1") (setenv "DISPLAY" ":1")
;; For the missing /etc/machine-id. ;; For the missing /etc/machine-id.
(setenv "DBUS_FATAL_WARNINGS" "0") (setenv "DBUS_FATAL_WARNINGS" "0"))))))
;; Our mozjs-38 package does not compile the required Intl API
;; support for these failing tests.
(substitute* "installed-tests/js/testLocale.js"
((".*toBeDefined.*") "")
((".*expect\\(datestr\\).*") ""))
(substitute* "installed-tests/scripts/testCommandLine.sh"
(("Valentín") "")
(("☭") ""))
#t)))))
(native-inputs (native-inputs
`(("glib:bin" ,glib "bin") ; for glib-compile-resources `(("glib:bin" ,glib "bin") ; for glib-compile-resources
("pkg-config" ,pkg-config) ("pkg-config" ,pkg-config)
@ -7133,7 +7129,7 @@ configuration program to choose applications starting on login.")
;; These are all in the Requires.private field of gjs-1.0.pc. ;; These are all in the Requires.private field of gjs-1.0.pc.
`(("cairo" ,cairo) `(("cairo" ,cairo)
("gobject-introspection" ,gobject-introspection) ("gobject-introspection" ,gobject-introspection)
("mozjs" ,mozjs-60))) ("mozjs" ,mozjs-78)))
(inputs (inputs
`(("gtk+" ,gtk+) `(("gtk+" ,gtk+)
("readline" ,readline))) ("readline" ,readline)))