mirror of
https://github.com/microsoft/vcpkg.git
synced 2025-01-19 05:53:03 +08:00
[openxr-loader] Fix build failure in world rebuild CI. (#23191)
* [openxr-loader] Patch failure in world rebuild CI. * Version nonsense.
This commit is contained in:
parent
ffbcab4a37
commit
faa4527dd8
23
ports/openxr-loader/fix-jinja2.patch
Normal file
23
ports/openxr-loader/fix-jinja2.patch
Normal file
@ -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
|
@ -17,6 +17,7 @@ vcpkg_from_github(
|
||||
HEAD_REF master
|
||||
PATCHES
|
||||
fix-openxr-sdk-jsoncpp.patch
|
||||
fix-jinja2.patch
|
||||
)
|
||||
|
||||
vcpkg_from_github(
|
||||
|
@ -1,6 +1,7 @@
|
||||
{
|
||||
"name": "openxr-loader",
|
||||
"version": "1.0.22",
|
||||
"port-version": 1,
|
||||
"description": "A royalty-free, open standard that provides high-performance access to Augmented Reality (AR) and Virtual Reality (VR)—collectively known as XR—platforms and devices",
|
||||
"homepage": "https://github.com/KhronosGroup/OpenXR-SDK",
|
||||
"supports": "!(arm | uwp)",
|
||||
|
@ -5114,7 +5114,7 @@
|
||||
},
|
||||
"openxr-loader": {
|
||||
"baseline": "1.0.22",
|
||||
"port-version": 0
|
||||
"port-version": 1
|
||||
},
|
||||
"optimus-cpp": {
|
||||
"baseline": "0.3.0",
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "9d673fe500c4b38f0806bd4b3c23a82bba897967",
|
||||
"version": "1.0.22",
|
||||
"port-version": 1
|
||||
},
|
||||
{
|
||||
"git-tree": "445bbc9debe9866fad35544bd948d54fda4e72c4",
|
||||
"version": "1.0.22",
|
||||
|
Loading…
Reference in New Issue
Block a user