diff --git a/x11/contour/Makefile b/x11/contour/Makefile index 5c3604862fba..ed0de1b7763c 100644 --- a/x11/contour/Makefile +++ b/x11/contour/Makefile @@ -1,73 +1,77 @@ PORTNAME= contour DISTVERSIONPREFIX= v DISTVERSION= 0.6.2.8008 +PORTREVISION= 1 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 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 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_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 diff --git a/x11/contour/distinfo b/x11/contour/distinfo index 0552cc861ad4..64f274df8741 100644 --- a/x11/contour/distinfo +++ b/x11/contour/distinfo @@ -1,3 +1,5 @@ -TIMESTAMP = 1767948273 +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 diff --git a/x11/contour/files/patch-src_crispy_FNV.h b/x11/contour/files/patch-src_crispy_FNV.h deleted file mode 100644 index 83a63216ccea..000000000000 --- a/x11/contour/files/patch-src_crispy_FNV.h +++ /dev/null @@ -1,67 +0,0 @@ ---- src/crispy/FNV.h.orig 2026-01-06 17:41:07 UTC -+++ src/crispy/FNV.h -@@ -41,16 +41,47 @@ class fnv - return (*this)((*this)(memory, value), moreValues...); - } - -- template -- constexpr U operator()(U memory, std::basic_string_view str, V... moreValues) const noexcept -+ /// Incrementally hashes a trivially copyable value. -+ /// -+ /// The value is treated as a sequence of bytes and hashed byte-wise. -+ /// This overload explicitly excludes std::string and std::string_view, -+ /// which are handled by dedicated overloads. -+ template && -+ !std::is_same_v && -+ !std::is_same_v>> -+ constexpr U operator()(U memory, V const& value) const noexcept - { -+ auto const* bytes = -+ reinterpret_cast(&value); -+ for (std::size_t i = 0; i < sizeof(V); ++i) -+ memory = (*this)(memory, bytes[i]); -+ return memory; -+ } -+ -+ /// Incrementally hashes a string view and additional values (char only). -+ /// -+ /// Each character in @p str is hashed sequentially before applying -+ /// the remaining values in @p moreValues. -+ template >> -+ constexpr U operator()(U memory, -+ std::string_view str, -+ V... moreValues) const noexcept -+ { - for (auto const ch: str) - memory = (*this)(memory, ch); - return (*this)(memory, moreValues...); - } - - /// Builds the FNV hash between [_begin, _end) -- constexpr U operator()(U memory, std::basic_string_view str) const noexcept -+ /// Builds the FNV hash for a string view (char only). -+ /// -+ /// Hashes all characters in @p str starting from the given memory value. -+ template >> -+ constexpr U operator()(U memory, std::string_view str) const noexcept - { - for (auto const ch: str) - memory = (*this)(memory, ch); -@@ -70,7 +101,12 @@ class fnv - constexpr U operator()(T const* data, size_t len) const noexcept { return (*this)(data, data + len); } - - /// Builds the FNV hash between [_begin, _begin + len) -- constexpr U operator()(std::basic_string const& str) const noexcept -+ /// Builds the FNV hash for a std::string (char only). -+ /// -+ /// Hashes the string's character data sequentially. -+ template >> -+ constexpr U operator()(std::string const& str) const noexcept - { - return (*this)(str.data(), str.data() + str.size()); - }