[gjs/wip/ptomato/mozjs31: 8/25] build: Build with mozjs31

[Philip Chimento <pchimento src gnome org>]

commit cb825b1bed9d4d1dd460d5d9414dad17c77bb217
Author: Philip Chimento <philip endlessm com>
Date:   Thu Sep 1 18:41:45 2016 -0700

    build: Build with mozjs31
    
    Requires updating our includes, and also we can get rid of the
    jsfriendapi.h include altogether.

 configure.ac          |    2 +-
 gjs/jsapi-private.cpp |    9 ++-------
 gjs/jsapi-util.h      |    1 +
 gjs/jsapi-wrapper.h   |    2 +-
 4 files changed, 5 insertions(+), 9 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index b9e6c92..2ed2240 100644
--- a/configure.ac
+++ b/configure.ac
@@ -55,7 +55,7 @@ m4_define(glib_required_version, 2.50.0)
 GOBJECT_INTROSPECTION_REQUIRE([1.41.4])
 
 GOBJECT_REQUIREMENT="gobject-2.0 >= glib_required_version"
-common_packages="gthread-2.0 gio-2.0 >= glib_required_version mozjs-24"
+common_packages="gthread-2.0 gio-2.0 >= glib_required_version mozjs-31"
 gjs_packages="gobject-introspection-1.0 libffi $common_packages"
 gjs_cairo_packages="cairo cairo-gobject $common_packages"
 gjs_gdbus_packages="$GOBJECT_REQUIREMENT gio-2.0"
diff --git a/gjs/jsapi-private.cpp b/gjs/jsapi-private.cpp
index e032e4d..48fbf72 100644
--- a/gjs/jsapi-private.cpp
+++ b/gjs/jsapi-private.cpp
@@ -32,12 +32,6 @@
 #include "jsapi-wrapper.h"
 
 #include <string.h>
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wstrict-prototypes"
-#pragma GCC diagnostic ignored "-Winvalid-offsetof"
-#pragma GCC diagnostic ignored "-Wredundant-decls"
-#include <jsfriendapi.h>
-#pragma GCC diagnostic pop
 
 void
 gjs_error_reporter(JSContext     *context,
@@ -49,7 +43,8 @@ gjs_error_reporter(JSContext     *context,
 
     if (gjs_environment_variable_is_set("GJS_ABORT_ON_OOM") &&
         report->flags == JSREPORT_ERROR &&
-        report->errorNumber == JSMSG_OUT_OF_MEMORY) {
+        report->errorNumber == 137) {
+        /* 137, JSMSG_OUT_OF_MEMORY */
         g_error("GJS ran out of memory at %s: %i.",
                 report->filename,
                 report->lineno);
diff --git a/gjs/jsapi-util.h b/gjs/jsapi-util.h
index 2d699cd..50980b0 100644
--- a/gjs/jsapi-util.h
+++ b/gjs/jsapi-util.h
@@ -27,6 +27,7 @@
 #include <stdbool.h>
 
 #include <glib-object.h>
+#include <mozilla/Maybe.h>
 
 #include "jsapi-wrapper.h"
 #include "gjs/runtime.h"
diff --git a/gjs/jsapi-wrapper.h b/gjs/jsapi-wrapper.h
index a282b2d..041211a 100644
--- a/gjs/jsapi-wrapper.h
+++ b/gjs/jsapi-wrapper.h
@@ -29,6 +29,6 @@
 #pragma GCC system_header
 #endif
 #include <jsapi.h>
-#include <jsdbgapi.h> // Needed by some bits
+#include <js/OldDebugAPI.h>  /* Needed by some bits */
 
 #endif  /* GJS_JSAPI_WRAPPER_H */