From nobody Mon Mar 30 00:47:52 2026 X-Original-To: dev-commits-ports-all@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 4fkXfQ2029z6Xlsw for ; Mon, 30 Mar 2026 00:47:58 +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 4fkXfQ1BV6z3Lr3 for ; Mon, 30 Mar 2026 00:47:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774831678; 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=mw1JQs4CN3DbAquE7C3zIj3Xzgl+D3V6UU3m9/9gEtbOytPd/hPjGmf/W9dhS5cgsrtDcB U71G6I6yFtUc6sLmNE8seoRdzQGrkfRUpvkzInPRbDuMVWX3OV/YzEAnVb3ZE0lQHlNRNI fYc2+W93MT1lj75iOHBe7xk0WwG0ptpXjK1DpBYeXRITf97t80kDCTXgerV9Xb63uMDUmu EIZGqPDpjMY1Bm3B8XP8X24PUAEkTzr1fqpmz2ZT4O/HygnyopVWn79r6Mk1723Q1se8Zv 1HBZx+dxbFZ0pUtD3fsNub+HutneEEpc3nZSGfYRHc4OgxRd26RS6Hnm7N/pEA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774831678; a=rsa-sha256; cv=none; b=uKbcwFFqSSInblPqER/CueXd86Om8AEZDLWbgpDyV1GR9GL5p1GvwX+e3fOOFHZxp4w0jj z44evKdh0UiFBys3SvdlvDrr7uMoUCnVYYNH36f3UDl+kuhW8+UAaHLEFrk3tuHjVbQ+YO xdyDIwxThE6yjLfI+JVuygbtkBEuT09pI2YbILivlI5j21BdlP1ESzN/2SJ4HQhdJSBy8y YIFfZH7iRD6h/jWiyQN3f6G3ZJ4424V39Yx6R+0Pr9P1d6faRtKBx0Pqd+6fAhClP9xTiL U0/v5Q3/b/f1p/iwqYj/jyGj4f75efRP2Kqg6QiAgPmQudMNYO/0z8p4LKTOGw== 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=1774831678; 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=sDli6ypU3kM4ZDKzcVHQ15pc4y3bKJl2ssoQWnslHfUgOSe8u7TU8A+xjZOkFffjoDJPuU 8TeNPhiW6QylggJfKO/gGfv+9EC6DXxhRKM5MiGL5aZyww7ZOcaAF/IepVf5aF8/QSs9hP KLqAAjQ34kZldPFHueX2FpOpT6BCNJb09+nwxNByKzurUc8m+xHLwfAQ6bkjbafRrq/YTe FacFcHixGkk16vdbXUEo0MG9lSvnZypkIy7YeknCTQZg6HGyVD5ezVTxR4Jgv4K7sCHwM7 tgMB+kAUVrFbwg8Yvl3uxJAQpF3N7SetYfAJsjuslwznIi5dL4/XEcxJmgt9Yg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fkXfQ0n6Tz4v3 for ; Mon, 30 Mar 2026 00:47:58 +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: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@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