Skip to content

Commit 550fb5e

Browse files
committed
chromium: Fix build with python 3.10
Fixes #577 Signed-off-by: Khem Raj <raj.khem@gmail.com>
1 parent 8df26e6 commit 550fb5e

File tree

2 files changed

+38
-0
lines changed

2 files changed

+38
-0
lines changed

meta-chromium/recipes-browser/chromium/chromium-gn.inc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ SRC_URI += " \
2323
file://0013-Revert-Use-ffile-compilation-dir-instead-of-fdebug-c.patch \
2424
file://0014-ozone-wayland-don-t-build-xcb-for-pure-wayland-build.patch \
2525
file://0015-build-use-python3.patch \
26+
file://jinja-python-3.10.patch \
2627
"
2728

2829
SRC_URI:append:libc-musl = "\
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
Fix build with python 3.10
2+
3+
Upstream-Status: Inappropriate [Already fixed in Jinja2 upstream]
4+
Signed-off-by: Khem Raj <raj.khem@gmail.com>
5+
--- a/third_party/jinja2/runtime.py
6+
+++ b/third_party/jinja2/runtime.py
7+
@@ -315,7 +315,7 @@ class Context(with_metaclass(ContextMeta
8+
9+
# register the context as mapping if possible
10+
try:
11+
- from collections import Mapping
12+
+ from collections.abc import Mapping
13+
Mapping.register(Context)
14+
except ImportError:
15+
pass
16+
--- a/third_party/jinja2/sandbox.py
17+
+++ b/third_party/jinja2/sandbox.py
18+
@@ -14,7 +14,7 @@
19+
"""
20+
import types
21+
import operator
22+
-from collections import Mapping
23+
+from collections.abc import Mapping
24+
from jinja2.environment import Environment
25+
from jinja2.exceptions import SecurityError
26+
from jinja2._compat import string_types, PY2
27+
--- a/third_party/jinja2/tests.py
28+
+++ b/third_party/jinja2/tests.py
29+
@@ -10,7 +10,7 @@
30+
"""
31+
import operator
32+
import re
33+
-from collections import Mapping
34+
+from collections.abc import Mapping
35+
from jinja2.runtime import Undefined
36+
from jinja2._compat import text_type, string_types, integer_types
37+
import decimal

0 commit comments

Comments
 (0)