Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 30 Mar 2026 00:47:52 +0000
From:      Dima Panov <fluffy@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 4b905b3655be - main - graphics/colmap: prevent to find Qt5 components if they coexist with Qt6
Message-ID:  <69c9c838.184b4.a7db5e5@gitrepo.freebsd.org>

index | next in thread | raw e-mail

The branch main has been updated by fluffy:

URL: https://cgit.FreeBSD.org/ports/commit/?id=4b905b3655be2d66f0ad9fbb3ce15eef3f070477

commit 4b905b3655be2d66f0ad9fbb3ce15eef3f070477
Author:     Dima Panov <fluffy@FreeBSD.org>
AuthorDate: 2026-03-30 00:46:05 +0000
Commit:     Dima Panov <fluffy@FreeBSD.org>
CommitDate: 2026-03-30 00:46:05 +0000

    graphics/colmap: prevent to find Qt5 components if they coexist with Qt6
    
    Reported by:    bulk -t
    Approved by:    portmgr blanket
---
 graphics/colmap/Makefile | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/graphics/colmap/Makefile b/graphics/colmap/Makefile
index d2b479e5c65a..3a643c38ab2b 100644
--- a/graphics/colmap/Makefile
+++ b/graphics/colmap/Makefile
@@ -62,6 +62,10 @@ SIMD_CMAKE_BOOL=	SIMD_ENABLED
 SIMD_CFLAGS_i386=	-msse2
 SIMD_CFLAGS=		${SIMD_CFLAGS_${ARCH}}
 
+post-patch:
+	@${REINPLACE_CMD} -e '/find_package/s|Qt5 Qt6|Qt6|' \
+		${WRKSRC}/cmake/FindDependencies.cmake
+
 post-build-DOCS-on:
 	${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${GMAKE} ${_MAKE_JOBS} -C ${WRKSRC}/doc html
 


home | help

Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69c9c838.184b4.a7db5e5>