Date: Wed, 14 Apr 2021 20:05:39 GMT From: Neel Chauhan <nc@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 9d98a223e32e - main - lang/gjs: Fix patching erorrs Message-ID: <202104142005.13EK5d9w078293@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by nc: URL: https://cgit.FreeBSD.org/ports/commit/?id=9d98a223e32ea4610361316c15ef89de8b103358 commit 9d98a223e32ea4610361316c15ef89de8b103358 Author: Neel Chauhan <nc@FreeBSD.org> AuthorDate: 2021-04-14 20:05:03 +0000 Commit: Neel Chauhan <nc@FreeBSD.org> CommitDate: 2021-04-14 20:05:03 +0000 lang/gjs: Fix patching erorrs PR: 255059 --- lang/gjs/files/patch-gjs_jsapi-class.h | 16 ---------------- lang/gjs/files/patch-gjs_jsapi-util-args.h | 11 ----------- 2 files changed, 27 deletions(-) diff --git a/lang/gjs/files/patch-gjs_jsapi-class.h b/lang/gjs/files/patch-gjs_jsapi-class.h deleted file mode 100644 index 641b2c8fe3cf..000000000000 --- a/lang/gjs/files/patch-gjs_jsapi-class.h +++ /dev/null @@ -1,16 +0,0 @@ ---- 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<type*>( \ - 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 deleted file mode 100644 index 1484cf82e3eb..000000000000 --- a/lang/gjs/files/patch-gjs_jsapi-util-args.h +++ /dev/null @@ -1,11 +0,0 @@ ---- 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;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202104142005.13EK5d9w078293>