* bug#27058: [PATCH] gnu: gjs: Update to 1.48.3.
@ 2017-05-24 15:55 Kei Kebreau
2017-05-24 16:03 ` Marius Bakke
0 siblings, 1 reply; 3+ messages in thread
From: Kei Kebreau @ 2017-05-24 15:55 UTC (permalink / raw)
To: 27058; +Cc: Kei Kebreau
* gnu/packages/gnome.scm (gjs): Update to 1.48.3.
[source]: Remove snippet.
[arguments]: Disable failing tests.
[propagated-inputs]: Use mozjs-38 instead of mozjs-24; add cairo.
---
gnu/packages/gnome.scm | 22 ++++++++++------------
1 file changed, 10 insertions(+), 12 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index d53d15894..2cf6f4e3f 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -4174,7 +4174,7 @@ configuration program to choose applications starting on login.")
(define-public gjs
(package
(name "gjs")
- (version "1.46.0")
+ (version "1.48.3")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/"
@@ -4182,10 +4182,7 @@ configuration program to choose applications starting on login.")
name "-" version ".tar.xz"))
(sha256
(base32
- "1m2ssa6qsipbp8lz4xbhf0nhadhv0xkdpmz1jcvl9187lwgmk0r2"))
- (modules '((guix build utils)))
- (snippet '(substitute* "test/run-with-dbus"
- (("/bin/rm") "rm")))))
+ "0cqgv460wfhwkw6j1h46v6bg29bycg6dfl7c5rv0lfcqmmw7v6v6"))))
(build-system gnu-build-system)
(arguments
'(#:phases
@@ -4200,11 +4197,11 @@ configuration program to choose applications starting on login.")
;; For the missing /etc/machine-id.
(setenv "DBUS_FATAL_WARNINGS" "0")
- ;; XXX: fails with:
- ;; Failed to convert UTF-8 string to JS string: ...
- ;; TODO: actually fix it.
- (substitute* "installed-tests/js/testEverythingBasic.js"
- ((".*test_utf8_inout.*") ""))
+ ;; 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\\).*") ""))
#t)))))
(native-inputs
`(("glib:bin" ,glib "bin") ; for glib-compile-resources
@@ -4216,8 +4213,9 @@ configuration program to choose applications starting on login.")
("xvfb" ,xorg-server)))
(propagated-inputs
;; These are all in the Requires.private field of gjs-1.0.pc.
- `(("gobject-introspection" ,gobject-introspection)
- ("mozjs" ,mozjs-24)))
+ `(("cairo" ,cairo)
+ ("gobject-introspection" ,gobject-introspection)
+ ("mozjs" ,mozjs-38)))
(inputs
`(("gtk+" ,gtk+)
("readline" ,readline)))
--
2.13.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* bug#27058: [PATCH] gnu: gjs: Update to 1.48.3.
2017-05-24 15:55 bug#27058: [PATCH] gnu: gjs: Update to 1.48.3 Kei Kebreau
@ 2017-05-24 16:03 ` Marius Bakke
2017-05-24 17:04 ` Kei Kebreau
0 siblings, 1 reply; 3+ messages in thread
From: Marius Bakke @ 2017-05-24 16:03 UTC (permalink / raw)
To: Kei Kebreau, 27058
[-- Attachment #1: Type: text/plain, Size: 243 bytes --]
Kei Kebreau <kei@openmailbox.org> writes:
> * gnu/packages/gnome.scm (gjs): Update to 1.48.3.
> [source]: Remove snippet.
> [arguments]: Disable failing tests.
> [propagated-inputs]: Use mozjs-38 instead of mozjs-24; add cairo.
Great, LGTM!
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* bug#27058: [PATCH] gnu: gjs: Update to 1.48.3.
2017-05-24 16:03 ` Marius Bakke
@ 2017-05-24 17:04 ` Kei Kebreau
0 siblings, 0 replies; 3+ messages in thread
From: Kei Kebreau @ 2017-05-24 17:04 UTC (permalink / raw)
To: Marius Bakke; +Cc: 27058-done
[-- Attachment #1: Type: text/plain, Size: 358 bytes --]
Marius Bakke <mbakke@fastmail.com> writes:
> Kei Kebreau <kei@openmailbox.org> writes:
>
>> * gnu/packages/gnome.scm (gjs): Update to 1.48.3.
>> [source]: Remove snippet.
>> [arguments]: Disable failing tests.
>> [propagated-inputs]: Use mozjs-38 instead of mozjs-24; add cairo.
>
> Great, LGTM!
Thanks! Pushed as 144f94d0a212f1cecd28be59b99e867fbd58aa93.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-05-24 17:05 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-05-24 15:55 bug#27058: [PATCH] gnu: gjs: Update to 1.48.3 Kei Kebreau
2017-05-24 16:03 ` Marius Bakke
2017-05-24 17:04 ` Kei Kebreau
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).