Merge lp:~jbicha/ubuntu/oneiric/gjs/1.29.18 into lp:ubuntu/oneiric/gjs

[Jeremy Bícha]

[lp:~jbicha/ubuntu/oneiric/gjs/1.29.18]

50. By Jeremy Bícha on 2011-09-21

* New upstream release.
* debian/libgjs0c.symbols: Add 1 new symbol

[Sebastien Bacher (seb128)]

Thank you for your work there

=== added file '.pc/.quilt_patches'
--- .pc/.quilt_patches	1970-01-01 00:00:00 +0000
+++ .pc/.quilt_patches	2011-09-21 16:48:23 +0000
@@ -0,0 +1,1 @@
+debian/patches
 
=== added file '.pc/.quilt_series'
--- .pc/.quilt_series	1970-01-01 00:00:00 +0000
+++ .pc/.quilt_series	2011-09-21 16:48:23 +0000
@@ -0,0 +1,1 @@
+series
 
=== added directory '.pc/01_remove_rpath_flags.patch'
=== removed directory '.pc/01_remove_rpath_flags.patch'
=== added file '.pc/01_remove_rpath_flags.patch/.timestamp'
=== added file '.pc/01_remove_rpath_flags.patch/gjs-internals-1.0.pc.in'
--- .pc/01_remove_rpath_flags.patch/gjs-internals-1.0.pc.in	1970-01-01 00:00:00 +0000
+++ .pc/01_remove_rpath_flags.patch/gjs-internals-1.0.pc.in	2011-09-21 16:48:23 +0000
@@ -0,0 +1,18 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+bindir=@bindir@
+includedir=@includedir@
+datarootdir=@datarootdir@
+datadir=@datadir@
+
+jsdir=@gjsjsdir@
+jsnativedir=@gjsnativedir@
+
+Cflags: -I${includedir}/gjs-1.0
+Libs: @GJS_INTERNALS_LIBS@
+Requires: gjs-1.0 gobject-introspection-1.0 @JS_PACKAGE@
+
+Name: gjs-internals-1.0
+Description: Internal API for gjs (for modules and embedders); uses mozjs
+Version: @VERSION@
 
=== removed file '.pc/01_remove_rpath_flags.patch/gjs-internals-1.0.pc.in'
--- .pc/01_remove_rpath_flags.patch/gjs-internals-1.0.pc.in	2011-07-22 21:56:42 +0000
+++ .pc/01_remove_rpath_flags.patch/gjs-internals-1.0.pc.in	1970-01-01 00:00:00 +0000
@@ -1,18 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-bindir=@bindir@
-includedir=@includedir@
-datarootdir=@datarootdir@
-datadir=@datadir@
-
-jsdir=@gjsjsdir@
-jsnativedir=@gjsnativedir@
-
-Cflags: -I${includedir}/gjs-1.0
-Libs: @GJS_INTERNALS_LIBS@
-Requires: gjs-1.0 gobject-introspection-1.0 @JS_PACKAGE@
-
-Name: gjs-internals-1.0
-Description: Internal API for gjs (for modules and embedders); uses mozjs
-Version: @VERSION@
 
=== added file '.pc/applied-patches'
--- .pc/applied-patches	1970-01-01 00:00:00 +0000
+++ .pc/applied-patches	2011-09-21 16:48:23 +0000
@@ -0,0 +1,1 @@
+01_remove_rpath_flags.patch
 
=== removed file '.pc/applied-patches'
--- .pc/applied-patches	2011-07-22 21:56:42 +0000
+++ .pc/applied-patches	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-01_remove_rpath_flags.patch
 
=== modified file 'configure'
--- configure	2011-09-06 09:45:58 +0000
+++ configure	2011-09-21 16:48:23 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for gjs 1.29.17.
+# Generated by GNU Autoconf 2.68 for gjs 1.29.18.
 #
 # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=gjs>.
 #
@@ -571,8 +571,8 @@
 # Identity of this package.
 PACKAGE_NAME='gjs'
 PACKAGE_TARNAME='gjs'
-PACKAGE_VERSION='1.29.17'
-PACKAGE_STRING='gjs 1.29.17'
+PACKAGE_VERSION='1.29.18'
+PACKAGE_STRING='gjs 1.29.18'
 PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=gjs'
 PACKAGE_URL=''
 
