From nobody Wed Jan 3 18:32:48 2024 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 4T4yy83THYz56R6m; Wed, 3 Jan 2024 18:32:48 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T4yy82wBTz41Zw; Wed, 3 Jan 2024 18:32:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704306768; 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=QEH2wBQv93+9w22/KP7ka26s5PROes3pV3hS53jml7A=; b=J5O1oMo6CHdhdWA0zCaWdVi4NSHk1gEBZX0pQ5+192Ig9Xb/xwuUrpPUN9aVHTpqr8pLsz Anb1AXkX1CKHhoUkLz1Y3AOwBVWXCSlEttyRJ99HQulQFRj9o8HvV/5jWpNdeJzc6EQ3Oq n79SmPQ/dVp1xq4/MQRhqMngekW+K7ho/vJoWEAEtBb71FcyAKn0TgLoI9RPyxFTBNbZ5T uZOAIuoUDxHC7CEs1K10i6eqAnJN8+5wT3khlXZXh5y7hHeY43KcYst+7KWu/fhcz/Mb8D cuayzuwGwxLG7SCumB5i9rwXmJP7wX4deoJGTh413S1mxGstCDZlOoatNEXU8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704306768; 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=QEH2wBQv93+9w22/KP7ka26s5PROes3pV3hS53jml7A=; b=MeTSEMDQsspY6zoc+RxIF9O9mIcVLA567gS+6ZZQ9KxgSRJc53st8iaWrkxPtaBaq9/Dj7 AoeSNtYMv0C+1+mmQKMi/QVDYFY6ArssIEeJngxJpw3FM1ltIxoTwkZP0XxjrGMBI+zHaF BSY69bNyc4fWhQIxLvbTWXdZTE2fpTSu/qQdUjB8OH0jGZUoYqk92VFGrAtsrQU2Jtudiy eQgwDtPhk2f2xWDlkt1HkDjCKBrj8rEqSYfWXm2NKH6IDUhvtl5UyDfT2dVKhVWRL6KhHl m6naR9DleD3lxPZsV8JsYrwBe+bPCUZgbT0YdG5MzG5pARxR4Yujc19Tv3n1ig== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704306768; a=rsa-sha256; cv=none; b=gGj0A2JN5pgdcmHvbuKEiMA+zH0aykpQ+lXvgBJT75Q1VYZ2cKbF6iuoEJws/qoFFwBVV6 a3qbTFYqJ8fFz2c6uyuXCZujNtfmZICNU9NnCslrXbRZXINr6MJA4VqhKsV3Zn7oVB092I vGKbtQF4sBpMP/jW1IY0XVRZu3bZSCOMIj8GJe0a/jzZYtJSSqJ3ryQ0FW97modj4Xgaf0 KZKzaX+WQCi2cB5u7389dK4XY7++YMkBkmnpGTR/YBvi9vnfCpw7ogKjUH+zUwEfUbufDU iX1l2vX/iCc3qG4rU72hjgJU8sVtNtMVCYAtxRTHUF7iMhwrv8mGBKVpbI4+Yg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T4yy8208FzwFb; Wed, 3 Jan 2024 18:32:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 403IWmwE018632; Wed, 3 Jan 2024 18:32:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 403IWmhq018629; Wed, 3 Jan 2024 18:32:48 GMT (envelope-from git) Date: Wed, 3 Jan 2024 18:32:48 GMT Message-Id: <202401031832.403IWmhq018629@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Vladimir Druzenko Subject: git: 5aa409bdca62 - 2023Q4 - graphics/xpdf4: fix build if qt6 installed 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: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vvd X-Git-Repository: ports X-Git-Refname: refs/heads/2023Q4 X-Git-Reftype: branch X-Git-Commit: 5aa409bdca62c5f51c8ed93c4a460c310144b5e5 Auto-Submitted: auto-generated The branch 2023Q4 has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=5aa409bdca62c5f51c8ed93c4a460c310144b5e5 commit 5aa409bdca62c5f51c8ed93c4a460c310144b5e5 Author: Vladimir Druzenko AuthorDate: 2024-01-03 18:13:50 +0000 Commit: Vladimir Druzenko CommitDate: 2024-01-03 18:32:42 +0000 graphics/xpdf4: fix build if qt6 installed Temporary workaround with turn off qt6 search before upstream fixed qt6 support. Upstream aimed this in 4.05: https://forum.xpdfreader.com/viewtopic.php?t=42395 Approved by: tcberner (mentor) Differential Revision: https://reviews.freebsd.org/D43295 MFH: 2024Q1 (cherry picked from commit d5acaf996c060ddc8df93e73010c811256110de9) --- graphics/xpdf4/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/graphics/xpdf4/Makefile b/graphics/xpdf4/Makefile index bce6bcc40823..f2869e83332f 100644 --- a/graphics/xpdf4/Makefile +++ b/graphics/xpdf4/Makefile @@ -34,7 +34,8 @@ CMAKE_ARGS+= -DOPI_SUPPORT:BOOL=ON -DCMAKE_DISABLE_FIND_PACKAGE_Qt4:BOOL=ON \ -DCMAKE_INSTALL_BINDIR=${PREFIX}/libexec/xpdf \ -DCMAKE_INSTALL_MANDIR=${PREFIX}/share/xpdf/man \ -DNO_TEXT_SELECT:BOOL=OFF \ - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Widgets:BOOL=FALSE + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Widgets:BOOL=FALSE \ + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Widgets:BOOL=ON CPE_VENDOR= xpdfreader PLIST_SUB= DESKTOPDIR="${DESKTOPDIR}"