pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
gjs: update to 1.44, use mozjs24
Module Name: pkgsrc-wip
Committed By: coypu <coypu%sdf.org@localhost>
Pushed By: coypu
Date: Fri Mar 18 16:25:51 2016 +0200
Changeset: b99492c6d0a27dbe5017682a35068f7faa19fc17
Modified Files:
gjs/Makefile
gjs/PLIST
gjs/buildlink3.mk
gjs/distinfo
Removed Files:
gjs/patches/patch-configure
gjs/patches/patch-modules_console.c
Log Message:
gjs: update to 1.44, use mozjs24
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=b99492c6d0a27dbe5017682a35068f7faa19fc17
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
gjs/Makefile | 12 ++++----
gjs/PLIST | 61 +++++++++++++------------------------
gjs/buildlink3.mk | 2 +-
gjs/distinfo | 9 +++---
gjs/patches/patch-configure | 13 --------
gjs/patches/patch-modules_console.c | 24 ---------------
6 files changed, 33 insertions(+), 88 deletions(-)
diffs:
diff --git a/gjs/Makefile b/gjs/Makefile
index 84c40f0..1c5d182 100644
--- a/gjs/Makefile
+++ b/gjs/Makefile
@@ -1,10 +1,10 @@
# $NetBSD: Makefile,v 1.2 2012/09/29 00:50:35 asau Exp $
#
-DISTNAME= gjs-0.7.14
+DISTNAME= gjs-1.44.0
CATEGORIES= lang
-MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gjs/0.7/}
-EXTRACT_SUFX= .tar.bz2
+MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gjs/1.44/}
+EXTRACT_SUFX= .tar.xz
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= http://live.gnome.org/Gjs
@@ -31,15 +31,15 @@ SUBST_SED.fix-python+= -e 's,/usr/bin/env python,${PYTHONBIN},'
#SUBST_CLASSES+= libjs
#SUBST_STAGE.libjs= pre-configure
-#SUBST_MESSAGE.fix-python= Convert libjs to libmozjs185
+#SUBST_MESSAGE.fix-python= Convert libjs to libmozjs24
#SUBST_FILES.fix-python+= scripts/make-tests
#SUBST_SED.fix-python+= -e 's,/usr/bin/env python,${PYTHONBIN},'
-BUILDLINK_TRANSFORM+= l:mozjs:mozjs185
+BUILDLINK_TRANSFORM+= l:mozjs:mozjs24
.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/gobject-introspection/buildlink3.mk"
-.include "../../wip/spidermonkey185/buildlink3.mk"
+.include "../../wip/spidermonkey24/buildlink3.mk"
.include "../../graphics/cairo-gobject/buildlink3.mk"
.include "../../lang/python/extension.mk"
.include "../../sysutils/dbus-glib/buildlink3.mk"
diff --git a/gjs/PLIST b/gjs/PLIST
index e413f31..04e98f7 100644
--- a/gjs/PLIST
+++ b/gjs/PLIST
@@ -1,53 +1,36 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2011/08/04 15:41:03 ryo-on Exp $
+@comment $NetBSD$
bin/gjs
bin/gjs-console
-include/gjs-1.0/gjs-dbus/dbus-proxy.h
-include/gjs-1.0/gjs-dbus/dbus.h
+include/gjs-1.0/gi/arg.h
+include/gjs-1.0/gi/boxed.h
+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/fundamental.h
+include/gjs-1.0/gi/gerror.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
+include/gjs-1.0/gi/param.h
+include/gjs-1.0/gi/repo.h
+include/gjs-1.0/gi/union.h
+include/gjs-1.0/gi/value.h
include/gjs-1.0/gjs/byteArray.h
include/gjs-1.0/gjs/compat.h
include/gjs-1.0/gjs/context.h
-include/gjs-1.0/gjs/gi/arg.h
-include/gjs-1.0/gjs/gi/boxed.h
-include/gjs-1.0/gjs/gi/closure.h
-include/gjs-1.0/gjs/gi/enumeration.h
-include/gjs-1.0/gjs/gi/foreign.h
-include/gjs-1.0/gjs/gi/function.h
-include/gjs-1.0/gjs/gi/gjs_gi_trace.h
-include/gjs-1.0/gjs/gi/keep-alive.h
-include/gjs-1.0/gjs/gi/ns.h
-include/gjs-1.0/gjs/gi/object.h
-include/gjs-1.0/gjs/gi/param.h
-include/gjs-1.0/gjs/gi/repo.h
-include/gjs-1.0/gjs/gi/union.h
-include/gjs-1.0/gjs/gi/value.h
+include/gjs-1.0/gjs/coverage.h
include/gjs-1.0/gjs/gjs-module.h
include/gjs-1.0/gjs/gjs.h
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-1.0/cairoNative.la
-lib/gjs-1.0/console.la
-lib/gjs-1.0/dbusNative.la
-lib/gjs-1.0/debugger.la
-lib/gjs-1.0/gettextNative.la
-lib/gjs-1.0/gi.la
-lib/gjs-1.0/langNative.la
-lib/gjs-1.0/mainloop.la
-lib/libgjs-dbus.la
-lib/libgjs-gi.la
+include/gjs-1.0/gjs/runtime.h
+include/gjs-1.0/gjs/type-module.h
+lib/gjs/girepository-1.0/GjsPrivate-1.0.typelib
lib/libgjs.la
lib/pkgconfig/gjs-1.0.pc
-lib/pkgconfig/gjs-dbus-1.0.pc
-lib/pkgconfig/gjs-gi-1.0.pc
lib/pkgconfig/gjs-internals-1.0.pc
-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/promise.js
-share/gjs-1.0/signals.js
-share/gjs-1.0/tweener/equations.js
-share/gjs-1.0/tweener/tweenList.js
-share/gjs-1.0/tweener/tweener.js
diff --git a/gjs/buildlink3.mk b/gjs/buildlink3.mk
index 9f4c741..cc3c387 100644
--- a/gjs/buildlink3.mk
+++ b/gjs/buildlink3.mk
@@ -10,7 +10,7 @@ BUILDLINK_PKGSRCDIR.gjs?= ../../wip/gjs
.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/gobject-introspection/buildlink3.mk"
-.include "../../wip/spidermonkey185/buildlink3.mk"
+.include "../../wip/spidermonkey24/buildlink3.mk"
#.include "../../graphics/cairo-gobject/buildlink3.mk"
.include "../../sysutils/dbus-glib/buildlink3.mk"
.endif # GJS_BUILDLINK3_MK
diff --git a/gjs/distinfo b/gjs/distinfo
index c49aa6c..8a08ef3 100644
--- a/gjs/distinfo
+++ b/gjs/distinfo
@@ -1,7 +1,6 @@
$NetBSD: distinfo,v 1.1.1.1 2011/08/04 15:41:03 ryo-on Exp $
-SHA1 (gjs-0.7.14.tar.bz2) = d9955428f5cbe7a6714197da1e4dbe5d6d60360d
-RMD160 (gjs-0.7.14.tar.bz2) = f3183aaf98c6b37c6bf445e6309cd7f1f516a915
-Size (gjs-0.7.14.tar.bz2) = 515857 bytes
-SHA1 (patch-configure) = b4b591072ef1cecf3735041c00babd4249d53770
-SHA1 (patch-modules_console.c) = 61ece06f09e3c238fea722fbb33a3e14ddf332e3
+SHA1 (gjs-1.44.0.tar.xz) = c38009d51c194f2c75c506cd5826d67ba44c81c8
+RMD160 (gjs-1.44.0.tar.xz) = 7ae9b2828d113d65ff2fc15b555f3cae6e668160
+SHA512 (gjs-1.44.0.tar.xz) = 3866e124f05221fd47275951f8c2c6954ba28a9b1443cc3c01789284709e2dd69f496efa094e6ddc9fcae563b9def68441aa398c1488076701fa1e873f9b9735
+Size (gjs-1.44.0.tar.xz) = 486144 bytes
diff --git a/gjs/patches/patch-configure b/gjs/patches/patch-configure
deleted file mode 100644
index 301ec21..0000000
--- a/gjs/patches/patch-configure
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-configure,v 1.1.1.1 2011/08/04 15:41:03 ryo-on Exp $
-
---- configure.orig 2011-04-01 18:56:37.000000000 +0000
-+++ configure
-@@ -15786,7 +15786,7 @@ if test -n "$JS_CONFIG"; then
- JS_CFLAGS="$($JS_CONFIG --cflags)"
- JS_LIBS="$($JS_CONFIG --libs)"
- FIREFOX_JS_LIBDIR="$($JS_CONFIG --libdir)"
-- JS_PACKAGE=
-+ JS_PACKAGE=mozjs185
-
- # js-config gives almost usable CFLAGS, we must define one of XP_BEOS,
- # XP_OS2, XP_WIN or XP_UNIX
diff --git a/gjs/patches/patch-modules_console.c b/gjs/patches/patch-modules_console.c
deleted file mode 100644
index f16b0db..0000000
--- a/gjs/patches/patch-modules_console.c
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-modules_console.c,v 1.1.1.1 2011/08/04 15:41:03 ryo-on Exp $
-
-* JSScript and JS_DestroyScript is obsolete.
-
---- modules/console.c.orig 2011-04-01 18:49:49.000000000 +0000
-+++ modules/console.c
-@@ -161,7 +161,7 @@ gjs_console_interact(JSContext *context,
- {
- JSObject *object = JS_THIS_OBJECT(context, vp);
- gboolean eof = FALSE;
-- JSScript *script = NULL;
-+ JSObject *script = NULL;
- jsval result;
- JSString *str;
- GString *buffer = NULL;
-@@ -219,8 +219,6 @@ gjs_console_interact(JSContext *context,
- }
-
- next:
-- if (script)
-- JS_DestroyScript(context, script);
- g_string_free(buffer, TRUE);
- } while (!eof);
-
Home |
Main Index |
Thread Index |
Old Index