[gtk-osx: 2/8] Javascript metamodule

[John Ralls <jralls src gnome org>]

commit 169aabd65527410d81c7c28f7ca0e4f19fea7084
Author: Philip Chimento <philip chimento gmail com>
Date:   Thu Mar 13 23:19:38 2014 -0700

    Javascript metamodule
    
    This adds a new modules file with a target meta-gtk-osx-javascript
    which builds GJS and its dependencies (mozjs17, nspr).
    
    This target exists in modulesets-stable (GJS 1.38.1) and modulesets
    (gnome-3-10 branch), but not yet in modulesets-unstable; I haven't
    gotten mozjs24 to build yet. In both cases, mozjs17 and nspr are built
    from tarballs.

 gjs-Fix-uint-type-in-variable.patch          |   24 ++++++++++
 modulesets-stable/gtk-osx-javascript.modules |   60 ++++++++++++++++++++++++++
 modulesets-stable/gtk-osx.modules            |    1 +
 modulesets/gtk-osx-javascript.modules        |   59 +++++++++++++++++++++++++
 modulesets/gtk-osx.modules                   |    1 +
 patches/patch status                         |    2 +
 6 files changed, 147 insertions(+), 0 deletions(-)
---
diff --git a/gjs-Fix-uint-type-in-variable.patch b/gjs-Fix-uint-type-in-variable.patch
new file mode 100644
index 0000000..4d3d7c3
--- /dev/null
+++ b/gjs-Fix-uint-type-in-variable.patch
@@ -0,0 +1,24 @@
+From 5dfbebb9262ff140f194c2da0fd2e11a69ea25bc Mon Sep 17 00:00:00 2001
+From: Juan R. García Blanco <juanrgar gmail com>
+Date: Wed, 13 Nov 2013 19:28:22 +0000
+Subject: gi/value: Fix uint type in variable
+
+It's not a standard type; we should use guint instead.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=712242
+---
+diff --git a/gi/value.c b/gi/value.c
+index 2eb9bec..0efc4aa 100644
+--- a/gi/value.c
++++ b/gi/value.c
+@@ -668,7 +668,7 @@ gjs_value_from_g_value_internal(JSContext    *context,
+         v = g_value_get_int(gvalue);
+         return JS_NewNumberValue(context, v, value_p);
+     } else if (gtype == G_TYPE_UINT) {
+-        uint v;
++        guint v;
+         v = g_value_get_uint(gvalue);
+         return JS_NewNumberValue(context, v, value_p);
+     } else if (gtype == G_TYPE_DOUBLE) {
+--
+cgit v0.9.2
diff --git a/modulesets-stable/gtk-osx-javascript.modules b/modulesets-stable/gtk-osx-javascript.modules
new file mode 100644
index 0000000..c4595b8
--- /dev/null
+++ b/modulesets-stable/gtk-osx-javascript.modules
@@ -0,0 +1,60 @@
+<?xml version="1.0"?>
+<!DOCTYPE moduleset SYSTEM "moduleset.dtd">
+<?xml-stylesheet type="text/xsl" href="moduleset.xsl"?>
+<moduleset>
+
+  <repository type="tarball" name="ftp.gnome.org" default="yes"
+              href="http://ftp.gnome.org/pub/GNOME/sources/"/>
+  <repository type="tarball" name="mozilla" 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 version="1.38.1" module="gjs/1.38/gjs-1.38.1.tar.xz"
+            hash="sha256:6b2065a0e7bd1db562a70c5fd52ea2499097f1cf02c9c279d1b82b660bfb8176">
+      <patch strip="1"
+             file="http://git.gnome.org/browse/gtk-osx/plain/patches/gjs-Fix-uint-type-in-variable.patch"/>
+    </branch>
+    <dependencies>
+      <dep package="gobject-introspection"/>
+      <dep package="js17"/>
+    </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="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-stable/gtk-osx.modules b/modulesets-stable/gtk-osx.modules
index 807fed4..fc29b2a 100644
--- a/modulesets-stable/gtk-osx.modules
+++ b/modulesets-stable/gtk-osx.modules
@@ -39,6 +39,7 @@
   <include href="gtk-osx-bootstrap.modules"/>
   <include href="gtk-osx-gstreamer.modules"/>
   <include href="gtk-osx-gtkmm.modules"/>
+  <include href="gtk-osx-javascript.modules"/>
   <include href="gtk-osx-python.modules"/>
   <include href="gtk-osx-random.modules"/>
   <include href="gtk-osx-themes.modules"/>
diff --git a/modulesets/gtk-osx-javascript.modules b/modulesets/gtk-osx-javascript.modules
new file mode 100644
index 0000000..846e730
--- /dev/null
+++ b/modulesets/gtk-osx-javascript.modules
@@ -0,0 +1,59 @@
+<?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="gnome-3-10">
+      <patch strip="1"
+             file="http://git.gnome.org/browse/gtk-osx/plain/patches/gjs-Fix-uint-type-in-variable.patch"/>
+    </branch>
+    <dependencies>
+      <dep package="gobject-introspection"/>
+      <dep package="js17"/>
+    </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="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/gtk-osx.modules b/modulesets/gtk-osx.modules
index bd76a53..2eff8c1 100644
--- a/modulesets/gtk-osx.modules
+++ b/modulesets/gtk-osx.modules
@@ -35,6 +35,7 @@
   <include href="gtk-osx-python.modules"/>
   <include href="gtk-osx-gstreamer.modules"/>
   <include href="gtk-osx-gtkmm.modules"/>
+  <include href="gtk-osx-javascript.modules"/>
   <include href="gtk-osx-themes.modules"/>
   <include href="gtk-osx-random.modules"/>
   <include href="gtk-osx-unsupported.modules"/>
diff --git a/patches/patch status b/patches/patch status
index 81eef33..e0e0d0c 100644
--- a/patches/patch status      
+++ b/patches/patch status      
@@ -56,3 +56,5 @@ devhelp:      devhelp-646962-variable-name.patch
 
 dbus:          dbus-install.patch
                dbus-msg-nosignal.patch
+
+gjs:           gjs-Fix-uint-type-in-variable.patch Bug 712242, fixed in master.