Subject: [gjs/wip/ptomato/mozjs38: 1/17] build: Build with
mozjs38



commit 4a19b113e65243572bb644e0b11768f77f73d12e
Author: Philip Chimento <[email protected]>
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.

configure.ac | 2 +-
gjs/jsapi-wrapper.h | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 84adfe7..61ae200 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 */
_______________________________________________
commits-list mailing list (read only)
https://mail.gnome.org/mailman/listinfo/commits-list

Want to limit the commits to a few modules? Go to above URL, log in to edit
your options and select the modules ('topics') you want.


Programming list archiving by: Enterprise Git Hosting