From 004c8bbf589b502dfbb36c7d33ddfc76a440ab20 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Tue, 11 Aug 2020 06:21:31 -0400
Subject: [PATCH 63/65] gnu: gjs: Update package definition.

* gnu/packages/gnome.scm (gjs) [version]: Update to 1.64.4.
[source]<origin>[sha256]: Modify base32.
[build-system]: Change from glib-or-gtk to meson.
[arguments]<#:glib-or-gtk?>: New argument.
<#:phases>['pre-check]: Modify phase.
[propagated-inputs]: Replace mozjs-60 with mozjs-68.
---
 gnu/packages/gnome.scm | 25 ++++++++-----------------
 1 file changed, 8 insertions(+), 17 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 9469c0a1f2..dfb65826fc 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -8385,7 +8385,7 @@ configuration program to choose applications starting on login.")
 (define-public gjs
   (package
     (name "gjs")
-    (version "1.58.8")
+    (version "1.64.4")
     (source
      (origin
        (method url-fetch)
@@ -8394,14 +8394,13 @@ configuration program to choose applications starting on login.")
                        (version-major+minor version) "/"
                        name "-" version ".tar.xz"))
        (sha256
-        (base32 "10gkmxbhwpnq27db0gkn25b0gw28n05msjkzwjg3sdhpdisfpcvz"))))
-    (build-system glib-or-gtk-build-system)
+        (base32 "0k6l2qc2vkws34zrgdhl57qxf0jjkar2iziz6qn4n1w7va73mk53"))))
+    (build-system meson-build-system)
     (arguments
-     '(#:configure-flags
+     `(#:glib-or-gtk? #t     ; To wrap binaries and/or compile schemas
+       #:configure-flags
        (list
-        "--enable-code-coverage"
-        "--enable-asan"
-        "--enable-ubsan")
+        "-Dinstalled_tests=false")
        #:phases
        (modify-phases %standard-phases
          (add-before
@@ -8412,17 +8411,9 @@ configuration program to choose applications starting on login.")
              (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
-     `(("dbus-launch" ,dbus)
+     `(("dbus" ,dbus)
        ("dconf" ,dconf)
        ("glib:bin" ,glib "bin")
        ("gobject-introspection" ,gobject-introspection)
@@ -8440,7 +8431,7 @@ configuration program to choose applications starting on login.")
      `(("cairo" ,cairo)
        ("glib" ,glib)
        ("libffi" ,libffi)
-       ("mozjs" ,mozjs-60)))
+       ("mozjs" ,mozjs-68)))
     (synopsis "Javascript bindings for GNOME")
     (description "Gjs is a javascript binding for GNOME.  It's mainly based on
 spidermonkey javascript engine and the GObject introspection framework.")
-- 
2.28.0