| Andrew Geissler | eff2747 | 2021-10-29 15:35:00 -0500 | [diff] [blame^] | 1 | From 4ce27b66bb07b72cb96d3d43a75108a5a6e7e156 Mon Sep 17 00:00:00 2001 |
| 2 | From: Xi Ruoyao <xry111@mengyan1223.wang> |
| 3 | Date: Tue, 10 Aug 2021 19:09:42 +0800 |
| 4 | Subject: [PATCH] jsauthority: port to mozjs-91 |
| 5 | |
| 6 | Upstream-Status: Submitted [https://gitlab.freedesktop.org/polkit/polkit/-/merge_requests/92] |
| 7 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> |
| 8 | --- |
| 9 | configure.ac | 2 +- |
| 10 | meson.build | 2 +- |
| 11 | 2 files changed, 2 insertions(+), 2 deletions(-) |
| 12 | |
| 13 | diff --git a/configure.ac b/configure.ac |
| 14 | index d807086..5a7fc11 100644 |
| 15 | --- a/configure.ac |
| 16 | +++ b/configure.ac |
| 17 | @@ -80,7 +80,7 @@ PKG_CHECK_MODULES(GLIB, [gmodule-2.0 gio-unix-2.0 >= 2.30.0]) |
| 18 | AC_SUBST(GLIB_CFLAGS) |
| 19 | AC_SUBST(GLIB_LIBS) |
| 20 | |
| 21 | -PKG_CHECK_MODULES(LIBJS, [mozjs-78]) |
| 22 | +PKG_CHECK_MODULES(LIBJS, [mozjs-91]) |
| 23 | |
| 24 | AC_SUBST(LIBJS_CFLAGS) |
| 25 | AC_SUBST(LIBJS_CXXFLAGS) |
| 26 | diff --git a/meson.build b/meson.build |
| 27 | index b3702be..733bbff 100644 |
| 28 | --- a/meson.build |
| 29 | +++ b/meson.build |
| 30 | @@ -126,7 +126,7 @@ expat_dep = dependency('expat') |
| 31 | assert(cc.has_header('expat.h', dependencies: expat_dep), 'Can\'t find expat.h. Please install expat.') |
| 32 | assert(cc.has_function('XML_ParserCreate', dependencies: expat_dep), 'Can\'t find expat library. Please install expat.') |
| 33 | |
| 34 | -mozjs_dep = dependency('mozjs-78') |
| 35 | +mozjs_dep = dependency('mozjs-91') |
| 36 | |
| 37 | dbus_dep = dependency('dbus-1') |
| 38 | dbus_confdir = dbus_dep.get_pkgconfig_variable('datadir', define_variable: ['datadir', pk_prefix / pk_datadir]) #changed from sysconfdir with respect to commit#8eada3836465838 |