diff options
| author | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2012-01-22 18:58:32 +0800 |
|---|---|---|
| committer | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2012-01-22 18:58:32 +0800 |
| commit | 714f0736d0f61557d0e74e6d9b147d087aead8ea (patch) | |
| tree | 834c7347b5bf2e4e22c67e248897c4fdf5ea0b7c /lang | |
| parent | 9b2e24833364b7915a975d43f99a35c027ca4ddf (diff) | |
| download | marcuscom-ports-714f0736d0f61557d0e74e6d9b147d087aead8ea.tar marcuscom-ports-714f0736d0f61557d0e74e6d9b147d087aead8ea.tar.gz marcuscom-ports-714f0736d0f61557d0e74e6d9b147d087aead8ea.tar.bz2 marcuscom-ports-714f0736d0f61557d0e74e6d9b147d087aead8ea.tar.lz marcuscom-ports-714f0736d0f61557d0e74e6d9b147d087aead8ea.tar.xz marcuscom-ports-714f0736d0f61557d0e74e6d9b147d087aead8ea.tar.zst marcuscom-ports-714f0736d0f61557d0e74e6d9b147d087aead8ea.zip | |
Update to 1.30.1.
While here get rid of a 6.x check.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@16660 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/gjs/Makefile | 17 | ||||
| -rw-r--r-- | lang/gjs/distinfo | 4 | ||||
| -rw-r--r-- | lang/gjs/files/patch-gi_object.c | 14 |
3 files changed, 14 insertions, 21 deletions
diff --git a/lang/gjs/Makefile b/lang/gjs/Makefile index d7bd00805..5b1f79e01 100644 --- a/lang/gjs/Makefile +++ b/lang/gjs/Makefile @@ -3,12 +3,11 @@ # Whom: Pawel Worach <pawel.worach@gmail.com> # # $FreeBSD$ -# $MCom: ports/lang/gjs/Makefile,v 1.21 2011/10/04 17:33:06 kwm Exp $ +# $MCom: ports/lang/gjs/Makefile,v 1.22 2011/12/15 15:27:48 kwm Exp $ # PORTNAME= gjs -PORTVERSION= 1.30.0 -PORTREVISION= 1 +PORTVERSION= 1.30.1 CATEGORIES= lang gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome3 @@ -27,17 +26,11 @@ USE_PYTHON= build USE_AUTOTOOLS= libtool USE_GNOME= gnomeprefix gnomehack intlhack glib20 ltverhack USE_LDCONFIG= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" - -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 700000 -BROKEN= does not link on 6.x -.endif +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib post-patch: ${REINPLACE_CMD} -e 's|/usr/bin/python|/usr/bin/env python|g' \ ${WRKSRC}/scripts/make-tests -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/lang/gjs/distinfo b/lang/gjs/distinfo index efd129ee0..af8a58ce8 100644 --- a/lang/gjs/distinfo +++ b/lang/gjs/distinfo @@ -1,2 +1,2 @@ -SHA256 (gnome3/gjs-1.30.0.tar.xz) = ffe01980dd183abd96b2cc861d2e86ef12751d0a1af86daa4c491b82c74ac7b9 -SIZE (gnome3/gjs-1.30.0.tar.xz) = 454672 +SHA256 (gnome3/gjs-1.30.1.tar.xz) = f5db07ddf70458a33a5d0bdf83f84070fc234237ecb0d49a8676e67b52119a05 +SIZE (gnome3/gjs-1.30.1.tar.xz) = 455456 diff --git a/lang/gjs/files/patch-gi_object.c b/lang/gjs/files/patch-gi_object.c index 3609a301a..3589ee982 100644 --- a/lang/gjs/files/patch-gi_object.c +++ b/lang/gjs/files/patch-gi_object.c @@ -2,19 +2,19 @@ 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 @@ +--- 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); - if (gtype == G_TYPE_NONE) { -@@ -693,9 +692,6 @@ - priv->gobj = g_object_newv(gtype, n_params, params); - free_g_params(params, n_params); +@@ -711,9 +710,6 @@ GJS_NATIVE_CONSTRUCTOR_DECLARE(object_in + goto out; + } - g_type_query(gtype, &query); - JS_updateMallocCounter(context, query.instance_size); |