[gnome-continuous: 1/2] SpiderMonkey 60

[Philip Chimento <pchimento src gnome org>]

commit 63e9ca80e1156ad9a7b7121e57d18ba71a38db63
Author: Philip Chimento <philip chimento gmail com>
Date:   Sun Jul 22 22:59:15 2018 -0400

    SpiderMonkey 60
    
    Upstream tarballs can now be used without a laundry list of patches, so
    build from an upstream tarball, unlike mozjs52 which builds from my git
    repository. (Mozilla are not yet publishing their tarballs though, so
    for now the tarball still lives in releng.)
    
    See GNOME/gjs#161.

 manifest.json                  | 13 ++++++++++++
 patches/mozjs60-buildapi.patch | 48 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 61 insertions(+)
---
diff --git a/manifest.json b/manifest.json
index 187bbd3..99e8672 100644
--- a/manifest.json
+++ b/manifest.json
@@ -489,6 +489,19 @@
                                  "--with-intl-api",
                                  "AUTOCONF=autoconf"]},
 
+                {"src": 
"tarball:http://ftp.gnome.org/pub/gnome/teams/releng/tarballs-needing-help/mozjs/mozjs-60.1.0.tar.bz2";,
+                 "checksum": "834ffe877fdbbd81315ae3c101221fa404096c354483a86c1a02ece19fca68fd",
+                 "name": "mozjs60",
+                 "component": "minimal",
+                 "patches": ["mozjs60-buildapi.patch"],
+                 "config-opts": ["--enable-posix-nspr-emulation",
+                                 "--disable-jemalloc",
+                                 "--disable-tests",
+                                 "--disable-strip",
+                                 "--with-system-zlib",
+                                 "--with-intl-api",
+                                 "AUTOCONF=autoconf"]},
+
                {"src": "fd:polkit",
                 "config-opts": ["--disable-man-pages",
                                 "--enable-libsystemd-login",
diff --git a/patches/mozjs60-buildapi.patch b/patches/mozjs60-buildapi.patch
new file mode 100644
index 0000000..9676ad4
--- /dev/null
+++ b/patches/mozjs60-buildapi.patch
@@ -0,0 +1,48 @@
+From 3afb08668bea2060f1e5d8bae96eea14fc286bcf Mon Sep 17 00:00:00 2001
+From: Philip Chimento <philip endlessm com>
+Date: Wed, 15 Feb 2017 14:57:47 -0800
+Subject: [PATCH] build: Add toplevel trampoline configure/Makefile
+
+These just invoke the ones in js/src.
+---
+ build/moz.configure/init.configure |  2 +-
+ configure                          | 14 ++++++++++++++
+ 2 files changed, 15 insertions(+), 1 deletion(-)
+ create mode 100755 configure
+
+diff --git a/build/moz.configure/init.configure b/build/moz.configure/init.configure
+index 2123bebc..4d65bb8e 100644
+--- a/build/moz.configure/init.configure
++++ b/build/moz.configure/init.configure
+@@ -46,7 +46,7 @@ def check_build_environment(help, dist):
+ 
+     # Check for a couple representative files in the source tree
+     conflict_files = [
+-        '*         %s' % f for f in ('Makefile', 'config/autoconf.mk')
++        '*         %s' % f for f in ('js/src/Makefile', 'config/autoconf.mk')
+         if exists(os.path.join(topsrcdir, f))
+     ]
+     if conflict_files:
+diff --git a/configure b/configure
+new file mode 100755
+index 00000000..079dc784
+--- /dev/null
++++ b/configure
+@@ -0,0 +1,14 @@
++#!/bin/sh -x
++cat >Makefile <<ENDMAKEFILE
++all:
++      cd js/src && \$(MAKE)
++
++install:
++      cd js/src && \$(MAKE) install DESTDIR=\$(DESTDIR)
++ENDMAKEFILE
++srcdir=$(readlink -f $(dirname $0))
++mkdir -p js/src
++cd js/src
++touch $srcdir/js/src/configure  # timestamp wrong, because patched
++touch $srcdir/js/src/old-configure  # ditto
++exec $srcdir/js/src/configure "$@"
+-- 
+2.14.3
+