[gjs/wip/ptomato/mozjs38: 5/23] build: Build with mozjs38



commit a5047f3311ea3752bf3345fc7be0fcbcb963a005
Author: Philip Chimento <philip chimento gmail com>
Date:   Wed Jan 11 22:28:58 2017 -0800

    build: Build with mozjs38
    
    Requires updating our includes. The function used from OldDebugAPI.h was
    simply moved into jsapi.h, and some functions were separated out into
    js/Conversions.h.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=777962

 configure.ac        |    2 +-
 gjs/jsapi-wrapper.h |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 9e5f869..5699023 100644
--- a/configure.ac
+++ b/configure.ac
@@ -58,7 +58,7 @@ GOBJECT_INTROSPECTION_REQUIRE([1.41.4])
 
 GOBJECT_REQUIREMENT="gobject-2.0 >= glib_required_version"
 gjs_base_packages="$GOBJECT_REQUIREMENT gio-2.0"
-common_packages="gthread-2.0 gio-2.0 >= glib_required_version mozjs-31"
+common_packages="gthread-2.0 gio-2.0 >= glib_required_version mozjs-38"
 gjs_packages="gobject-introspection-1.0 libffi $common_packages"
 gjs_cairo_packages="cairo cairo-gobject $common_packages"
 gjs_gtk_packages="gtk+-3.0 >= 3.20"
diff --git a/gjs/jsapi-wrapper.h b/gjs/jsapi-wrapper.h
index 37e7d71..021066a 100644
--- a/gjs/jsapi-wrapper.h
+++ b/gjs/jsapi-wrapper.h
@@ -37,7 +37,7 @@
 #endif
 #include <mozilla/Maybe.h>
 #include <jsapi.h>
-#include <js/OldDebugAPI.h>  /* Needed by some bits */
-#include <jsproxy.h>  /* For jsapi-constructor-proxy */
+#include <js/Conversions.h>
+#include <js/Proxy.h>  /* For jsapi-constructor-proxy */
 
 #endif  /* GJS_JSAPI_WRAPPER_H */


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]