diff --git a/lang/gjs/DESCR b/lang/gjs/DESCR index 5e70a373daa9..6bc76b1eaf7d 100644 --- a/lang/gjs/DESCR +++ b/lang/gjs/DESCR @@ -1,3 +1,3 @@ -Gjs is a JavaScript binding for GNOME. It's mainly based on -Spidermonkey JavaScript engine and the GObject introspection +Gjs is a Javascript binding for GNOME. It's mainly based on +Spidermonkey javascript engine and the GObject introspection framework. diff --git a/lang/gjs/Makefile b/lang/gjs/Makefile index c17b2552d036..4f7c8265ba77 100644 --- a/lang/gjs/Makefile +++ b/lang/gjs/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.5 2020/08/17 20:17:33 leot Exp $ +# $NetBSD: Makefile,v 1.6 2020/11/05 17:12:00 nia Exp $ -DISTNAME= gjs-1.53.4 -PKGREVISION= 3 +DISTNAME= gjs-1.64.3 CATEGORIES= lang -MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gjs/1.53/} +MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gjs/${PKGVERSION_NOREV:R}/} EXTRACT_SUFX= .tar.xz MAINTAINER= pkgsrc-users@NetBSD.org @@ -11,35 +10,24 @@ HOMEPAGE= https://live.gnome.org/Gjs COMMENT= Javascript binding for GNOME based on Spidermonkey LICENSE= mit -BUILD_DEPENDS+= autoconf-archive-[0-9]*:../../devel/autoconf-archive - -GNU_CONFIGURE= yes -USE_LIBTOOL= yes -USE_TOOLS+= autoconf autoreconf automake -USE_TOOLS+= gmake pkg-config +USE_TOOLS+= pkg-config USE_LANGUAGES= c c++ -PKGCONFIG_OVERRIDE+= gjs-1.0.pc.in - -CONFIGURE_ARGS+= --disable-profiler -CONFIGURE_ARGS+= --prefix=${PREFIX} - -LDFLAGS.NetBSD+= ${X11_LDFLAGS} - -# Needed by the Javascript JIT used in gjs -NOT_PAX_MPROTECT_SAFE+= bin/gjs-console -NOT_PAX_MPROTECT_SAFE+= bin/gjs +MAKE_ENV+= LD_LIBRARY_PATH=${WRKSRC}/output/gjs@sha:${WRKSRC}/output/gjs-jsapi@sta:${WRKSRC}/output/gjs-console@exe +MESON_ARGS+= -Dinstalled_tests=false -pre-configure: - cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} autoreconf -vfi +PKGCONFIG_OVERRIDE+= output/meson-private/gjs-1.0.pc +PKGCONFIG_OVERRIDE_STAGE= post-configure .include "../../devel/glib2/buildlink3.mk" .include "../../devel/gobject-introspection/buildlink3.mk" .include "../../devel/libffi/buildlink3.mk" +.include "../../devel/meson/build.mk" .include "../../graphics/cairo-gobject/buildlink3.mk" .include "../../graphics/gdk-pixbuf2/buildlink3.mk" .include "../../lang/python/extension.mk" -.include "../../lang/spidermonkey52/buildlink3.mk" +BUILDLINK_API_DEPENDS.mozjs68+= mozjs68>=68.6.0nb6 +.include "../../lang/mozjs68/buildlink3.mk" .include "../../sysutils/dbus-glib/buildlink3.mk" .include "../../x11/gtk3/buildlink3.mk" .include "../../mk/readline.buildlink3.mk" diff --git a/lang/gjs/PLIST b/lang/gjs/PLIST index e95a42d6d680..7fe4a3fed3a1 100644 --- a/lang/gjs/PLIST +++ b/lang/gjs/PLIST @@ -1,14 +1,17 @@ -@comment $NetBSD: PLIST,v 1.1 2019/10/06 15:50:31 fox Exp $ +@comment $NetBSD: PLIST,v 1.2 2020/11/05 17:12:00 nia Exp $ bin/gjs bin/gjs-console include/gjs-1.0/gjs/context.h include/gjs-1.0/gjs/coverage.h +include/gjs-1.0/gjs/error-types.h include/gjs-1.0/gjs/gjs.h include/gjs-1.0/gjs/macros.h +include/gjs-1.0/gjs/mem.h include/gjs-1.0/gjs/profiler.h -include/gjs-1.0/util/error.h lib/gjs/girepository-1.0/GjsPrivate-1.0.typelib -lib/libgjs.la +lib/libgjs.so +lib/libgjs.so.0 +lib/libgjs.so.0.0.0 lib/pkgconfig/gjs-1.0.pc share/gjs-1.0/lsan/lsan.supp share/gjs-1.0/valgrind/gjs.supp diff --git a/lang/gjs/buildlink3.mk b/lang/gjs/buildlink3.mk index 6ea59160bfcc..8175dc860bf5 100644 --- a/lang/gjs/buildlink3.mk +++ b/lang/gjs/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2020/08/17 20:17:33 leot Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2020/11/05 17:12:00 nia Exp $ BUILDLINK_TREE+= gjs @@ -7,11 +7,11 @@ GJS_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.gjs+= gjs>=1.53.4 BUILDLINK_ABI_DEPENDS.gjs?= gjs>=1.53.4nb3 -BUILDLINK_PKGSRCDIR.gjs?= ../../lang/gjs +BUILDLINK_PKGSRCDIR.gjs?= ../../wip/gjs .include "../../devel/glib2/buildlink3.mk" .include "../../devel/gobject-introspection/buildlink3.mk" -.include "../../lang/spidermonkey52/buildlink3.mk" +.include "../../lang/mozjs68/buildlink3.mk" .include "../../graphics/cairo-gobject/buildlink3.mk" .include "../../sysutils/dbus-glib/buildlink3.mk" .endif # GJS_BUILDLINK3_MK diff --git a/lang/gjs/distinfo b/lang/gjs/distinfo index 9643d26c54e3..a43559f2fc34 100644 --- a/lang/gjs/distinfo +++ b/lang/gjs/distinfo @@ -1,8 +1,7 @@ -$NetBSD: distinfo,v 1.2 2020/03/12 22:53:12 wiz Exp $ +$NetBSD: distinfo,v 1.3 2020/11/05 17:12:00 nia Exp $ -SHA1 (gjs-1.53.4.tar.xz) = 7193dffbc30e08fec94bc315feeb41bfdaa67c64 -RMD160 (gjs-1.53.4.tar.xz) = 1263754399afd24e0522d67241685192574d4e35 -SHA512 (gjs-1.53.4.tar.xz) = 5876a8912699fcb22bdfe678a5c9d9893be9dc5b2242160985dd6491c1b4c6148fd4d57d62a9be9c98186176440cf9f99239f8be6b57126cb077c3f90aeb8e2e -Size (gjs-1.53.4.tar.xz) = 635936 bytes -SHA1 (patch-Makefile.am) = 74f02a764cb9f12605c4cccf61dd65bda8027414 -SHA1 (patch-configure.ac) = acd8d6e1546c14a636478da2a557cef4bdbc146a +SHA1 (gjs-1.64.3.tar.xz) = f3a6372321cda99f78feaf3ebdc6391532741f67 +RMD160 (gjs-1.64.3.tar.xz) = cf7057847308b17f39d348dc952feb0bce20a1a8 +SHA512 (gjs-1.64.3.tar.xz) = 9d92e52a7fef07853f3beb181798f89deb60b97b928d916cd827c99a6ab8f83abf7c352a1aa46be476a50e2efadfaf09befa54ccab0d51b0ac7127f2fe794801 +Size (gjs-1.64.3.tar.xz) = 422436 bytes +SHA1 (patch-tools_run__iwyu.sh) = a03e6cc832d41c63c81448332e6ee822ff809a41 diff --git a/lang/gjs/patches/patch-Makefile.am b/lang/gjs/patches/patch-Makefile.am deleted file mode 100644 index ef42e80949b6..000000000000 --- a/lang/gjs/patches/patch-Makefile.am +++ /dev/null @@ -1,27 +0,0 @@ -$NetBSD: patch-Makefile.am,v 1.2 2020/03/12 22:53:12 wiz Exp $ - -Disable tests, they pull in a lot more dependencies. - -Fix unportable test(1) operator. - ---- Makefile.am.orig 2018-07-08 22:13:17.000000000 +0000 -+++ Makefile.am -@@ -161,9 +161,6 @@ gjs_console_SOURCES = $(gjs_console_srcs - install-exec-hook: - (cd $(DESTDIR)$(bindir) && $(LN_S) -f gjs-console$(EXEEXT) gjs$(EXEEXT)) - --include Makefile-test.am --include Makefile-insttest.am -- - EXTRA_DIST += \ - autogen.sh \ - COPYING.LGPL \ -@@ -216,7 +213,7 @@ prepare-minor-release: $(DISTNAME) prepa - - upload-release: $(DISTNAME) Makefile - git log origin/master..master -- @echo -n "Ok to push? [y/N] "; read ans; test x$$ans == xy || exit 1 -+ @echo -n "Ok to push? [y/N] "; read ans; test x$$ans = xy || exit 1 - git push --tags origin master:master - scp $(DISTNAME) master.gnome.org: - ssh master.gnome.org install-module $(DISTNAME) diff --git a/lang/gjs/patches/patch-configure.ac b/lang/gjs/patches/patch-configure.ac deleted file mode 100644 index 0765ac3406bb..000000000000 --- a/lang/gjs/patches/patch-configure.ac +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-configure.ac,v 1.1 2019/10/06 15:50:31 fox Exp $ - -Disable tests, they pull in a lot more dependencies. - ---- configure.ac.orig 2019-10-05 08:36:32.253994276 +0000 -+++ configure.ac -@@ -313,17 +313,6 @@ dnl automake 1.11/1.12 defines this but - AC_SUBST([pkglibexecdir], ["${libexecdir}/${PACKAGE}"]) - - AC_CONFIG_FILES([Makefile gjs-1.0.pc win32/config.h.win32]) --dnl Symlink the files from gobject-introspection's test libraries into the tree; --dnl Automake plans to drop support for compiling them in-place. --AC_CONFIG_LINKS([ -- installed-tests/gitestmacros.h:$GI_DATADIR/tests/gitestmacros.h -- installed-tests/regress.c:$GI_DATADIR/tests/regress.c -- installed-tests/regress.h:$GI_DATADIR/tests/regress.h -- installed-tests/warnlib.c:$GI_DATADIR/tests/warnlib.c -- installed-tests/warnlib.h:$GI_DATADIR/tests/warnlib.h -- installed-tests/gimarshallingtests.c:$GI_DATADIR/tests/gimarshallingtests.c -- installed-tests/gimarshallingtests.h:$GI_DATADIR/tests/gimarshallingtests.h --]) - AC_OUTPUT - - # Warn about conditions that affect runtime