From nobody Mon Mar 30 00:47:52 2026 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fkXfK0M7Gz6XlZj for ; Mon, 30 Mar 2026 00:47:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fkXfJ6zvHz3LgC for ; Mon, 30 Mar 2026 00:47:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774831673; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wrZdQj2SeubfA6vAs9HW+ghifSxG5pi56+HRLyyDw00=; b=vAAPLit+ezGjYxW98Qcd9xyQUEgE/NP04SAScawubCshj7OAAVsh+/wzVY1Kx93hN7Ro2e dxVqkJOsZAOwtf1JzpZdWuvg8oKhfJlvDIosyJST9OW54L6alYLh2AagrBhq8h/kDIAads wLGwQ/z48bUKEAawQOWNJj3D1NcxSt6D+0HbW95bo4hptWUzR5pkDpmqjD2vfTQ23JoazB iZheh3LlxXNoaU30fJ/CvCPm7CNDF40ApcG7HYf6pWfTOLMqyAbM7sAAJlxh8Ygya0uFol G4OWyMt7gHvFIxauVWg873TbNF4RD0XNA7hm2lcfCZroMqqJAqREHbe6YrZ3YQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774831673; a=rsa-sha256; cv=none; b=mKKCwkOlP5UwOlHyl1KRGUuLl0MM/fLZRIbnJDvULTeJQdax0JxrpXy2sA9tt754ZZgioG QTeiISpRNr/JifCtHVGZDa8cKsgIO99Boc+y3I6SVqwCRyLBFSSbwpFmQD7BUsKGtai722 EvgQuASiXdQhP6cLVoYRgVXJPZZOicIC8z2SzVimVkWrIdidQfSlG3xGVjMb13Yq2vKgdt 9qoNKOVL94hI1eA7DG93wsM7l/k16EuGEKL8KS28Fbflg+48xthiXhapUsvQ/2LSaNcLzA 9s/Iccu+GBWEC+1kFvrSZnmPaUB3MXrqXsVf/nXzRPKtFjbpspdzjlJAvpWe5Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774831673; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wrZdQj2SeubfA6vAs9HW+ghifSxG5pi56+HRLyyDw00=; b=eg/cU4PQD5TF0fJH1wHL3/Zv9CSi49BcHpB5chT8FCzVhAO+Mix2j0gFw2ODSsDabTxodg QxCm/SomBgz2a5jXJyW9riaewtx3CJ0tt+hmva8prspj8o2AkronhMNN3aINT0kvLeSQ7J 4rBBDhk6LCy7Fva2NyxdyjsQHKI9oSo3SsSKSOCKoBTdj4trHtCPBgD+xhnbly5KOSVodh rnl6mGSmvAhZkbliFUK7LkSaiXFD+crKGTXj9zPqvsZnm0ti9Fn7gu+ndTnDo3Gway75P4 SisR1VjB7uXjz5uPpdyCgqDQ7Ey+ogf2hmzpwyr2OUZPxOriNsA7YodtJRE24g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fkXfJ6Zg0z4lw for ; Mon, 30 Mar 2026 00:47:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 184b4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 30 Mar 2026 00:47:52 +0000 To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dima Panov Subject: git: 4b905b3655be - main - graphics/colmap: prevent to find Qt5 components if they coexist with Qt6 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fluffy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4b905b3655be2d66f0ad9fbb3ce15eef3f070477 Auto-Submitted: auto-generated Date: Mon, 30 Mar 2026 00:47:52 +0000 Message-Id: <69c9c838.184b4.a7db5e5@gitrepo.freebsd.org> The branch main has been updated by fluffy: URL: https://cgit.FreeBSD.org/ports/commit/?id=4b905b3655be2d66f0ad9fbb3ce15eef3f070477 commit 4b905b3655be2d66f0ad9fbb3ce15eef3f070477 Author: Dima Panov AuthorDate: 2026-03-30 00:46:05 +0000 Commit: Dima Panov 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