Update to 1.32.0.

This version only supports spidermonkey 1.8.5.


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@16800 df743ca5-7f9a-e211-a948-0013205c9059

4 files changed, 16 insertions, 33 deletions

diff --git a/lang/gjs/Makefile b/lang/gjs/Makefile
index 5b1f79e01..724915f69 100644
--- a/lang/gjs/Makefile
+++ b/lang/gjs/Makefile
@@ -3,11 +3,11 @@
 # Whom:                Pawel Worach <pawel.worach@gmail.com>
 #
 # $FreeBSD$
-#   $MCom: ports/lang/gjs/Makefile,v 1.22 2011/12/15 15:27:48 kwm Exp $
+#   $MCom: ports/lang/gjs/Makefile,v 1.23 2012/01/22 10:58:32 kwm Exp $
 #
 
 PORTNAME=	gjs
-PORTVERSION=	1.30.1
+PORTVERSION=	1.32.0
 CATEGORIES=	lang gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -15,10 +15,11 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME Javascript binding
 
-BUILD_DEPENDS=	g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
-LIB_DEPENDS=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
+BUILD_DEPENDS=	g-ir-scanner:${PORTSDIR}/devel/gobject-introspection \
+		spidermonkey>=1.8.5:${PORTSDIR}/lang/spidermonkey
+LIB_DEPENDS=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
+		mozjs185.1:${PORTSDIR}/lang/spidermonkey
 
-USE_GECKO=	libxul
 USE_XZ=		yes
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
diff --git a/lang/gjs/distinfo b/lang/gjs/distinfo
index af8a58ce8..a392b1e47 100644
--- a/lang/gjs/distinfo
+++ b/lang/gjs/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/gjs-1.30.1.tar.xz) = f5db07ddf70458a33a5d0bdf83f84070fc234237ecb0d49a8676e67b52119a05
-SIZE (gnome3/gjs-1.30.1.tar.xz) = 455456
+SHA256 (gnome3/gjs-1.32.0.tar.xz) = b9f1dc156c15806824c936bb08ddc5048f52f6921654146c47025a62457108c0
+SIZE (gnome3/gjs-1.32.0.tar.xz) = 464372
diff --git a/lang/gjs/files/patch-gi_object.c b/lang/gjs/files/patch-gi_object.c
deleted file mode 100644
index 3589ee982..000000000
--- a/lang/gjs/files/patch-gi_object.c
+++ /dev/null
@@ -1,24 +0,0 @@
-libxul 1.9.2.x doesn't support this yet.
-
-http://git.gnome.org/browse/gjs/commit/?id=72bc4307860a315f9d2173d700582add938d79a0
-
---- gi/object.c.orig	2012-01-22 11:53:37.000000000 +0100
-+++ gi/object.c	2012-01-22 11:54:37.000000000 +0100
-@@ -674,7 +674,6 @@ GJS_NATIVE_CONSTRUCTOR_DECLARE(object_in
-         if (unthreadsafe_template_for_constructor.gobj == NULL) {
-             GParameter *params;
-             int n_params;
--            GTypeQuery query;
-             JSObject *old_jsobj;
- 
-             gtype = g_registered_type_info_get_g_type( (GIRegisteredTypeInfo*) priv->info);
-@@ -711,9 +710,6 @@ GJS_NATIVE_CONSTRUCTOR_DECLARE(object_in
-                 goto out;
-             }
- 
--            g_type_query(gtype, &query);
--            JS_updateMallocCounter(context, query.instance_size);
--
-             if (G_IS_INITIALLY_UNOWNED(priv->gobj) &&
-                 !g_object_is_floating(priv->gobj)) {
-                 /* GtkWindow does not return a ref to caller of g_object_new.
diff --git a/lang/gjs/pkg-plist b/lang/gjs/pkg-plist
index 361c67ca2..8238750ab 100644
--- a/lang/gjs/pkg-plist
+++ b/lang/gjs/pkg-plist
@@ -6,6 +6,8 @@ include/gjs-1.0/gi/closure.h
 include/gjs-1.0/gi/enumeration.h
 include/gjs-1.0/gi/foreign.h
 include/gjs-1.0/gi/function.h
+include/gjs-1.0/gi/gtype.h
+include/gjs-1.0/gi/interface.h
 include/gjs-1.0/gi/keep-alive.h
 include/gjs-1.0/gi/ns.h
 include/gjs-1.0/gi/object.h
@@ -24,8 +26,7 @@ include/gjs-1.0/gjs/importer.h
 include/gjs-1.0/gjs/jsapi-util.h
 include/gjs-1.0/gjs/mem.h
 include/gjs-1.0/gjs/native.h
-lib/gjs/GjsDBus-1.0.gir
-lib/gjs/GjsDBus-1.0.typelib
+lib/girepository-1.0/GjsDBus-1.0.typelib
 lib/gjs-1.0/cairoNative.a
 lib/gjs-1.0/cairoNative.la
 lib/gjs-1.0/cairoNative.so
@@ -47,6 +48,9 @@ lib/gjs-1.0/langNative.so
 lib/gjs-1.0/mainloop.a
 lib/gjs-1.0/mainloop.la
 lib/gjs-1.0/mainloop.so
+lib/gjs-1.0/system.a
+lib/gjs-1.0/system.la
+lib/gjs-1.0/system.so
 lib/libgjs-dbus.a
 lib/libgjs-dbus.la
 lib/libgjs-dbus.so
@@ -62,12 +66,14 @@ lib/libgjs.so.0
 libdata/pkgconfig/gjs-1.0.pc
 libdata/pkgconfig/gjs-dbus-1.0.pc
 libdata/pkgconfig/gjs-internals-1.0.pc
+share/gir-1.0/GjsDBus-1.0.gir
 share/gjs-1.0/cairo.js
 share/gjs-1.0/dbus.js
 share/gjs-1.0/gettext.js
 share/gjs-1.0/jsUnit.js
 share/gjs-1.0/lang.js
 share/gjs-1.0/overrides/GLib.js
+share/gjs-1.0/overrides/GObject.js
 share/gjs-1.0/overrides/Gio.js
 share/gjs-1.0/promise.js
 share/gjs-1.0/signals.js