mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-04 14:39:54 +00:00
Code Issues Projects Releases Wiki Activity

polkit: update mozjs dependency 102 -> 115

Browse Source 
This will allow dropping mozjs-102 instead of attempting
to make it work with python 3.12.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Alexander Kanavin
2023-12-22 16:11:03 +01:00
committed by Khem Raj
parent 168be0b164
commit 993cf00efe
2 changed files with 31 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-extended/polkit/polkit/0001-jsauthority-Bump-mozjs-to-115.patch
+26
View File
@@ -0,0 +1,26 @@
From 2f0de2a831ab106fce210c1d65baef041256bc18 Mon Sep 17 00:00:00 2001
From: Xi Ruoyao <xry111@xry111.site>
Date: Mon, 18 Sep 2023 01:53:04 +0800
Subject: [PATCH] jsauthority: Bump mozjs to 115
No code change is needed!
Upstream-Status: Backport [https://gitlab.freedesktop.org/polkit/polkit/-/commit/b340f50b7bb963863ede7c63f9a0b5c50c80c1e1]
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meson.build b/meson.build
index 3b96562..92b68fd 100644
--- a/meson.build
+++ b/meson.build
@@ -153,7 +153,7 @@ if js_engine == 'duktape'
func = 'pthread_condattr_setclock'
config_h.set('HAVE_' + func.to_upper(), cc.has_function(func, prefix : '#include <pthread.h>'))
elif js_engine == 'mozjs'
- js_dep = dependency('mozjs-102')
+ js_dep = dependency('mozjs-115')
_system = host_machine.system().to_lower()
if _system.contains('freebsd')
meta-oe/recipes-extended/polkit/polkit_123.bb
+5 -5
View File
@@ -4,10 +4,10 @@ HOMEPAGE = "http://www.freedesktop.org/wiki/Software/polkit"
LICENSE = "LGPL-2.0-or-later"
LIC_FILES_CHKSUM = "file://COPYING;md5=155db86cdbafa7532b41f390409283eb"
SRC_URI = " \
git://gitlab.freedesktop.org/polkit/polkit.git;protocol=https;branch=master \
file://0001-polkit.service.in-disable-MemoryDenyWriteExecute.patch \
"
SRC_URI = "git://gitlab.freedesktop.org/polkit/polkit.git;protocol=https;branch=master \
file://0001-polkit.service.in-disable-MemoryDenyWriteExecute.patch \
file://0001-jsauthority-Bump-mozjs-to-115.patch \
"
S = "${WORKDIR}/git"
SRCREV = "fc8b07e71d99f88a29258cde99b913b44da1846d"
@@ -31,7 +31,7 @@ PACKAGECONFIG[systemd] = "-Dsession_tracking=libsystemd-login,-Dsession_tracking
PACKAGECONFIG[consolekit] = ",,,consolekit"
# Default to mozjs javascript library
PACKAGECONFIG[mozjs] = "-Djs_engine=mozjs,,mozjs-102,,,duktape"
PACKAGECONFIG[mozjs] = "-Djs_engine=mozjs,,mozjs-115,,,duktape"
# duktape javascript engine is much smaller and faster but is not compatible with
# same javascript standards as mozjs. For example array.includes() function is not
# supported. Test rule compatibility when switching to duktape.