diff options
-rw-r--r-- | meta-oe/recipes-extended/polkit/polkit/0001-jsauthority-Bump-mozjs-to-115.patch | 26 | ||||
-rw-r--r-- | meta-oe/recipes-extended/polkit/polkit_123.bb | 10 |
2 files changed, 31 insertions, 5 deletions
diff --git a/meta-oe/recipes-extended/polkit/polkit/0001-jsauthority-Bump-mozjs-to-115.patch b/meta-oe/recipes-extended/polkit/polkit/0001-jsauthority-Bump-mozjs-to-115.patch new file mode 100644 index 0000000000..163a03cfc3 --- /dev/null +++ b/meta-oe/recipes-extended/polkit/polkit/0001-jsauthority-Bump-mozjs-to-115.patch | |||
@@ -0,0 +1,26 @@ | |||
1 | From 2f0de2a831ab106fce210c1d65baef041256bc18 Mon Sep 17 00:00:00 2001 | ||
2 | From: Xi Ruoyao <xry111@xry111.site> | ||
3 | Date: Mon, 18 Sep 2023 01:53:04 +0800 | ||
4 | Subject: [PATCH] jsauthority: Bump mozjs to 115 | ||
5 | |||
6 | No code change is needed! | ||
7 | |||
8 | Upstream-Status: Backport [https://gitlab.freedesktop.org/polkit/polkit/-/commit/b340f50b7bb963863ede7c63f9a0b5c50c80c1e1] | ||
9 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> | ||
10 | --- | ||
11 | meson.build | 2 +- | ||
12 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
13 | |||
14 | diff --git a/meson.build b/meson.build | ||
15 | index 3b96562..92b68fd 100644 | ||
16 | --- a/meson.build | ||
17 | +++ b/meson.build | ||
18 | @@ -153,7 +153,7 @@ if js_engine == 'duktape' | ||
19 | func = 'pthread_condattr_setclock' | ||
20 | config_h.set('HAVE_' + func.to_upper(), cc.has_function(func, prefix : '#include <pthread.h>')) | ||
21 | elif js_engine == 'mozjs' | ||
22 | - js_dep = dependency('mozjs-102') | ||
23 | + js_dep = dependency('mozjs-115') | ||
24 | |||
25 | _system = host_machine.system().to_lower() | ||
26 | if _system.contains('freebsd') | ||
diff --git a/meta-oe/recipes-extended/polkit/polkit_123.bb b/meta-oe/recipes-extended/polkit/polkit_123.bb index 4fc23559f9..670fd995fb 100644 --- a/meta-oe/recipes-extended/polkit/polkit_123.bb +++ b/meta-oe/recipes-extended/polkit/polkit_123.bb | |||
@@ -4,10 +4,10 @@ HOMEPAGE = "http://www.freedesktop.org/wiki/Software/polkit" | |||
4 | LICENSE = "LGPL-2.0-or-later" | 4 | LICENSE = "LGPL-2.0-or-later" |
5 | LIC_FILES_CHKSUM = "file://COPYING;md5=155db86cdbafa7532b41f390409283eb" | 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=155db86cdbafa7532b41f390409283eb" |
6 | 6 | ||
7 | SRC_URI = " \ | 7 | SRC_URI = "git://gitlab.freedesktop.org/polkit/polkit.git;protocol=https;branch=master \ |
8 | git://gitlab.freedesktop.org/polkit/polkit.git;protocol=https;branch=master \ | 8 | file://0001-polkit.service.in-disable-MemoryDenyWriteExecute.patch \ |
9 | file://0001-polkit.service.in-disable-MemoryDenyWriteExecute.patch \ | 9 | file://0001-jsauthority-Bump-mozjs-to-115.patch \ |
10 | " | 10 | " |
11 | 11 | ||
12 | S = "${WORKDIR}/git" | 12 | S = "${WORKDIR}/git" |
13 | SRCREV = "fc8b07e71d99f88a29258cde99b913b44da1846d" | 13 | SRCREV = "fc8b07e71d99f88a29258cde99b913b44da1846d" |
@@ -31,7 +31,7 @@ PACKAGECONFIG[systemd] = "-Dsession_tracking=libsystemd-login,-Dsession_tracking | |||
31 | PACKAGECONFIG[consolekit] = ",,,consolekit" | 31 | PACKAGECONFIG[consolekit] = ",,,consolekit" |
32 | 32 | ||
33 | # Default to mozjs javascript library | 33 | # Default to mozjs javascript library |
34 | PACKAGECONFIG[mozjs] = "-Djs_engine=mozjs,,mozjs-102,,,duktape" | 34 | PACKAGECONFIG[mozjs] = "-Djs_engine=mozjs,,mozjs-115,,,duktape" |
35 | # duktape javascript engine is much smaller and faster but is not compatible with | 35 | # duktape javascript engine is much smaller and faster but is not compatible with |
36 | # same javascript standards as mozjs. For example array.includes() function is not | 36 | # same javascript standards as mozjs. For example array.includes() function is not |
37 | # supported. Test rule compatibility when switching to duktape. | 37 | # supported. Test rule compatibility when switching to duktape. |