From owner-dev-commits-ports-all@freebsd.org Wed Apr 14 20:05:39 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 463535E63FA; Wed, 14 Apr 2021 20:05:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FLD431Wnhz3vPw; Wed, 14 Apr 2021 20:05:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2741823F6A; Wed, 14 Apr 2021 20:05:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13EK5dhw078294; Wed, 14 Apr 2021 20:05:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13EK5d9w078293; Wed, 14 Apr 2021 20:05:39 GMT (envelope-from git) Date: Wed, 14 Apr 2021 20:05:39 GMT Message-Id: <202104142005.13EK5d9w078293@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Neel Chauhan Subject: git: 9d98a223e32e - main - lang/gjs: Fix patching erorrs MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: nc X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9d98a223e32ea4610361316c15ef89de8b103358 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Apr 2021 20:05:39 -0000 The branch main has been updated by nc: URL: https://cgit.FreeBSD.org/ports/commit/?id=9d98a223e32ea4610361316c15ef89de8b103358 commit 9d98a223e32ea4610361316c15ef89de8b103358 Author: Neel Chauhan AuthorDate: 2021-04-14 20:05:03 +0000 Commit: Neel Chauhan 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( \ - 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;