34/86: gnu: gjs: Update to 1.58.8.

[guix-commits]

dannym pushed a commit to branch wip-desktop
in repository guix.

commit f833a21a15d4c342797743a3dd4dede4b212fdd0
Author: Raghav Gururajan <raghavgururajan@disroot.org>
AuthorDate: Sat Jun 6 00:05:37 2020 -0400

    gnu: gjs: Update to 1.58.8.
    
    * gnu/packages/gnome.scm (gjs): Update package definition.
    [version]: Update to 1.58.8.
    [source]<origin>[sha256]: Modify base32.
    [build-system]: Change from gnu to glib-or-gtk.
    [arguments]<#:configure-flags>[--enable-code-coverage]: New flag.
    [--enable-asan]: New flag.
    [--enable-ubsan]: New flag.
    [native-inputs]: Add gobject-introspection and lcov.
    [inputs]: Add ncurses and sysprof.
    [propagated-inputs]: Add glib and libffi.
    [home-page]: Modify.
    [license]: Add expat and lgpl2.0+. Remove gpl2+.
    
    Signed-off-by: Danny Milosavljevic <dannym@scratchpost.org>
---
 gnu/packages/gnome.scm | 100 +++++++++++++++++++++++++++----------------------
 1 file changed, 56 insertions(+), 44 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 8300d97..790027b 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -86,6 +86,7 @@
   #:use-module (gnu packages cdrom)
   #:use-module (gnu packages check)
   #:use-module (gnu packages cmake)
+  #:use-module (gnu packages code)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages crates-io)
   #:use-module (gnu packages cups)
@@ -125,6 +126,7 @@
   #:use-module (gnu packages iso-codes)
   #:use-module (gnu packages kerberos)
   #:use-module (gnu packages libcanberra)
+  #:use-module (gnu packages libffi)
   #:use-module (gnu packages libunistring)
   #:use-module (gnu packages libunwind)
   #:use-module (gnu packages libusb)
@@ -6479,61 +6481,71 @@ configuration program to choose applications starting 
on login.")
 (define-public gjs
   (package
     (name "gjs")
-    (version "1.58.3")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "mirror://gnome/sources/" name "/"
-                                  (version-major+minor version) "/"
-                                  name "-" version ".tar.xz"))
-              (sha256
-               (base32
-                "1bkksx362007zs8c31ydygb29spwa5g5kch1ad2grc2sp53wv7ya"))))
-    (build-system gnu-build-system)
+    (version "1.58.8")
+    (source
+     (origin
+       (method url-fetch)
+       (uri
+        (string-append "mirror://gnome/sources/" name "/"
+                       (version-major+minor version) "/"
+                       name "-" version ".tar.xz"))
+       (sha256
+        (base32 "10gkmxbhwpnq27db0gkn25b0gw28n05msjkzwjg3sdhpdisfpcvz"))))
+    (build-system glib-or-gtk-build-system)
     (arguments
-     '(#:phases
+     '(#:configure-flags
+       (list
+        "--enable-code-coverage"
+        "--enable-asan"
+        "--enable-ubsan")
+       #:phases
        (modify-phases %standard-phases
          (add-before
-          'check 'pre-check
-          (lambda _
-            ;; The test suite requires a running X server.
-            (system "Xvfb :1 &")
-            (setenv "DISPLAY" ":1")
-
-            ;; For the missing /etc/machine-id.
-            (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)))))
+             'check 'pre-check
+           (lambda _
+             ;; The test suite requires a running X server.
+             (system "Xvfb :1 &")
+             (setenv "DISPLAY" ":1")
+             ;; For the missing /etc/machine-id.
+             (setenv "DBUS_FATAL_WARNINGS" "0")
+             ;; Our mozjs 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
-     `(("glib:bin" ,glib "bin")       ; for glib-compile-resources
+     `(("dbus-launch" ,dbus)
+       ("dconf" ,dconf)
+       ("glib:bin" ,glib "bin")
+       ("gobject-introspection" ,gobject-introspection)
+       ("lcov" ,lcov)
        ("pkg-config" ,pkg-config)
-       ("xmllint" ,libxml2)
-       ;; For testing
-       ("dbus-launch" ,dbus)
-       ("dconf" ,dconf) ; required to properly store settings
        ("uuidgen" ,util-linux)
+       ("xmllint" ,libxml2)
        ("xvfb" ,xorg-server-for-tests)))
+    (inputs
+     `(("gtk+" ,gtk+)
+       ("ncurses" ,ncurses)
+       ("readline" ,readline)
+       ("sysprof" ,sysprof)))
     (propagated-inputs
-     ;; These are all in the Requires.private field of gjs-1.0.pc.
      `(("cairo" ,cairo)
-       ("gobject-introspection" ,gobject-introspection)
+       ("glib" ,glib)
+       ("libffi" ,libffi)
        ("mozjs" ,mozjs-60)))
-    (inputs
-     `(("gtk+" ,gtk+)
-       ("readline" ,readline)))
     (synopsis "Javascript bindings for GNOME")
-    (home-page "https://live.gnome.org/Gjs";)
-    (description
-     "Gjs is a javascript binding for GNOME.  It's mainly based on spidermonkey
-javascript engine and the GObject introspection framework.")
-    (license license:gpl2+)))
+    (description "Gjs is a javascript binding for GNOME.  It's mainly based on
+spidermonkey javascript engine and the GObject introspection framework.")
+    (home-page "https://wiki.gnome.org/Projects/Gjs";)
+    (license
+     ;; The project is dual-licensed.
+     (list
+      license:expat
+      license:lgpl2.0+))))
 
 (define-public gedit
   (package