Skip site navigation (1)Skip section navigation (2) 
Date:      Mon, 8 Jan 2018 17:07:00 +0000 (UTC)
From:      Jan Beich <jbeich@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r458454 - head/lang/cjs/files
Message-ID:  <201801081707.w08H70cB090560@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: jbeich
Date: Mon Jan  8 17:07:00 2018
New Revision: 458454
URL: https://svnweb.freebsd.org/changeset/ports/458454

Log:
  lang/cjs: unbreak build with Clang 6 (C++14 by default)
  
  gi/boxed.cpp:552:16: error: cannot initialize return object of type 'GIFieldInfo *' (aka '_GIBaseInfoStub *') with an rvalue of type 'int'
          return JS_FALSE;
                 ^~~~~~~~
  gi/ns.cpp:188:16: error: cannot initialize return object of type 'JSObject *' with an rvalue of type 'int'
          return JS_FALSE;
                 ^~~~~~~~
  gi/repo.cpp:312:16: error: cannot initialize return object of type 'JSObject *' with an rvalue of type 'int'
          return JS_FALSE;
                 ^~~~~~~~
  /usr/local/include/mozjs-24/jstypes.h:194:18: note: expanded from macro 'JS_FALSE'
   #define JS_FALSE (int)0
                    ^~~~~~
  
  Reported by:	antoine (via bug 224669)

Added:
  head/lang/cjs/files/
  head/lang/cjs/files/patch-c++11   (contents, props changed)

Added: head/lang/cjs/files/patch-c++11
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/lang/cjs/files/patch-c++11	Mon Jan  8 17:07:00 2018	(r458454)
@@ -0,0 +1,46 @@
+gi/boxed.cpp:552:16: error: cannot initialize return object of type 'GIFieldInfo *' (aka '_GIBaseInfoStub *') with an rvalue of type 'int'
+        return JS_FALSE;
+               ^~~~~~~~
+gi/ns.cpp:188:16: error: cannot initialize return object of type 'JSObject *' with an rvalue of type 'int'
+        return JS_FALSE;
+               ^~~~~~~~
+gi/repo.cpp:312:16: error: cannot initialize return object of type 'JSObject *' with an rvalue of type 'int'
+        return JS_FALSE;
+               ^~~~~~~~
+/usr/local/include/mozjs-24/jstypes.h:194:18: note: expanded from macro 'JS_FALSE'
+#define JS_FALSE (int)0
+                 ^~~~~~
+
+--- gi/boxed.cpp.orig	2014-11-23 11:02:30 UTC
++++ gi/boxed.cpp
+@@ -549,7 +549,7 @@ get_field_info (JSContext *context,
+     jsval id_val;
+ 
+     if (!JS_IdToValue(context, id, &id_val))
+-        return JS_FALSE;
++        return NULL;
+ 
+     if (!JSVAL_IS_INT (id_val)) {
+         gjs_throw(context, "Field index for %s is not an integer",
+--- gi/ns.cpp.orig	2014-11-23 11:02:30 UTC
++++ gi/ns.cpp
+@@ -185,7 +185,7 @@ ns_new(JSContext    *context,
+     global = gjs_get_import_global(context);
+ 
+     if (!JS_HasProperty(context, global, gjs_ns_class.name, &found))
+-        return JS_FALSE;
++        return NULL;
+     if (!found) {
+         JSObject *prototype;
+         prototype = JS_InitClass(context, global,
+--- gi/repo.cpp.orig	2014-11-23 11:02:30 UTC
++++ gi/repo.cpp
+@@ -309,7 +309,7 @@ repo_new(JSContext *context)
+     repo = JS_NewObject(context, &gjs_repo_class, NULL, global);
+     if (repo == NULL) {
+         gjs_throw(context, "No memory to create repo object");
+-        return JS_FALSE;
++        return NULL;
+     }
+ 
+     priv = g_slice_new0(Repo);

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201801081707.w08H70cB090560>