[arch-commits] Commit in electron/trunk (PKGBUILD jinja-python-3.10.patch)

[Nicola Squartini]

    Date: Tuesday, January 4, 2022 @ 09:06:03
  Author: tensor5
Revision: 1092773

upgpkg: electron 16.0.6-1

Added:
  electron/trunk/jinja-python-3.10.patch
Modified:
  electron/trunk/PKGBUILD

-------------------------+
 PKGBUILD                |   13 ++++++++++---
 jinja-python-3.10.patch |   33 +++++++++++++++++++++++++++++++++
 2 files changed, 43 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-01-04 08:46:19 UTC (rev 1092772)
+++ PKGBUILD	2022-01-04 09:06:03 UTC (rev 1092773)
@@ -1,9 +1,9 @@
 # Maintainer: Nicola Squartini <tensor5 at gmail.com>
 
 _use_suffix=0
-pkgver=16.0.4
-_commit=4aef2d7cc386393649a0d32d1ca27efa67b8e8b4
-_chromiumver=96.0.4664.55
+pkgver=16.0.6
+_commit=eb7a89784901e1480ad36006c6480cff0a955544
+_chromiumver=96.0.4664.110
 _gcc_patchset=4
 # shellcheck disable=SC2034
 pkgrel=1
@@ -48,6 +48,7 @@
         "electron-launcher.sh"
         "electron.desktop"
         'default_app-icon.patch'
+        'jinja-python-3.10.patch'
         'std-vector-non-const.patch'
         'use-system-libraries-in-node.patch'
         'sql-make-VirtualCursor-standard-layout-type.patch'
@@ -63,6 +64,7 @@
             '3953f532a3ea5fce19ee33600c6ead89dcd066df6a01d3c3ab4c24f96e46fca2'
             '4484200d90b76830b69eea3a471c103999a3ce86bb2c29e6c14c945bf4102bae'
             '75bac9c4ad32ff9329399b8587f9772e208c009fd822cdfce61b2bd1ee9ac828'
+            '09de0ebb4002be7fb4ede63d3977e4f1235637750169c9e71bfdbd75bf750f7a'
             '05598c7ccac38772503f00335916fe038db0d9aa240cf13a3b0f0ee69a382d98'
             'c70652a8b24c237bcfd27469de32797a2cb46d9f0d63d897bb6418314a25644c'
             'dd317f85e5abfdcfc89c6f23f4c8edbcdebdd5e083dcec770e5da49ee647d150'
@@ -174,6 +176,8 @@
   patch -Rp1 -i ../chromium-94-ffmpeg-roll.patch
   patch -Np1 -i ../sql-make-VirtualCursor-standard-layout-type.patch
   patch -Np0 -i ../unexpire-accelerated-video-decode-flag.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
 
@@ -203,6 +207,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 09:06:03 UTC (rev 1092773)
@@ -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