From 0a429216f8ff14904df381a2895ac9de3c5e72e9 Mon Sep 17 00:00:00 2001 From: Baptiste Daroussin Date: Mon, 28 Sep 2020 11:29:18 +0000 Subject: [PATCH] Update to 1.66.0 --- lang/gjs/Makefile | 23 ++++++++++++---------- lang/gjs/distinfo | 6 +++--- lang/gjs/files/patch-gjs_jsapi-class.h | 16 +++++++++++++++ lang/gjs/files/patch-gjs_jsapi-util-args.h | 11 +++++++++++ lang/gjs/pkg-plist | 3 ++- 5 files changed, 45 insertions(+), 14 deletions(-) create mode 100644 lang/gjs/files/patch-gjs_jsapi-class.h create mode 100644 lang/gjs/files/patch-gjs_jsapi-util-args.h diff --git a/lang/gjs/Makefile b/lang/gjs/Makefile index dad84133a964..5dd686fd13fc 100644 --- a/lang/gjs/Makefile +++ b/lang/gjs/Makefile @@ -2,11 +2,10 @@ # $FreeBSD$ PORTNAME= gjs -PORTVERSION= 1.52.4 -PORTREVISION= 4 +PORTVERSION= 1.66.0 CATEGORIES= lang gnome MASTER_SITES= GNOME -DIST_SUBDIR= gnome3 +DIST_SUBDIR= gnome MAINTAINER= gnome@FreeBSD.org COMMENT= GNOME Javascript binding @@ -16,17 +15,21 @@ LICENSE_COMB= multi LICENSE_FILE_MPL11= ${WRKSRC}/COPYING LICENSE_FILE_LGPL20+ = ${WRKSRC}/COPYING.LGPL -LIB_DEPENDS= libmozjs-52.so:lang/spidermonkey52 \ +LIB_DEPENDS= libmozjs-78.so:lang/spidermonkey78 \ libffi.so:devel/libffi -USES= compiler:c++11-lib gettext gmake gnome libtool \ - localbase pathfix pkgconfig python:build readline tar:xz xorg +USES= compiler:c++11-lib gettext gnome \ + localbase meson pkgconfig python:build readline tar:xz xorg USE_GNOME= cairo gdkpixbuf2 gtk30 introspection USE_XORG= x11 xext -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-pkgconfigdir=${PREFIX}/libdata/pkgconfig -CONFIGURE_ARGS+=--disable-profiler +MESON_ARGS= -Dcairo=enabled \ + -Dreadline=enabled \ + -Dprofiler=disabled \ + -Dinstalled_tests=false USE_LDCONFIG= yes -INSTALL_TARGET= install-strip + +CONFIGURE_ENV= PYTHONDONTWRITEBYTECODE=1 +MAKE_ENV= PYTHONDONTWRITEBYTECODE=1 + .include diff --git a/lang/gjs/distinfo b/lang/gjs/distinfo index 17310c303cf3..48ce38c0ef51 100644 --- a/lang/gjs/distinfo +++ b/lang/gjs/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1539116944 -SHA256 (gnome3/gjs-1.52.4.tar.xz) = 9c160cf9383ca20fcba3b75154c9d19efae9decf63bec6164a81403092d3b4f7 -SIZE (gnome3/gjs-1.52.4.tar.xz) = 626960 +TIMESTAMP = 1601286593 +SHA256 (gnome/gjs-1.66.0.tar.xz) = f30cf90e016db6c8fdd0059749559611760f0721f375b2b61e0b7239b43ab5f8 +SIZE (gnome/gjs-1.66.0.tar.xz) = 439596 diff --git a/lang/gjs/files/patch-gjs_jsapi-class.h b/lang/gjs/files/patch-gjs_jsapi-class.h new file mode 100644 index 000000000000..641b2c8fe3cf --- /dev/null +++ b/lang/gjs/files/patch-gjs_jsapi-class.h @@ -0,0 +1,16 @@ +--- gjs/jsapi-class.h.orig 2020-09-12 19:34:36 UTC ++++ gjs/jsapi-class.h +@@ -77,11 +77,11 @@ bool gjs_define_property_dynamic(JSContext *cx, + * do_base_typecheck and priv_from_js + */ + #define GJS_DEFINE_PRIV_FROM_JS(type, klass) \ +- GJS_ALWAYS_INLINE [[nodiscard]] [[maybe_unused]] static inline bool \ ++ GJS_ALWAYS_INLINE static inline bool \ + do_base_typecheck(JSContext* cx, JS::HandleObject obj, bool throw_error) { \ + return gjs_typecheck_instance(cx, obj, &klass, throw_error); \ + } \ +- GJS_ALWAYS_INLINE [[nodiscard]] static inline type* priv_from_js( \ ++ GJS_ALWAYS_INLINE static inline type* priv_from_js( \ + JSContext* cx, JS::HandleObject obj) { \ + return static_cast( \ + JS_GetInstancePrivate(cx, obj, &klass, nullptr)); \ diff --git a/lang/gjs/files/patch-gjs_jsapi-util-args.h b/lang/gjs/files/patch-gjs_jsapi-util-args.h new file mode 100644 index 000000000000..1484cf82e3eb --- /dev/null +++ b/lang/gjs/files/patch-gjs_jsapi-util-args.h @@ -0,0 +1,11 @@ +--- gjs/jsapi-util-args.h.orig 2020-09-12 19:34:36 UTC ++++ gjs/jsapi-util-args.h +@@ -43,7 +43,7 @@ + #include "gjs/jsapi-util.h" + #include "gjs/macros.h" + +-GJS_ALWAYS_INLINE [[nodiscard]] static inline bool check_nullable( ++GJS_ALWAYS_INLINE static inline bool check_nullable( + const char*& fchar, const char*& fmt_string) { + if (*fchar != '?') + return false; diff --git a/lang/gjs/pkg-plist b/lang/gjs/pkg-plist index ef652bf14beb..ce86a1269dd1 100644 --- a/lang/gjs/pkg-plist +++ b/lang/gjs/pkg-plist @@ -2,10 +2,11 @@ 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.so lib/libgjs.so.0