early-access version 2853

2022-07-23 03:01:36 +02:00
parent 1f2b5081b5
commit 1f111bb69c
8955 changed files with 418777 additions and 999 deletions
--- a/externals/vcpkg/ports/openxr-loader/fix-jinja2.patch
+++ b/externals/vcpkg/ports/openxr-loader/fix-jinja2.patch
@@ -0,0 +1,23 @@
+From d80c7dc3f4810fc49e4444590d39ef71e8a9b01c Mon Sep 17 00:00:00 2001
+From: Adam Johnson <AdamJohnso@gmail.com>
+Date: Sat, 19 Feb 2022 19:42:31 -0500
+Subject: [PATCH] Fix bad import in jinja2
+
+---
+ external/python/jinja2/utils.py | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/external/python/jinja2/utils.py b/external/python/jinja2/utils.py
+index db9c5d06..f198e3ef 100644
+--- a/external/python/jinja2/utils.py
+++ b/external/python/jinja2/utils.py
+@@ -639,4 +639,8 @@ def __repr__(self):
+ 
+ 
+ # Imported here because that's where it was in the past
+-from markupsafe import Markup, escape, soft_unicode
+from markupsafe import Markup, escape
+try:
+    from markupsafe import soft_unicode
+except ImportError:
+    from markupsafe import soft_str as soft_unicode