summaryrefslogtreecommitdiff
path: root/graphics/clang-uml
diff options
context:
space:
mode:
Diffstat (limited to 'graphics/clang-uml')
-rw-r--r--graphics/clang-uml/Makefile23
-rw-r--r--graphics/clang-uml/distinfo6
-rw-r--r--graphics/clang-uml/files/patch-src_common_clang__utils.cc10
3 files changed, 28 insertions, 11 deletions
diff --git a/graphics/clang-uml/Makefile b/graphics/clang-uml/Makefile
index 783c7d7f6f16..9175e72d4030 100644
--- a/graphics/clang-uml/Makefile
+++ b/graphics/clang-uml/Makefile
@@ -1,5 +1,5 @@
PORTNAME= clang-uml
-PORTVERSION= 0.6.1
+PORTVERSION= 0.6.2
CATEGORIES= graphics lang textproc
MAINTAINER= arrowd@FreeBSD.org
@@ -11,12 +11,29 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.md
LIB_DEPENDS= libyaml-cpp.so:devel/yaml-cpp
-USES= cmake compiler:c++17-lang llvm:noexport,lib localbase:ldflags
+USES= cmake:testing compiler:c++17-lang llvm:noexport,lib \
+ localbase:ldflags
-CMAKE_ARGS+= -DCLANG_UML_ENABLE_BACKTRACE=OFF \
+CMAKE_ARGS= -DCLANG_UML_ENABLE_BACKTRACE=OFF \
-DBUILD_TESTS=OFF
+CMAKE_TESTING_ON=BUILD_TESTS
USE_GITHUB= yes
GH_ACCOUNT= bkryza
+BUILD_WRKSRC_TESTS= ${BUILD_WRKSRC}/tests
+TESTING_UNSAFE= some tests fail
+
+pre-test:
+ @if [ "${BUILD_WRKSRC_TESTS:H:H}" != "${WRKDIR}" ]; then \
+ ${ECHO_CMD} This software expects tests data to be located at \
+ ../../tests relative to ;\
+ ${ECHO_CMD} ${BUILD_WRKSRC_TESTS} ;\
+ ${ECHO_CMD} but this path is outside of ;\
+ ${ECHO_CMD} ${WRKDIR}; \
+ ${FALSE}; \
+ fi
+ ${RM} ${WRKDIR}/tests
+ ${LN} -s ${WRKSRC}/tests ${WRKDIR}/tests
+
.include <bsd.port.mk>
diff --git a/graphics/clang-uml/distinfo b/graphics/clang-uml/distinfo
index 8eac317b1ec0..ef2a3bdc27fb 100644
--- a/graphics/clang-uml/distinfo
+++ b/graphics/clang-uml/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1741688300
-SHA256 (bkryza-clang-uml-0.6.1_GH0.tar.gz) = a64c3cae87a282be207e4c5faf47534dca21b06cb6f463bb7b04de979dccf17e
-SIZE (bkryza-clang-uml-0.6.1_GH0.tar.gz) = 3059231
+TIMESTAMP = 1751468522
+SHA256 (bkryza-clang-uml-0.6.2_GH0.tar.gz) = 004540c328699f81abebceb33a4661b548ab3a5f74096da2c025b9971b2b17ff
+SIZE (bkryza-clang-uml-0.6.2_GH0.tar.gz) = 3100641
diff --git a/graphics/clang-uml/files/patch-src_common_clang__utils.cc b/graphics/clang-uml/files/patch-src_common_clang__utils.cc
index 81f081831420..193f4ccfec7f 100644
--- a/graphics/clang-uml/files/patch-src_common_clang__utils.cc
+++ b/graphics/clang-uml/files/patch-src_common_clang__utils.cc
@@ -1,11 +1,11 @@
---- src/common/clang_utils.cc.orig 2025-01-20 07:36:53 UTC
+--- src/common/clang_utils.cc.orig 2025-06-29 11:26:26 UTC
+++ src/common/clang_utils.cc
-@@ -1019,7 +1019,7 @@ clang::RawComment *get_raw_comment(const clang::Source
+@@ -1023,7 +1023,7 @@ clang::RawComment *get_raw_comment(const clang::Source
+ const auto *comments = context.Comments.getCommentsInFile(file_id);
- if (!context.Comments.empty() &&
- context.Comments.getCommentsInFile(file_id) != nullptr) {
+ if (has_comments && comments != nullptr) {
- for (const auto [offset, raw_comment] :
+ for (const auto & [offset, raw_comment] :
*context.Comments.getCommentsInFile(sm.getFileID(expr_begin))) {
- const auto comment_end_line = sm.getSpellingLineNumber(
+ const auto comment_end_line = sm.getExpansionLineNumber(
raw_comment->getSourceRange().getEnd());