[gtk-osx: 3/8] js24 and Javascript for modulesets-unstable

[John Ralls <jralls src gnome org>]

commit f235258603e4d7acfa81e1b671eba93cf5ff7b00
Author: Philip Chimento <philip chimento gmail com>
Date:   Sat Mar 15 13:46:13 2014 -0700

    js24 and Javascript for modulesets-unstable
    
    Master-branch GJS requires js24 instead of js17. This adds js24 to
    all three modulesets (since it builds from a tarball anyway) and also
    adds a meta-gtk-osx-javascript target for modulesets-unstable, since
    we can now build GJS from master.

 modulesets-stable/gtk-osx-javascript.modules   |   15 +++++
 modulesets-unstable/gtk-osx-javascript.modules |   71 ++++++++++++++++++++++++
 modulesets-unstable/gtk-osx.modules            |    1 +
 modulesets/gtk-osx-javascript.modules          |   15 +++++
 4 files changed, 102 insertions(+), 0 deletions(-)
---
diff --git a/modulesets-stable/gtk-osx-javascript.modules b/modulesets-stable/gtk-osx-javascript.modules
index c4595b8..fa151e6 100644
--- a/modulesets-stable/gtk-osx-javascript.modules
+++ b/modulesets-stable/gtk-osx-javascript.modules
@@ -47,6 +47,21 @@
     </after>
   </autotools>
 
+  <autotools id="js24" autogen-sh="configure"
+             autogenargs="--with-system-nspr --with-system-zlib --enable-system-ffi --enable-threadsafe">
+    <branch repo="mozilla" module="js/mozjs-24.2.0.tar.bz2" version="24.2.0"
+            checkoutdir="js24-24.2.0" source-subdir="js/src"
+            hash="sha1:ce779081cc11bd0c871c6f303fc4a0091cf4fe66"/>
+    <dependencies>
+      <dep package="libffi"/>
+      <dep package="nspr"/>
+    </dependencies>
+    <after>
+      <dep package="python"/>
+      <dep package="zlib"/>
+    </after>
+  </autotools>
+
   <autotools id="nspr" autogen-sh="mozilla/nsprpub/configure"
              autogenargs="--enable-64bit" check-target="false">
     <branch repo="mozilla" version="4.9.2"
diff --git a/modulesets-unstable/gtk-osx-javascript.modules b/modulesets-unstable/gtk-osx-javascript.modules
new file mode 100644
index 0000000..c710a28
--- /dev/null
+++ b/modulesets-unstable/gtk-osx-javascript.modules
@@ -0,0 +1,71 @@
+<?xml version="1.0"?>
+<!DOCTYPE moduleset SYSTEM "moduleset.dtd">
+<?xml-stylesheet type="text/xsl" href="moduleset.xsl"?>
+<moduleset>
+
+  <repository name="gnome" type="git" default="yes"
+              href="git://git.gnome.org/"/>
+  <repository name="mozilla" type="tarball" href="ftp://ftp.mozilla.org/pub/"/>
+
+  <metamodule id="meta-gtk-osx-javascript">
+    <dependencies>
+      <dep package="gjs"/>
+    </dependencies>
+    <after>
+      <dep package="meta-gtk-osx-gtk3"/>
+      <dep package="meta-gtk-osx-bootstrap"/>
+    </after>
+  </metamodule>
+
+  <autotools id="gjs" autogenargs="--enable-installed-tests">
+    <branch tag="master"/>
+    <dependencies>
+      <dep package="gobject-introspection"/>
+      <dep package="js24"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="js17" check-target="false" autogen-sh="configure"
+             supports-non-srcdir-builds="no"
+             autogenargs="--enable-threadsafe --with-system-nspr --with-system-zlib --enable-system-ffi">
+    <branch repo="mozilla" module="js/mozjs17.0.0.tar.gz" version="17.0.0"
+            hash="md5:20b6f8f1140ef6e47daa3b16965c9202"
+            checkoutdir="js17-17.0.0">
+      <patch file="js17-build-fixes.patch" strip="1"/>
+    </branch>
+    <dependencies>
+      <dep package="libffi"/>
+      <dep package="nspr"/>
+    </dependencies>
+    <after>
+      <dep package="python"/>
+      <dep package="zlib"/>
+    </after>
+  </autotools>
+
+  <autotools id="js24" autogen-sh="configure"
+             autogenargs="--with-system-nspr --with-system-zlib --enable-system-ffi --enable-threadsafe">
+    <branch repo="mozilla" module="js/mozjs-24.2.0.tar.bz2" version="24.2.0"
+            checkoutdir="js24-24.2.0" source-subdir="js/src"
+            hash="sha1:ce779081cc11bd0c871c6f303fc4a0091cf4fe66"/>
+    <dependencies>
+      <dep package="libffi"/>
+      <dep package="nspr"/>
+    </dependencies>
+    <after>
+      <dep package="python"/>
+      <dep package="zlib"/>
+    </after>
+  </autotools>
+
+  <autotools id="nspr" autogen-sh="mozilla/nsprpub/configure"
+             autogenargs="--enable-64bit" check-target="false">
+    <branch repo="mozilla" version="4.9.2"
+            module="nspr/releases/v4.9.2/src/nspr-4.9.2.tar.gz">
+      <patch file="nspr.autogen.patch" strip="1"/>
+      <patch file="nspr.config_64bits.patch" strip="1"/>
+      <patch file="nspr.hostcompiler.patch" strip="1"/>
+    </branch>
+  </autotools>
+
+</moduleset>
diff --git a/modulesets-unstable/gtk-osx.modules b/modulesets-unstable/gtk-osx.modules
index 0a884a7..36212b7 100644
--- a/modulesets-unstable/gtk-osx.modules
+++ b/modulesets-unstable/gtk-osx.modules
@@ -34,6 +34,7 @@
   -->
 
   <include href="gtk-osx-bootstrap.modules"/>
+  <include href="gtk-osx-javascript.modules"/>
   <include href="gtk-osx-python.modules"/>
   <include href="gtk-osx-gstreamer.modules"/>
   <include href="gtk-osx-gtkmm.modules"/>
diff --git a/modulesets/gtk-osx-javascript.modules b/modulesets/gtk-osx-javascript.modules
index 846e730..f700bcc 100644
--- a/modulesets/gtk-osx-javascript.modules
+++ b/modulesets/gtk-osx-javascript.modules
@@ -46,6 +46,21 @@
     </after>
   </autotools>
 
+  <autotools id="js24" autogen-sh="configure"
+             autogenargs="--with-system-nspr --with-system-zlib --enable-system-ffi --enable-threadsafe">
+    <branch repo="mozilla" module="js/mozjs-24.2.0.tar.bz2" version="24.2.0"
+            checkoutdir="js24-24.2.0" source-subdir="js/src"
+            hash="sha1:ce779081cc11bd0c871c6f303fc4a0091cf4fe66"/>
+    <dependencies>
+      <dep package="libffi"/>
+      <dep package="nspr"/>
+    </dependencies>
+    <after>
+      <dep package="python"/>
+      <dep package="zlib"/>
+    </after>
+  </autotools>
+
   <autotools id="nspr" autogen-sh="mozilla/nsprpub/configure"
              autogenargs="--enable-64bit" check-target="false">
     <branch repo="mozilla" version="4.9.2"