[gnome-sdk-images] SpiderMonkey 60

[Mathieu Bridon <mbridon src gnome org>]

commit fc08d1d14df698a0b85fae05e393eb3ab880362f
Author: Philip Chimento <philip chimento gmail com>
Date:   Sun Jul 22 22:45:10 2018 -0400

    SpiderMonkey 60
    
    Upstream tarballs can now be used without a laundry list of patches, so
    build from an upstream tarball. (They are not yet publishing their
    tarballs though, so for now it still lives in releng.)
    
    The bug for which -fno-schedule-insns was required on ARM, has been
    fixed, as well as bugs around installing headers in the correct location.
    
    The --disable-jemalloc configure option is now required.
    
    See GNOME/gjs#161.

 org.gnome.Sdk.json.in | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)
---
diff --git a/org.gnome.Sdk.json.in b/org.gnome.Sdk.json.in
index b3fd91c..3cce356 100644
--- a/org.gnome.Sdk.json.in
+++ b/org.gnome.Sdk.json.in
@@ -722,7 +722,7 @@
             ]
         },
         {
-            "name": "mozjs52",
+            "name": "mozjs60",
             "build-options": {
                 "arch" : {
                     "i386" : {
@@ -731,9 +731,6 @@
                         ]
                     },
                     "arm" : {
-                        /* Workaround for bug seebugzilla.gnome.org, bug 790097 */
-                        "cflags": "-fno-schedule-insns",
-                        "cxxflags": "-fno-schedule-insns",
                         "config-opts" : [
                             "--host=arm-unknown-linux-gnueabi"
                         ]
@@ -744,17 +741,17 @@
                               "--with-system-zlib",
                               "--without-system-icu",
                               "--with-intl-api",
+                              "--disable-jemalloc",
                               "AUTOCONF=autoconf"],
             "subdir": "js/src",
             "sources": [
                 {
-                    "type": "git",
-                    "url": "https://github.com/ptomato/mozjs.git";,
-                    "branch": "mozjs52"
+                    "type": "archive",
+                    "url": 
"http://ftp.gnome.org/pub/gnome/teams/releng/tarballs-needing-help/mozjs/mozjs-60.1.0.tar.bz2";,
+                    "sha256": "834ffe877fdbbd81315ae3c101221fa404096c354483a86c1a02ece19fca68fd"
                 }
             ],
             "post-install": [
-                "cp -p js/src/js-config.h /usr/include/mozjs-52",
                 "rm /usr/lib/*/libjs_static.ajs"
             ]
         },