devel/catch: fix build with clang 21, take 2
Move the separate patches into patch-clang21, as requested by the
maintainer.
PR: 293446
Approved by: sunpoet (maintainer)
MFH: 2026Q1
(cherry picked from commit 9c2cb42fd6cfda42888e61feb6e287661125edcc)