From nobody Wed Jan 3 18:27:08 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 4T4yqd235Mz56QQy; Wed, 3 Jan 2024 18:27:09 +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 4T4yqd1Pqfz416x; Wed, 3 Jan 2024 18:27:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704306429; 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=CaY+ysRW5NXAHcFhm5HCzQyTPEroyJt2EjNN/s+L180=; b=fewZ6vPnpBe9aAOcX/cEBPVqWTxWpfLWZ+3PAYXXI9KITq6JGIV4wBAD3McjrWVVkGe2Vz TsU0Dge9W3yYko3RZtF787z5+uTb/zVE7yQ4+GMMz/ugRw3rcTztYxMne9g0ejVM1PMSGd jkmCY4XDS3rHGGaXgOG0QSry6r3rQxL+ccjHJKKVDFNkK7ChjlbMY6m1NlLQBFl+salvqV ovqF8Si3JNYUUipb1rBZjLpkn+Ysb5VPzxYwPwsdL3bJybn2Xw9CW6ubAPrNxTOFQG+ypr vECLDEpj6XBddgp9HzCvkIuljvxHU+e2PUpd3vb2dtixBX8wckT6A2dgvgATYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704306429; 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=CaY+ysRW5NXAHcFhm5HCzQyTPEroyJt2EjNN/s+L180=; b=b1fdjPMhhF3E04KfbzXQOQVnZCLo8I5phnnXlB/ZIW7xqkOJWf6FpLy0KBxonFlCa7oMW9 /ZsnORVFUpH0jGlj2FjhvNKlkmyTXAvJ5p3LxA44oeEsQmI7lEjgB33lTR200qQyDLwmJ4 Af5Or7CkchsgGv7ajOgdCMu618yArcJI2IrgFhDWilCjaFRDS01t0e1AnrTcTmsDVop6Zf oJgRPloKyVS0Lu2YoJMcNN+tBuM3tS1pFRBJtT+rj1I7GJAkYG/XhgvvV8EzfxB7aIy/6r 9ji2c7h2qubTvz698AjHMlkWAjWZgxN5vuNQ177i2mARAq0pM8/waEhssTQv5A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704306429; a=rsa-sha256; cv=none; b=DDRScuxL5WsC39UO4Xvbsf1yAzyShMuKI27lrD8nFb0/An7koIEsNfrBRJ+qNe0EbuVilY 5BmGsGZIv4ta0h27xSGWfJk/ZmJI3XiJo/Wi6LOURDNdqEQUrtJF/6zrYFMuy/amyYlv6q cOyINR2396ixmHyUjD7OmrddF5EVLGZmLUdSP6AJd8nqybT9khO0uq9tyFyoXyXRLXimn3 68BJtUFhso4KqhL1IUahBDVHjMqAIec5hQy6Mk8/URU/8FNKAkVcV4GkPkPS4c7uIndUXK /Fm4xX3I859Vg+FBzrnfj4B7SFy1xOUVoawxn3qiu54K4BgpgAVvsTww7KPyMw== 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 4T4yqd0TbYzwVk; Wed, 3 Jan 2024 18:27:09 +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 403IR8mH002545; Wed, 3 Jan 2024 18:27:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 403IR8Vt002542; Wed, 3 Jan 2024 18:27:08 GMT (envelope-from git) Date: Wed, 3 Jan 2024 18:27:08 GMT Message-Id: <202401031827.403IR8Vt002542@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Vladimir Druzenko Subject: git: d5acaf996c06 - main - 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/main X-Git-Reftype: branch X-Git-Commit: d5acaf996c060ddc8df93e73010c811256110de9 Auto-Submitted: auto-generated The branch main has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=d5acaf996c060ddc8df93e73010c811256110de9 commit d5acaf996c060ddc8df93e73010c811256110de9 Author: Vladimir Druzenko AuthorDate: 2024-01-03 18:13:50 +0000 Commit: Vladimir Druzenko CommitDate: 2024-01-03 18:13:50 +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 --- graphics/xpdf4/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/graphics/xpdf4/Makefile b/graphics/xpdf4/Makefile index b187ce0c907f..2fd44291e957 100644 --- a/graphics/xpdf4/Makefile +++ b/graphics/xpdf4/Makefile @@ -35,7 +35,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}"