diff --git a/x11/contour/Makefile b/x11/contour/Makefile index 1cb8e95bb2df..1c555827b9a8 100644 --- a/x11/contour/Makefile +++ b/x11/contour/Makefile @@ -1,84 +1,82 @@ PORTNAME= contour DISTVERSIONPREFIX= v -DISTVERSION= 0.6.2.8008 -PORTREVISION= 2 +DISTVERSION= 0.6.3.8249 CATEGORIES= x11 -PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ -PATCHFILES= c2d1ad278972278fb068e5f41ac82bed92c62193.patch:-p1 - MAINTAINER= tagattie@FreeBSD.org COMMENT= Modern C++ terminal emulator WWW= https://contour-terminal.org/ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE.txt BUILD_DEPENDS= ${LOCALBASE}/lib/cmake/boxed-cpp/boxed-cpp-config.cmake:devel/boxed-cpp \ ${LOCALBASE}/lib/cmake/reflection-cpp/reflection-cpp-config.cmake:devel/reflection-cpp \ ${LOCALBASE}/share/cmake/Microsoft.GSL/Microsoft.GSLConfig.cmake:devel/microsoft-gsl \ - ${LOCALBASE}/lib/cmake/range-v3/range-v3-config.cmake:devel/range-v3 + ${LOCALBASE}/lib/cmake/range-v3/range-v3-config.cmake:devel/range-v3 \ + vulkan-headers>0:graphics/vulkan-headers LIB_DEPENDS= libunicode.so:devel/libunicode-contour \ libyaml-cpp.so:devel/yaml-cpp \ libfreetype.so:print/freetype2 \ libharfbuzz.so:print/harfbuzz \ libssh2.so:security/libssh2 \ libfontconfig.so:x11-fonts/fontconfig TEST_DEPENDS= ${LOCALBASE}/lib/cmake/Catch2/Catch2Config.cmake:devel/catch2 USES= cmake:testing compiler desktop-file-utils gl gnome pkgconfig \ qt:6 xorg USE_GITHUB= yes GH_ACCOUNT= contour-terminal USE_XORG= xcb USE_GL= opengl USE_GNOME= cairo USE_QT= base declarative multimedia tools:build CMAKE_ON= CONTOUR_INSTALL_TOOLS +CMAKE_OFF= CONTOUR_USE_CPM CMAKE_TESTING_ON= CONTOUR_TESTING PORTDOCS= README.md SECURITY.md OPTIONS_DEFINE= DOCS .include .if ${OPSYS} == FreeBSD && ${ARCH} == i386 EXTRA_PATCHES= ${PATCHDIR}/extra-patch-src_crispy_read__selector.h .endif # FreeBSD 13 does not have tic in base, so we need one from ports .if ${OPSYS} == FreeBSD && ${OSREL:R} == 13 BUILD_DEPENDS+= tic:devel/ncurses .endif .if ${ARCH:Mpowerpc*} USES+= compiler:gcc-c++11-lib .endif post-install: @${RM} -r ${STAGEDIR}${DATADIR} @${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d \ ${STAGEDIR}${PREFIX}/share/fish/vendor_completions.d \ ${STAGEDIR}${PREFIX}/share/zsh/site-functions ${INSTALL_DATA} ${WRKSRC}/src/contour/shell-integration/shell-integration.bash \ ${STAGEDIR}${PREFIX}/etc/bash_completion.d/${PORTNAME} ${INSTALL_DATA} ${WRKSRC}/src/contour/shell-integration/shell-integration.fish \ ${STAGEDIR}${PREFIX}/share/fish/vendor_completions.d/${PORTNAME}.fish ${INSTALL_DATA} ${WRKSRC}/src/contour/shell-integration/shell-integration.zsh \ ${STAGEDIR}${PREFIX}/share/zsh/site-functions/_${PORTNAME} post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_MAN} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} .include # XXX COMPILER_TYPE is defined after USES was already parsed .if ${CHOSEN_COMPILER_TYPE} == clang && ${_CCVERSION:M+assertions} llvm_ARGS= build .include "${USESDIR}/llvm.mk" .endif diff --git a/x11/contour/distinfo b/x11/contour/distinfo index 64f274df8741..ce132683c9e5 100644 --- a/x11/contour/distinfo +++ b/x11/contour/distinfo @@ -1,5 +1,3 @@ -TIMESTAMP = 1769085693 -SHA256 (contour-terminal-contour-v0.6.2.8008_GH0.tar.gz) = 0018f111530ffb5fc669fdd9e400f730156c4d8cfd03ec9e06da555d6bc921e5 -SIZE (contour-terminal-contour-v0.6.2.8008_GH0.tar.gz) = 10374198 -SHA256 (c2d1ad278972278fb068e5f41ac82bed92c62193.patch) = 1d8b43393f6c20f43affabc3efcd7e7cea2cb8e2ab32d6739ef9d6ee37c76de0 -SIZE (c2d1ad278972278fb068e5f41ac82bed92c62193.patch) = 3534 +TIMESTAMP = 1776673548 +SHA256 (contour-terminal-contour-v0.6.3.8249_GH0.tar.gz) = 9354ae9ef1c1df17febf095033f965fe81d173beed3445aae86a5a07bb75cbce +SIZE (contour-terminal-contour-v0.6.3.8249_GH0.tar.gz) = 13655409 diff --git a/x11/contour/files/patch-src_vtbackend_Line.cpp b/x11/contour/files/patch-src_vtbackend_Line.cpp deleted file mode 100644 index 994dcac63271..000000000000 --- a/x11/contour/files/patch-src_vtbackend_Line.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- src/vtbackend/Line.cpp.orig 2026-02-18 12:56:38 UTC -+++ src/vtbackend/Line.cpp -@@ -174,7 +174,7 @@ InflatedLineBuffer inflate(TrivialLineBuffer con - auto const nextChar = - holds_alternative(r) ? get(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 deleted file mode 100644 index dcf811f8a608..000000000000 --- a/x11/contour/files/patch-src_vtbackend_Screen.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- src/vtbackend/Screen.cpp.orig 2026-02-18 12:52:30 UTC -+++ src/vtbackend/Screen.cpp -@@ -544,7 +544,7 @@ void Screen::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 deleted file mode 100644 index 2485cb9cf80f..000000000000 --- a/x11/contour/files/patch-src_vtbackend_ViCommands.cpp +++ /dev/null @@ -1,21 +0,0 @@ ---- 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); - } -