mirror of
https://github.com/microsoft/vcpkg.git
synced 2025-06-07 01:24:47 +08:00
[ftxui] update to 4.0.0 (#29616)
Update ports/ftxui/portfile.cmake Co-authored-by: Cheney Wang <38240633+Cheney-W@users.noreply.github.com>
This commit is contained in:
parent
3f2f3ef820
commit
baf8db0dfe
@ -1,41 +0,0 @@
|
||||
From 094d8d9d0a3cd19a7258a13d21ccb6acca60b858 Mon Sep 17 00:00:00 2001
|
||||
From: AMS21 <AMS21.github@gmail.com>
|
||||
Date: Tue, 14 Jun 2022 21:03:03 +0200
|
||||
Subject: [PATCH] Fix border charset array being to large (#421)
|
||||
|
||||
This for some reason caused the clang compiler to crash, while also
|
||||
being incorrect as the tables are actually only 5x6.
|
||||
|
||||
See the LLVM issue here:
|
||||
https://github.com/llvm/llvm-project/issues/56016
|
||||
---
|
||||
src/ftxui/dom/border.cpp | 2 +-
|
||||
src/ftxui/dom/table.cpp | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/ftxui/dom/border.cpp b/src/ftxui/dom/border.cpp
|
||||
index 0466dd9e..f39eb523 100644
|
||||
--- a/src/ftxui/dom/border.cpp
|
||||
+++ b/src/ftxui/dom/border.cpp
|
||||
@@ -14,7 +14,7 @@
|
||||
namespace ftxui {
|
||||
|
||||
using Charset = std::array<std::string, 6>; // NOLINT
|
||||
-using Charsets = std::array<Charset, 6>; // NOLINT
|
||||
+using Charsets = std::array<Charset, 5>; // NOLINT
|
||||
// NOLINTNEXTLINE
|
||||
static Charsets simple_border_charset = {
|
||||
Charset{"┌", "┐", "└", "┘", "─", "│"},
|
||||
diff --git a/src/ftxui/dom/table.cpp b/src/ftxui/dom/table.cpp
|
||||
index 50da0918..081011f9 100644
|
||||
--- a/src/ftxui/dom/table.cpp
|
||||
+++ b/src/ftxui/dom/table.cpp
|
||||
@@ -14,7 +14,7 @@ bool IsCell(int x, int y) {
|
||||
}
|
||||
|
||||
// NOLINTNEXTLINE
|
||||
-static std::string charset[6][6] = {
|
||||
+static std::string charset[5][6] = {
|
||||
{"┌", "┐", "└", "┘", "─", "│"}, //
|
||||
{"┏", "┓", "┗", "┛", "━", "┃"}, //
|
||||
{"╔", "╗", "╚", "╝", "═", "║"}, //
|
@ -3,11 +3,9 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO ArthurSonzogni/FTXUI
|
||||
REF c033ca61ae8fb264542d0326d1309e0a3bde945a # 3.0.0
|
||||
SHA512 ca1468f30f90c3a886fbb6dea113699623d601da10b39a6a33d89780cd825bec8deb431872a2515fce05c7a5d581d4b56860b19654df8cf90e389dfa964f013c
|
||||
REF "v${VERSION}"
|
||||
SHA512 989afc109e31fa083f5d953d199dc7f4515daaee7014ec1616b48bc66ff49643bc32e5cdd273016a1d44f6921f6031d1e7e41fc2375cfee44fc719223baaaa7b
|
||||
HEAD_REF master
|
||||
PATCHES
|
||||
fix_clang_crash-094d8d9d.patch # Included in next release. Upstream PR https://github.com/ArthurSonzogni/FTXUI/pull/421
|
||||
)
|
||||
|
||||
vcpkg_cmake_configure(
|
||||
|
@ -1,7 +1,6 @@
|
||||
{
|
||||
"name": "ftxui",
|
||||
"version-semver": "3.0.0",
|
||||
"port-version": 1,
|
||||
"version-semver": "4.0.0",
|
||||
"description": "C++ Functional Terminal User Interface",
|
||||
"homepage": "https://github.com/ArthurSonzogni/FTXUI",
|
||||
"license": "MIT",
|
||||
|
@ -2589,8 +2589,8 @@
|
||||
"port-version": 1
|
||||
},
|
||||
"ftxui": {
|
||||
"baseline": "3.0.0",
|
||||
"port-version": 1
|
||||
"baseline": "4.0.0",
|
||||
"port-version": 0
|
||||
},
|
||||
"function2": {
|
||||
"baseline": "4.2.2",
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "acaddb4b8448c853dac8d132d591fd8062692ae8",
|
||||
"version-semver": "4.0.0",
|
||||
"port-version": 0
|
||||
},
|
||||
{
|
||||
"git-tree": "29dcc8c936cb0fb0e7703aef2ebfedadb47a738a",
|
||||
"version-semver": "3.0.0",
|
||||
|
Loading…
Reference in New Issue
Block a user