Date: Tuesday, January 4, 2022 @ 11:04:41 Author: tensor5 Revision: 1092881
upgpkg: electron15 15.3.4-1 Added: electron15/trunk/jinja-python-3.10.patch Modified: electron15/trunk/PKGBUILD -------------------------+ PKGBUILD | 12 ++++++++++-- jinja-python-3.10.patch | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 2 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-01-04 11:02:46 UTC (rev 1092880) +++ PKGBUILD 2022-01-04 11:04:41 UTC (rev 1092881) @@ -1,8 +1,8 @@ # Maintainer: Nicola Squartini <[email protected]> _use_suffix=1 -pkgver=15.3.3 -_commit=ed52801e09ebf6e334db3faf752f43947d5cd3f5 +pkgver=15.3.4 +_commit=536b5c4e3b3f79be85293398b57df0ae8323db0e _chromiumver=94.0.4606.81 _gcc_patchset=3 # shellcheck disable=SC2034 @@ -48,6 +48,7 @@ "electron-launcher.sh" "electron.desktop" 'default_app-icon.patch' + 'jinja-python-3.10.patch' 'use-system-libraries-in-node.patch' 'replace-blacklist-with-ignorelist.patch' 'sql-make-VirtualCursor-standard-layout-type.patch' @@ -68,6 +69,7 @@ '3953f532a3ea5fce19ee33600c6ead89dcd066df6a01d3c3ab4c24f96e46fca2' '4484200d90b76830b69eea3a471c103999a3ce86bb2c29e6c14c945bf4102bae' '75bac9c4ad32ff9329399b8587f9772e208c009fd822cdfce61b2bd1ee9ac828' + '09de0ebb4002be7fb4ede63d3977e4f1235637750169c9e71bfdbd75bf750f7a' '7cb11fb44aaf4d15f36caca3c0d1b082a723c30d43cd44db147248db5683a2a9' 'd3344ba39b8c6ed202334ba7f441c70d81ddf8cdb15af1aa8c16e9a3a75fbb35' 'dd317f85e5abfdcfc89c6f23f4c8edbcdebdd5e083dcec770e5da49ee647d150' @@ -179,10 +181,13 @@ patch -Rp1 -i ../add-a-TODO-about-a-missing-pnacl-flag.patch patch -Np1 -i ../chromium-93-ffmpeg-4.4.patch patch -Rp1 -i ../chromium-94-ffmpeg-roll.patch + patch -d third_party/jinja2 -Np1 -i ../../../jinja-python-3.10.patch patch -Rp1 -i ../replace-blacklist-with-ignorelist.patch patch -Np1 -i ../sql-make-VirtualCursor-standard-layout-type.patch patch -Np0 -i ../unexpire-accelerated-video-decode-flag.patch patch -Rp1 -i ../use-ffile-compilation-dir.patch + patch -d third_party/electron_node/tools/inspector_protocol/jinja2 \ + -Np1 -i ../../../../../../jinja-python-3.10.patch patch -Np1 -i ../use-system-libraries-in-node.patch patch -Np1 -i ../default_app-icon.patch # Icon from .desktop file @@ -212,6 +217,9 @@ export AR=ar export NM=nm + CFLAGS="${CFLAGS/-fexceptions/}" + CXXFLAGS="${CXXFLAGS/-fexceptions/}" + # Do not warn about unknown warning options CFLAGS+=' -Wno-unknown-warning-option' CXXFLAGS+=' -Wno-unknown-warning-option' Added: jinja-python-3.10.patch =================================================================== --- jinja-python-3.10.patch (rev 0) +++ jinja-python-3.10.patch 2022-01-04 11:04:41 UTC (rev 1092881) @@ -0,0 +1,33 @@ +--- a/runtime.py ++++ b/runtime.py +@@ -315,7 +315,7 @@ class Context(with_metaclass(ContextMeta + + # register the context as mapping if possible + try: +- from collections import Mapping ++ from collections.abc import Mapping + Mapping.register(Context) + except ImportError: + pass +--- a/sandbox.py ++++ b/sandbox.py +@@ -14,7 +14,7 @@ + """ + import types + import operator +-from collections import Mapping ++from collections.abc import Mapping + from jinja2.environment import Environment + from jinja2.exceptions import SecurityError + from jinja2._compat import string_types, PY2 +--- a/tests.py ++++ b/tests.py +@@ -10,7 +10,7 @@ + """ + import operator + import re +-from collections import Mapping ++from collections.abc import Mapping + from jinja2.runtime import Undefined + from jinja2._compat import text_type, string_types, integer_types + import decimal
