Date: Wed, 18 Feb 2026 14:21:33 +0000 From: Hiroki Tagato <tagattie@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 338044e988c5 - main - x11/contour: Fix build with libunicode-contour 0.8.0 Message-ID: <6995caed.1eea0.2b8dae4f@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by tagattie: URL: https://cgit.FreeBSD.org/ports/commit/?id=338044e988c54124cc9e7a58f634b94ee7fd58cd commit 338044e988c54124cc9e7a58f634b94ee7fd58cd Author: Hiroki Tagato <tagattie@FreeBSD.org> AuthorDate: 2026-02-18 14:18:33 +0000 Commit: Hiroki Tagato <tagattie@FreeBSD.org> CommitDate: 2026-02-18 14:21:26 +0000 x11/contour: Fix build with libunicode-contour 0.8.0 --- x11/contour/files/patch-src_vtbackend_Line.cpp | 11 +++++++++++ x11/contour/files/patch-src_vtbackend_Screen.cpp | 11 +++++++++++ .../files/patch-src_vtbackend_ViCommands.cpp | 21 +++++++++++++++++++++ 3 files changed, 43 insertions(+) diff --git a/x11/contour/files/patch-src_vtbackend_Line.cpp b/x11/contour/files/patch-src_vtbackend_Line.cpp new file mode 100644 index 000000000000..994dcac63271 --- /dev/null +++ b/x11/contour/files/patch-src_vtbackend_Line.cpp @@ -0,0 +1,11 @@ +--- src/vtbackend/Line.cpp.orig 2026-02-18 12:56:38 UTC ++++ src/vtbackend/Line.cpp +@@ -174,7 +174,7 @@ InflatedLineBuffer<Cell> inflate(TrivialLineBuffer con + auto const nextChar = + holds_alternative<unicode::Success>(r) ? get<unicode::Success>(r).value : ReplacementCharacter; + +- if (unicode::grapheme_segmenter::breakable(lastChar, nextChar)) ++ if (unicode::grapheme_segmenter::is_breakable(lastChar, nextChar)) + { + while (gapPending > 0) + { diff --git a/x11/contour/files/patch-src_vtbackend_Screen.cpp b/x11/contour/files/patch-src_vtbackend_Screen.cpp new file mode 100644 index 000000000000..dcf811f8a608 --- /dev/null +++ b/x11/contour/files/patch-src_vtbackend_Screen.cpp @@ -0,0 +1,11 @@ +--- src/vtbackend/Screen.cpp.orig 2026-02-18 12:52:30 UTC ++++ src/vtbackend/Screen.cpp +@@ -544,7 +544,7 @@ void Screen<Cell>::writeTextInternal(char32_t sourceCo + + char32_t const codepoint = _cursor.charsets.map(sourceCodepoint); + +- if (unicode::grapheme_segmenter::breakable(_terminal->parser().precedingGraphicCharacter(), codepoint)) ++ if (unicode::grapheme_segmenter::is_breakable(_terminal->parser().precedingGraphicCharacter(), codepoint)) + { + writeCharToCurrentAndAdvance(codepoint); + } diff --git a/x11/contour/files/patch-src_vtbackend_ViCommands.cpp b/x11/contour/files/patch-src_vtbackend_ViCommands.cpp new file mode 100644 index 000000000000..2485cb9cf80f --- /dev/null +++ b/x11/contour/files/patch-src_vtbackend_ViCommands.cpp @@ -0,0 +1,21 @@ +--- src/vtbackend/ViCommands.cpp.orig 2026-02-18 13:01:13 UTC ++++ src/vtbackend/ViCommands.cpp +@@ -34,12 +34,12 @@ namespace + // + // TODO: The punctuation test is highly inefficient. Adapt libunicode to allow O(1) access to these. + return (codepoint > 255 +- && !(unicode::general_category::space_separator(codepoint) +- || unicode::general_category::initial_punctuation(codepoint) +- || unicode::general_category::final_punctuation(codepoint) +- || unicode::general_category::open_punctuation(codepoint) +- || unicode::general_category::close_punctuation(codepoint) +- || unicode::general_category::dash_punctuation(codepoint))) ++ && !(unicode::general_category::is_space_separator(codepoint) ++ || unicode::general_category::is_initial_punctuation(codepoint) ++ || unicode::general_category::is_final_punctuation(codepoint) ++ || unicode::general_category::is_open_punctuation(codepoint) ++ || unicode::general_category::is_close_punctuation(codepoint) ++ || unicode::general_category::is_dash_punctuation(codepoint))) + || (192 <= codepoint && codepoint <= 255); + } +home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6995caed.1eea0.2b8dae4f>