diff options
| author | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2011-09-22 23:24:22 +0800 |
|---|---|---|
| committer | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2011-09-22 23:24:22 +0800 |
| commit | 48e6ed42e8bd0eb91a1d89aa0863c47ea925663f (patch) | |
| tree | e361decff2c3c107d12ab9ef05c666951480b0f5 | |
| parent | f614dd8cd234453c6bbf83def909cf4f1354df4a (diff) | |
| download | marcuscom-ports-48e6ed42e8bd0eb91a1d89aa0863c47ea925663f.tar marcuscom-ports-48e6ed42e8bd0eb91a1d89aa0863c47ea925663f.tar.gz marcuscom-ports-48e6ed42e8bd0eb91a1d89aa0863c47ea925663f.tar.bz2 marcuscom-ports-48e6ed42e8bd0eb91a1d89aa0863c47ea925663f.tar.lz marcuscom-ports-48e6ed42e8bd0eb91a1d89aa0863c47ea925663f.tar.xz marcuscom-ports-48e6ed42e8bd0eb91a1d89aa0863c47ea925663f.tar.zst marcuscom-ports-48e6ed42e8bd0eb91a1d89aa0863c47ea925663f.zip | |
Update to 1.29.18.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@16322 df743ca5-7f9a-e211-a948-0013205c9059
| -rw-r--r-- | lang/gjs/Makefile | 4 | ||||
| -rw-r--r-- | lang/gjs/distinfo | 4 | ||||
| -rw-r--r-- | lang/gjs/files/patch-gi_object.c | 24 |
3 files changed, 28 insertions, 4 deletions
diff --git a/lang/gjs/Makefile b/lang/gjs/Makefile index b730edfe1..f4a0da132 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.18 2011/04/05 10:40:31 kwm Exp $ +# $MCom: ports/lang/gjs/Makefile,v 1.19 2011/09/15 18:43:23 kwm Exp $ # PORTNAME= gjs -PORTVERSION= 1.29.17 +PORTVERSION= 1.29.18 CATEGORIES= lang gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome3 diff --git a/lang/gjs/distinfo b/lang/gjs/distinfo index ee1d32f5e..ecfdfa64f 100644 --- a/lang/gjs/distinfo +++ b/lang/gjs/distinfo @@ -1,2 +1,2 @@ -SHA256 (gnome3/gjs-1.29.17.tar.xz) = 427d3f7feb28303e05fc3d494318affc280c0087a26f7ffa2989ea86b68bd625 -SIZE (gnome3/gjs-1.29.17.tar.xz) = 454252 +SHA256 (gnome3/gjs-1.29.18.tar.xz) = f2040c2a61ec8ace64ba8d7777a81489b50a4f67a8fb8d565e175114a45f3ab4 +SIZE (gnome3/gjs-1.29.18.tar.xz) = 454708 diff --git a/lang/gjs/files/patch-gi_object.c b/lang/gjs/files/patch-gi_object.c new file mode 100644 index 000000000..3609a301a --- /dev/null +++ b/lang/gjs/files/patch-gi_object.c @@ -0,0 +1,24 @@ +libxul 1.9.2.x doesn't support this yet. + +http://git.gnome.org/browse/gjs/commit/?id=72bc4307860a315f9d2173d700582add938d79a0 + +--- gi/object.c.orig 2011-09-22 17:15:11.000000000 +0200 ++++ gi/object.c 2011-09-22 17:17:46.000000000 +0200 +@@ -674,7 +674,6 @@ + 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) { +@@ -693,9 +692,6 @@ + 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. |