Attachment 77913 Details for Bug 59830 – 0003-jsauthority-Work-with-mozjs-17.0-too.patch

[patch] 0003-jsauthority-Work-with-mozjs-17.0-too.patch

0003-jsauthority-Work-with-mozjs-17.0-too.patch (text/plain), 5.26 KB, created by Colin Walters on 2013-04-12 21:25:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Colin Walters

Created: 2013-04-12 21:25:13 UTC

Size: 5.26 KB

patch

obsolete

>From dbd502065600f9f0b7dbcec18d545cc6daca4b57 Mon Sep 17 00:00:00 2001
>From: Colin Walters <walters@verbum.org>
>Date: Fri, 12 Apr 2013 12:29:07 -0400
>Subject: [PATCH 3/3] jsauthority: Work with mozjs-17.0 too
>
>Based on work by Tim Lunn <tim@feathertop.org>, reworked on top of a
>regular dynamically-linked js.
>
>https://bugs.freedesktop.org/show_bug.cgi?id=59830
>---
> configure.ac                                 |   13 ++++++-
> src/polkitbackend/polkitbackendjsauthority.c |   51 +++++++++++++++++++++++---
> 2 files changed, 57 insertions(+), 7 deletions(-)
>
>diff --git a/configure.ac b/configure.ac
>index a9c24c4..68b02eb 100644
>--- a/configure.ac
>+++ b/configure.ac
>@@ -125,7 +125,18 @@ PKG_CHECK_MODULES(GLIB, [gmodule-2.0 gio-2.0 >= 2.30.0])
> AC_SUBST(GLIB_CFLAGS)
> AC_SUBST(GLIB_LIBS)
> 
>-PKG_CHECK_MODULES(LIBJS, [mozjs185])
>+AC_ARG_WITH(mozjs, AS_HELP_STRING([--with-mozjs=@<:@mozjs185/mozjs-17.0|auto@:>@],
>+		                  [Specify version of Spidermonkey to use]),,
>+            with_mozjs=auto)
>+AS_IF([test x${with_mozjs} != xauto], [
>+  PKG_CHECK_MODULES(LIBJS, ${with_mozjs})
>+], [
>+  PKG_CHECK_MODULES(LIBJS, [mozjs185], have_mozjs185=yes, have_mozjs185=no)
>+  AS_IF([test x${have_mozjs185} = xno], [
>+  PKG_CHECK_MODULES(LIBJS, [mozjs-17.0], have_mozjs17=yes,
>+   [AC_MSG_ERROR([Could not find mozjs185 or mozjs-17.0; see http://ftp.mozilla.org/pub/mozilla.org/js/])])
>+  ])
>+])
> AC_SUBST(LIBJS_CFLAGS)
> AC_SUBST(LIBJS_LIBS)
> 
>diff --git a/src/polkitbackend/polkitbackendjsauthority.c b/src/polkitbackend/polkitbackendjsauthority.c
>index 9234f02..4bbeec3 100644
>--- a/src/polkitbackend/polkitbackendjsauthority.c
>+++ b/src/polkitbackend/polkitbackendjsauthority.c
>@@ -79,7 +79,11 @@ struct _PolkitBackendJsAuthorityPrivate
> };
> 
> static JSBool execute_script_with_runaway_killer (PolkitBackendJsAuthority *authority,
>+#if JS_VERSION == 186
>+                                                  JSScript                 *script,
>+#else
>                                                   JSObject                 *script,
>+#endif
>                                                   jsval                    *rval);
> 
> static void utils_spawn (const gchar *const  *argv,
>@@ -146,7 +150,11 @@ static JSClass js_global_class = {
>   JS_EnumerateStub,
>   JS_ResolveStub,
>   JS_ConvertStub,
>+#if JS_VERSION == 186      
>+  NULL,
>+#else
>   JS_FinalizeStub,
>+#endif
>   JSCLASS_NO_OPTIONAL_MEMBERS
> };
> 
>@@ -162,7 +170,11 @@ static JSClass js_polkit_class = {
>   JS_EnumerateStub,
>   JS_ResolveStub,
>   JS_ConvertStub,
>+#if JS_VERSION == 186      
>+  NULL,
>+#else
>   JS_FinalizeStub,
>+#endif
>   JSCLASS_NO_OPTIONAL_MEMBERS
> };
> 
>@@ -274,11 +286,22 @@ load_scripts (PolkitBackendJsAuthority  *authority)
>   for (l = files; l != NULL; l = l->next)
>     {
>       const gchar *filename = l->data;
>+#if JS_VERSION == 186
>+      JSScript *script;
>+#else
>       JSObject *script;
>-
>+#endif
>+
>+#if JS_VERSION == 186
>+      script = JS_CompileUTF8File (authority->priv->cx,
>+				   authority->priv->js_global,
>+				   filename);
>+      
>+#else
>       script = JS_CompileFile (authority->priv->cx,
>-                               authority->priv->js_global,
>-                               filename);
>+			       authority->priv->js_global,
>+			       filename);
>+#endif
>       if (script == NULL)
>         {
>           polkit_backend_authority_log (POLKIT_BACKEND_AUTHORITY (authority),
>@@ -330,7 +353,11 @@ reload_scripts (PolkitBackendJsAuthority *authority)
> 
>   polkit_backend_authority_log (POLKIT_BACKEND_AUTHORITY (authority),
>                                 "Collecting garbage unconditionally...");
>+#if JS_VERSION == 186
>+  JS_GC (authority->priv->rt);
>+#else
>   JS_GC (authority->priv->cx);
>+#endif
> 
>   load_scripts (authority);
> 
>@@ -438,9 +465,13 @@ polkit_backend_js_authority_constructed (GObject *object)
>   JS_SetErrorReporter(authority->priv->cx, report_error);
>   JS_SetContextPrivate (authority->priv->cx, authority);
> 
>-  authority->priv->js_global = JS_NewCompartmentAndGlobalObject (authority->priv->cx,
>-                                                                 &js_global_class,
>-                                                                 NULL);
>+  authority->priv->js_global =
>+#if JS_VERSION == 186
>+    JS_NewGlobalObject (authority->priv->cx, &js_global_class, NULL);
>+#else
>+    JS_NewCompartmentAndGlobalObject (authority->priv->cx, &js_global_class, NULL);
>+#endif
>+
>   if (authority->priv->js_global == NULL)
>     goto fail;
> 
>@@ -917,7 +948,11 @@ rkt_on_timeout (gpointer user_data)
>   PolkitBackendJsAuthority *authority = POLKIT_BACKEND_JS_AUTHORITY (user_data);
> 
>   /* Supposedly this is thread-safe... */
>+#if JS_VERSION == 186
>+  JS_TriggerOperationCallback (authority->priv->rt);
>+#else
>   JS_TriggerOperationCallback (authority->priv->cx);
>+#endif
> 
>   /* keep source around so we keep trying to kill even if the JS bit catches the exception
>    * thrown in js_operation_callback()
>@@ -952,7 +987,11 @@ runaway_killer_teardown (PolkitBackendJsAuthority *authority)
> 
> static JSBool
> execute_script_with_runaway_killer (PolkitBackendJsAuthority *authority,
>+#if JS_VERSION == 186
>+                                    JSScript                 *script,
>+#else
>                                     JSObject                 *script,
>+#endif
>                                     jsval                    *rval)
> {
>   JSBool ret;
>-- 
>1.7.1
>

Actions: View | Splinter Review

Attachments on bug 59830: 73627 | 73628 | 77911 | 77912 | 77913

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.