Date: Sat, 11 Jan 2025 10:22:20 GMT From: Matthias Andree <mandree@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org Subject: git: 6887fc0a91ea - 2025Q1 - devel/doxygen: Revert "Fix TinyDeflate's clang-19 compatibility" Message-ID: <202501111022.50BAMKtc028927@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch 2025Q1 has been updated by mandree: URL: https://cgit.FreeBSD.org/ports/commit/?id=6887fc0a91ea8dbf56d26babfb8d0ca6a39c5965 commit 6887fc0a91ea8dbf56d26babfb8d0ca6a39c5965 Author: Matthias Andree <mandree@FreeBSD.org> AuthorDate: 2025-01-11 10:17:24 +0000 Commit: Matthias Andree <mandree@FreeBSD.org> CommitDate: 2025-01-11 10:22:03 +0000 devel/doxygen: Revert "Fix TinyDeflate's clang-19 compatibility" This reverts commit 3cf80a2187c4855c9b4af644c39e82db8321b10e, which depended on 299bcfac7144, and the latter has not yet been merged onto 2025Q1 (it was authored in June 2024, but only merged after the 2025Q1 branch, which confused me when cherry-picking 3cf80a2). PR: 283976 Reported by: Dennis Clarke <dclarke@blastwave.org> --- devel/doxygen/files/patch-TinyDeflate_gunzip.hh | 37 ------------------------- 1 file changed, 37 deletions(-) diff --git a/devel/doxygen/files/patch-TinyDeflate_gunzip.hh b/devel/doxygen/files/patch-TinyDeflate_gunzip.hh deleted file mode 100644 index f85364163df9..000000000000 --- a/devel/doxygen/files/patch-TinyDeflate_gunzip.hh +++ /dev/null @@ -1,37 +0,0 @@ -https://github.com/bisqwit/TinyDeflate/commit/68ced8bd5c819264e628d4f063500753b77f613d.patch - -From 68ced8bd5c819264e628d4f063500753b77f613d Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Bernhard=20Rosenkr=C3=A4nzer?= <bero@lindev.ch> -Date: Fri, 9 Aug 2024 14:09:01 +0200 -Subject: [PATCH] Fix build with clang >= 19.0 - -Clang >= 19.0 requires a template argument list after the template -keyword for CWG96 compliance, see -https://github.com/llvm/llvm-project/pull/80801 ---- TinyDeflate/gunzip.hh.orig 2025-01-08 14:32:52 UTC -+++ TinyDeflate/gunzip.hh -@@ -1141,21 +1141,21 @@ namespace gunzip_ns - //fprintf(stderr, "both track flag\n"); - SizeTracker<DeflateTrackBothSize> tracker; - return tracker(Gunzip<code & Flag_NoTrackFlagMask> -- (tracker.template ForwardInput(i), tracker.template ForwardOutput(o), tracker.template ForwardWindow(c), std::forward<B>(b))); -+ (tracker.template ForwardInput<I>(i), tracker.template ForwardOutput<O>(o), tracker.template ForwardWindow<C>(c), std::forward<B>(b))); - } - else if constexpr(code & Flag_TrackIn) - { - //fprintf(stderr, "in track flag\n"); - SizeTracker<DeflateTrackInSize> tracker; - return tracker(Gunzip<code & Flag_NoTrackFlagMask> -- (tracker.template ForwardInput(i),std::forward<O>(o),std::forward<C>(c),std::forward<B>(b))); -+ (tracker.template ForwardInput<I>(i),std::forward<O>(o),std::forward<C>(c),std::forward<B>(b))); - } - else if constexpr(code & Flag_TrackOut) - { - //fprintf(stderr, "out track flag\n"); - SizeTracker<DeflateTrackOutSize> tracker; - return tracker(Gunzip<code & Flag_NoTrackFlagMask> -- (std::forward<I>(i), tracker.template ForwardOutput(o), tracker.template ForwardWindow(c), std::forward<B>(b))); -+ (std::forward<I>(i), tracker.template ForwardOutput<O>(o), tracker.template ForwardWindow<C>(c), std::forward<B>(b))); - } - else - {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202501111022.50BAMKtc028927>