@@ -1375,7 +1375,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures gjs 1.29.17 to adapt to many kinds of systems.
+\`configure' configures gjs 1.29.18 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1445,7 +1445,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of gjs 1.29.17:";;
+     short | recursive ) echo "Configuration of gjs 1.29.18:";;
    esac
   cat <<\_ACEOF
 
@@ -1453,7 +1453,7 @@
   --disable-option-checking  ignore unrecognized --enable/--with options
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --enable-maintainer-mode  enable make rules and dependencies not useful
+  --disable-maintainer-mode  disable make rules and dependencies not useful
 			  (and sometimes confusing) to the casual installer
   --enable-silent-rules          less verbose build output (undo: `make V=1')
   --disable-silent-rules         verbose build output (undo: `make V=0')
@@ -1589,7 +1589,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-gjs configure 1.29.17
+gjs configure 1.29.18
 generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2079,7 +2079,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by gjs $as_me 1.29.17, which was
+It was created by gjs $as_me 1.29.18, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
@@ -2894,7 +2894,7 @@
 
 # Define the identity of the package.
  PACKAGE='gjs'
- VERSION='1.29.17'
+ VERSION='1.29.18'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2947,13 +2947,13 @@
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
-$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to disable maintainer-specific portions of Makefiles" >&5
+$as_echo_n "checking whether to disable maintainer-specific portions of Makefiles... " >&6; }
     # Check whether --enable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then :
   enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
 else
-  USE_MAINTAINER_MODE=no
+  USE_MAINTAINER_MODE=yes
 fi
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5
@@ -17790,7 +17790,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by gjs $as_me 1.29.17, which was
+This file was extended by gjs $as_me 1.29.18, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -17856,7 +17856,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-gjs config.status 1.29.17
+gjs config.status 1.29.18
 configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"
 
 
=== modified file 'configure.ac'
--- configure.ac	2011-09-06 09:45:58 +0000
+++ configure.ac	2011-09-21 16:48:23 +0000
@@ -3,7 +3,7 @@
 
 m4_define(pkg_major_version, 1)
 m4_define(pkg_minor_version, 29)
-m4_define(pkg_micro_version, 17)
+m4_define(pkg_micro_version, 18)
 m4_define(pkg_version, pkg_major_version.pkg_minor_version.pkg_micro_version)
 
 AC_PREREQ(2.61)
@@ -16,7 +16,7 @@
 AC_SUBST([GETTEXT_PACKAGE])
 AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], ["$GETTEXT_PACKAGE"], [The name of the gettext domain])
 
-AM_MAINTAINER_MODE
+AM_MAINTAINER_MODE([enable])
 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
 
 # our first pkg-config invocation is conditional, ensure macros still work
 
=== modified file 'debian/changelog'
--- debian/changelog	2011-09-06 09:45:58 +0000
+++ debian/changelog	2011-09-21 16:48:23 +0000
@@ -1,3 +1,10 @@
+gjs (1.29.18-0ubuntu1) oneiric; urgency=low
+
+  * New upstream release.
+  * debian/libgjs0c.symbols: Add 1 new symbol
+
+ -- Jeremy Bicha <[e-mail]>  Wed, 21 Sep 2011 12:38:48 -0400
+
 gjs (1.29.17-0ubuntu1) oneiric; urgency=low
 
   * New upstream release.
 
=== modified file 'debian/libgjs0c.symbols'
--- debian/libgjs0c.symbols	2011-08-17 17:02:38 +0000
+++ debian/libgjs0c.symbols	2011-09-21 16:48:23 +0000
@@ -75,6 +75,7 @@
  gjs_context_define_string_array@Base 0.7.1
  gjs_context_eval@Base 0.7.1
  gjs_context_eval_file@Base 0.7.1
+ gjs_context_gc@Base 1.29.18 
  gjs_context_get_all@Base 0.7.1
  gjs_context_get_native_context@Base 0.7.1
  gjs_context_get_type@Base 0.7.1
 
=== modified file 'gi/object.c'
--- gi/object.c	2011-07-22 21:56:42 +0000
+++ gi/object.c	2011-09-21 16:48:23 +0000
@@ -674,6 +674,7 @@
         if (unthreadsafe_template_for_constructor.gobj == NULL) {
             GParameter *params;
             int n_params;
+            GTypeQuery query;
 
             gtype = g_registered_type_info_get_g_type( (GIRegisteredTypeInfo*) priv->info);
             if (gtype == G_TYPE_NONE) {
@@ -692,6 +693,9 @@
             priv->gobj = g_object_newv(gtype, n_params, params);
             free_g_params(params, n_params);
 
+            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.
 
=== modified file 'gjs/context.c'
--- gjs/context.c	2011-09-06 09:45:58 +0000
+++ gjs/context.c	2011-09-21 16:48:23 +0000
@@ -56,6 +56,8 @@
                                                   guint                  prop_id,
                                                   const GValue          *value,
                                                   GParamSpec            *pspec);
+static JSBool gjs_on_context_gc (JSContext *cx,
+                                 JSGCStatus status);
 
 struct _GjsContext {
     GObject parent;
@@ -70,7 +72,10 @@
 
     char **search_path;
 
-    unsigned int we_own_runtime : 1;
+    guint idle_emit_gc_id;
+
+    guint we_own_runtime : 1;
+    guint gc_notifications_enabled : 1;
 };
 
 struct _GjsContextClass {
@@ -79,19 +84,19 @@
 
 G_DEFINE_TYPE(GjsContext, gjs_context, G_TYPE_OBJECT);
 
-#if 0
 enum {
+    SIGNAL_GC,
     LAST_SIGNAL
 };
 
 static int signals[LAST_SIGNAL];
-#endif
 
 enum {
     PROP_0,
     PROP_JS_VERSION,
     PROP_SEARCH_PATH,
-    PROP_RUNTIME
+    PROP_RUNTIME,
+    PROP_GC_NOTIFICATIONS
 };
 
 
@@ -335,6 +340,22 @@
                                     PROP_JS_VERSION,
                                     pspec);
 
+    pspec = g_param_spec_boolean("gc-notifications",
+                                 "",
+                                 "Whether or not to emit the \"gc\" signal",
+                                 FALSE,
+                                 G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY);
+
+    g_object_class_install_property(object_class,
+                                    PROP_GC_NOTIFICATIONS,
+                                    pspec);
+
+    signals[SIGNAL_GC] = g_signal_new("gc", G_TYPE_FROM_CLASS(klass),
+                                      G_SIGNAL_RUN_LAST, 0,
+                                      NULL, NULL,
+                                      NULL,
+                                      G_TYPE_NONE, 0);
+
     gjs_register_native_module("byteArray", gjs_define_byte_array_stuff, 0);
 }
 
@@ -386,6 +407,11 @@
 
     js_context = GJS_CONTEXT(object);
 
+    if (js_context->idle_emit_gc_id > 0) {
+        g_source_remove (js_context->idle_emit_gc_id);
+        js_context->idle_emit_gc_id = 0;
+    }
+
     if (js_context->search_path != NULL) {
         g_strfreev(js_context->search_path);
         js_context->search_path = NULL;
@@ -674,6 +700,9 @@
     /* For GjsDBus */
     g_irepository_prepend_search_path(PKGLIBDIR);
 
+    if (js_context->gc_notifications_enabled)
+        JS_SetGCCallback(js_context->context, gjs_on_context_gc);
+
     JS_EndRequest(js_context->context);
 
     g_static_mutex_lock (&contexts_lock);
@@ -697,6 +726,9 @@
     case PROP_JS_VERSION:
         g_value_set_string(value, js_context->jsversion_string);
         break;
+    case PROP_GC_NOTIFICATIONS:
+        g_value_set_boolean(value, js_context->gc_notifications_enabled);
+        break;
     default:
         G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
         break;
@@ -727,7 +759,9 @@
         else
             js_context->jsversion_string = g_value_dup_string(value);
         break;
-
+    case PROP_GC_NOTIFICATIONS:
+        js_context->gc_notifications_enabled = g_value_get_boolean(value);
+        break;
     default:
         G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
         break;
@@ -866,6 +900,45 @@
 }
 
 /**
+ * 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 gboolean
+gjs_context_idle_emit_gc (gpointer data)
+{
+    GjsContext *gjs_context = data;
+
+    gjs_context->idle_emit_gc_id = 0;
+    
+    g_signal_emit (gjs_context, signals[SIGNAL_GC], 0);
+    
+    return FALSE;
+}
+
+static JSBool
+gjs_on_context_gc (JSContext *cx,
+                   JSGCStatus status)
+{
+    GjsContext *gjs_context = JS_GetContextPrivate(cx);
+
+    if (status == JSGC_END) {
+        if (gjs_context->idle_emit_gc_id == 0)
+            gjs_context->idle_emit_gc_id = g_idle_add (gjs_context_idle_emit_gc, gjs_context);
+    }
+    
+    return TRUE;
+}
+
+/**
  * gjs_context_get_all:
  *
  * Returns a newly-allocated list containing all known instances of #GjsContext.
 
=== modified file 'gjs/context.h'
--- gjs/context.h	2011-02-27 00:27:14 +0000
+++ gjs/context.h	2011-09-21 16:48:23 +0000
@@ -75,6 +75,8 @@
 
 void            gjs_context_maybe_gc              (GjsContext  *context);
 
+void            gjs_context_gc                    (GjsContext  *context);
+
 void            gjs_dumpstack                     (void);
 
 G_END_DECLS