[patch] mozjs 91 patch

mozjs-91.patch (text/plain), 2.02 KB, created by Andrea Postiglione on 2022-02-11 11:27:17 UTC

diff -uPrN polkit-0.120/configure.ac polkit-0.120-new/configure.ac
--- a/configure.ac	2021-09-29 21:16:29.000000000 +0200
+++ b/configure.ac	2022-02-11 12:14:18.876234071 +0100
@@ -80,7 +80,7 @@
 AC_SUBST(GLIB_CFLAGS)
 AC_SUBST(GLIB_LIBS)
 
-PKG_CHECK_MODULES(LIBJS, [mozjs-78])
+PKG_CHECK_MODULES(LIBJS, [mozjs-91])
 
 AC_SUBST(LIBJS_CFLAGS)
 AC_SUBST(LIBJS_CXXFLAGS)
diff -uPrN polkit-0.120/meson.build polkit-0.120-new/meson.build
--- a/meson.build	2021-09-29 21:16:29.000000000 +0200
+++ b/meson.build	2022-02-11 12:14:42.667922549 +0100
@@ -133,7 +133,7 @@
 assert(cc.has_header('expat.h', dependencies: expat_dep), 'Can\'t find expat.h. Please install expat.')
 assert(cc.has_function('XML_ParserCreate', dependencies: expat_dep), 'Can\'t find expat library. Please install expat.')
 
-mozjs_dep = dependency('mozjs-78')
+mozjs_dep = dependency('mozjs-91')
 
 dbus_dep = dependency('dbus-1', required: false)
 dbus_policydir = pk_prefix / pk_datadir / 'dbus-1/system.d'
diff -uPrN polkit-0.120/src/polkitbackend/polkitbackendjsauthority.cpp polkit-0.120-new/src/polkitbackend/polkitbackendjsauthority.cpp
--- a/src/polkitbackend/polkitbackendjsauthority.cpp	2021-08-12 14:33:59.000000000 +0200
+++ b/src/polkitbackend/polkitbackendjsauthority.cpp	2022-02-11 12:17:28.561737260 +0100
@@ -74,6 +74,13 @@
  */
 
 /* ---------------------------------------------------------------------------------------------------- */
+static class JsInitHelperType
+{
+public:
+       JsInitHelperType() { JS_Init(); }
+       ~JsInitHelperType() { JS_ShutDown(); }
+} JsInitHelper;
+
 
 struct _PolkitBackendJsAuthorityPrivate
 {
@@ -589,7 +596,6 @@
   delete authority->priv->js_polkit;
 
   JS_DestroyContext (authority->priv->cx);
-  /* JS_ShutDown (); */
 
   G_OBJECT_CLASS (polkit_backend_js_authority_parent_class)->finalize (object);
 }
@@ -666,7 +672,6 @@
 
   g_type_class_add_private (klass, sizeof (PolkitBackendJsAuthorityPrivate));
 
-  JS_Init ();
 }
 
 /* ---------------------------------------------------------------------------------------------------- */