[gjs/wip/ptomato/mozjs31: 34/36] WIP - mozjs31

[Philip Chimento <pchimento src gnome org>]

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

    WIP - mozjs31

 configure.ac            |    2 +-
 gjs-internals-1.0.pc.in |    2 +-
 gjs/compat.h            |    3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 8f7b777..5383ed7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -69,7 +69,7 @@ m4_define(glib_required_version, 2.42.0)
 
 GOBJECT_INTROSPECTION_REQUIRE([1.41.4])
 
-common_packages="gmodule-2.0 gthread-2.0 gio-2.0 >= glib_required_version mozjs-24"
+common_packages="gmodule-2.0 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-2.0 >= glib_required_version gio-2.0"
diff --git a/gjs-internals-1.0.pc.in b/gjs-internals-1.0.pc.in
index 4d88d82..cf6726d 100644
--- a/gjs-internals-1.0.pc.in
+++ b/gjs-internals-1.0.pc.in
@@ -9,7 +9,7 @@ datadir=@datadir@
 jsdir=@gjsjsdir@
 
 Cflags: -I${includedir}/gjs-1.0
-Requires: gjs-1.0 gobject-introspection-1.0 mozjs-24
+Requires: gjs-1.0 gobject-introspection-1.0 mozjs-31
 
 Name: gjs-internals-1.0
 Description: Internal API for gjs (for modules and embedders); uses mozjs
diff --git a/gjs/compat.h b/gjs/compat.h
index c645c9a..0ab6a3d 100644
--- a/gjs/compat.h
+++ b/gjs/compat.h
@@ -31,7 +31,7 @@
 
 #if defined(__clang__)
 _Pragma("clang diagnostic push")
-_Pragma("clang diagnostic ignored \"-Wuninitialized\"")
+_Pragma("clang diagnostic ignored \"-Wmismatched-tags\"")
 _Pragma("clang diagnostic ignored \"-Winvalid-offsetof\"")
 #elif __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)
 _Pragma("GCC diagnostic push")
@@ -39,7 +39,6 @@ _Pragma("GCC diagnostic ignored \"-Wstrict-prototypes\"")
 _Pragma("GCC diagnostic ignored \"-Winvalid-offsetof\"")
 #endif
 #include <jsapi.h>
-#include <jsdbgapi.h> // Needed by some bits
 #if defined(__clang__)
 _Pragma("clang diagnostic pop")
 #elif __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)