- update to 1.30.0

x11/gnome/gjs/Makefile

@@ -1,11 +1,9 @@
-# $OpenBSD: Makefile,v 1.6 2011/09/21 15:30:23 robert Exp $
+# $OpenBSD: Makefile,v 1.7 2011/09/27 17:39:28 jasper Exp $
 
 COMMENT=		Javascript bindings for GNOME
 
 GNOME_PROJECT=		gjs
-GNOME_VERSION=		1.29.17
-
-REVISION=		0
+GNOME_VERSION=		1.30.0
 
 SHARED_LIBS +=  gjs                  1.0      # 0.0
 SHARED_LIBS +=  gjs-dbus             1.0      # 0.0

x11/gnome/gjs/distinfo

@@ -1,5 +1,5 @@
-MD5 (gnome/gjs-1.29.17.tar.xz) = i9tmyRTKlVFjWjpAic4zhQ==
-RMD160 (gnome/gjs-1.29.17.tar.xz) = ObfR7QIzgh68sOORGLH1NSNL2Z4=
-SHA1 (gnome/gjs-1.29.17.tar.xz) = m4NPKJRBTGTgXugUWv68SL40Wr4=
-SHA256 (gnome/gjs-1.29.17.tar.xz) = Qn0/f+soMD4F/D1JQxiv/CgMAIeib3/6KYnqhraL1iU=
-SIZE (gnome/gjs-1.29.17.tar.xz) = 454252
+MD5 (gnome/gjs-1.30.0.tar.xz) = kIwchlTRQdZKrAfVfemkVw==
+RMD160 (gnome/gjs-1.30.0.tar.xz) = 5RJjU1lr1cjQ7LevpJhx9S9kMVs=
+SHA1 (gnome/gjs-1.30.0.tar.xz) = IGFAFodxf0v04R7yD/A5olBwC0M=
+SHA256 (gnome/gjs-1.30.0.tar.xz) = /+AZgN0YOr2WssyGHS6G7xJ1HQoa+G2qTEkbgsdKx7k=
+SIZE (gnome/gjs-1.30.0.tar.xz) = 454672

x11/gnome/gjs/patches/patch-gi_object_c

@@ -0,0 +1,28 @@
+$OpenBSD: patch-gi_object_c,v 1.1 2011/09/27 17:39:28 jasper Exp $
+
+Revert 72bc4307860a315f9d2173d700582add938d79a0
+as our spidermonkey port does not have JS_updateMallocCounter().
+
+--- gi/object.c.orig	Sat Sep 17 16:03:19 2011
++++ gi/object.c	Tue Sep 27 19:32:00 2011
+@@ -674,7 +674,9 @@ GJS_NATIVE_CONSTRUCTOR_DECLARE(object_instance)
+         if (unthreadsafe_template_for_constructor.gobj == NULL) {
+             GParameter *params;
+             int n_params;
++#ifdef JS_updateMallocCounter
+             GTypeQuery query;
++#endif
+ 
+             gtype = g_registered_type_info_get_g_type( (GIRegisteredTypeInfo*) priv->info);
+             if (gtype == G_TYPE_NONE) {
+@@ -693,8 +695,10 @@ GJS_NATIVE_CONSTRUCTOR_DECLARE(object_instance)
+             priv->gobj = g_object_newv(gtype, n_params, params);
+             free_g_params(params, n_params);
+ 
++#ifdef JS_updateMallocCounter
+             g_type_query(gtype, &query);
+             JS_updateMallocCounter(context, query.instance_size);
++#endif
+ 
+             if (G_IS_INITIALLY_UNOWNED(priv->gobj) &&
+                 !g_object_is_floating(priv->gobj)) {

x11/gnome/gjs/patches/patch-gjs_context_c

@@ -1,29 +0,0 @@
-$OpenBSD: patch-gjs_context_c,v 1.1 2011/09/21 15:30:23 robert Exp $
-
-From 059f6a13bb5ed18060aa27bbe900575e6966efb0 Mon Sep 17 00:00:00 2001
-From: Colin Walters <walters@verbum.org>
-Date: Fri, 16 Sep 2011 14:28:16 +0000
-Subject: context: Add gjs_context_gc() wrapper
-
---- gjs/context.c.orig	Fri Aug 12 09:33:26 2011
-+++ gjs/context.c	Wed Sep 21 16:41:41 2011
-@@ -484,6 +484,19 @@ out:
-     return success;
- }
- 
-+/**
-+ * gjs_context_gc:
-+ * @context: a #GjsContext
-+ * 
-+ * Initiate a full GC; may or may not block until complete.  This
-+ * function just calls Spidermonkey JS_GC().
-+ */ 
-+void
-+gjs_context_gc (GjsContext  *context)
-+{
-+    JS_GC(context->context);
-+}
-+
- static JSBool
- gjs_locale_to_unicode (JSContext  *context,
- #ifdef JS_LOCALETOUNICODE_NEEDS_CONST_CHAR

x11/gnome/gjs/patches/patch-gjs_context_h

@@ -1,18 +0,0 @@
-$OpenBSD: patch-gjs_context_h,v 1.1 2011/09/21 15:30:23 robert Exp $
-
-From 059f6a13bb5ed18060aa27bbe900575e6966efb0 Mon Sep 17 00:00:00 2001
-From: Colin Walters <walters@verbum.org>
-Date: Fri, 16 Sep 2011 14:28:16 +0000
-Subject: context: Add gjs_context_gc() wrapper
-
---- gjs/context.h.orig	Fri Jun 10 00:31:56 2011
-+++ gjs/context.h	Wed Sep 21 16:41:41 2011
-@@ -75,6 +75,8 @@ void            gjs_context_print_stack_stderr    (Gjs
- 
- void            gjs_context_maybe_gc              (GjsContext  *context);
- 
-+void            gjs_context_gc                    (GjsContext  *context);
-+
- void            gjs_dumpstack                     (void);
- 
- G_END_DECLS