From nobody Sun Jan 15 21:05:25 2023 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 4Nw73B0wM9z2sdjn; Sun, 15 Jan 2023 21:05:26 +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 4Nw73B0Kbvz41rv; Sun, 15 Jan 2023 21:05:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673816726; 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=L9kp51rZ8SzSRKIcMIRnbChymNjJiA/2hZRO6TCB6Xs=; b=sa26Tw4ROu4eo+T3/IqsS4yijpWzgU0D8Tako2DB7Ph+Gs3H4Xz9ZW4wyZF1vtODQarjXs wYGHdhUzuupnp88HCkc1X/Py/rdquHEJywWZZYXWWi3kfVcl7Z6pL5/TphF/8VUWEyp91A 02WzzkxfPvm/YnCPgIsIwAg1rFv94KJyrchpG8FQt/f7rHJDmd5ai3k4GsoVpnHxPqXbvl QX9lA1/skvjNwGsjdloNFZjCY6L9xshxUI6i5dOkG8fE5nj60BKCpnDZCqiQ+ht16Rd/xy v0qZfrsSa/QT8ow8l2Ra3I8r7PlqlX0y0eZLzQFD1ePnlsZ7Bsc70ipBMvo42Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673816726; 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=L9kp51rZ8SzSRKIcMIRnbChymNjJiA/2hZRO6TCB6Xs=; b=mplhvoHr3I4GNHAcfI9eyPyrkEF+XrrDrXhdyrnDy4cRkW1qtqnTBLqmsGofrzQF0E22Cj Rgh9cStG11MI67U//kGGR4d8rpmigPZLaWfYlANvbK4S/RV5mE0cUZbFcGDjGNXa0nYFaA 9AKwf47YCw2xaprcf1Rl8Vd0A9GP4QWp4iPRByc76cclPgnuJVuX6uIL2VEnxXNLxOfS6i Ntt9FIKDUTGb1sLhpZnZyHuZYPuKGdnJVv2W62Yh5sdfwT1UCZMoW+tcRTo/E+xiNhCaD/ pWH3zuOLu+4xI16ZRnIY5G99g5x+ChRDrv/wG1UVoSHWNPMj9xQuSh/DbQdMMA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1673816726; a=rsa-sha256; cv=none; b=EeaRdkRjaB6j8citsCRmtP+8P0B+mcx5vzL6iL3MEmYKIjj8+b7BFZF5mMoCnVOvgPeU8o vCp4b/iZXQdutaMsxb08o6C5BbV2HEws4uCeFyIBSO6EewbvzlwpXv6k6ekhVeTQKK6OQf eBvRPzvWdJeUN658B6+9SXa40QZqjFaYipWDKnKBL0Pd2Db2iXVPWsf9DUGRRULG7SEnnS pTY4YL1ryqy4Yswf8C2MNg1bl1Mu+dX3SSUV9Mb6ZnU34AqDIpvFb2WcaVXvzNor+rFUjN +0r6Gawi37nIAQjJNSc9CHqZzecEXyFZSXmcpVUpXwRURhinm2B1LSqfb0lnLg== 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 4Nw7396SjGzhZ6; Sun, 15 Jan 2023 21:05:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 30FL5Pac045778; Sun, 15 Jan 2023 21:05:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30FL5PVk045777; Sun, 15 Jan 2023 21:05:25 GMT (envelope-from git) Date: Sun, 15 Jan 2023 21:05:25 GMT Message-Id: <202301152105.30FL5PVk045777@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Guido Falsi Subject: git: 6d8e63c53f12 - main - editors/ghostwriter: Add flavors for qt version 5 and 6. 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: madpilot X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6d8e63c53f121527898f3228fdecdc72a57022e3 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by madpilot: URL: https://cgit.FreeBSD.org/ports/commit/?id=6d8e63c53f121527898f3228fdecdc72a57022e3 commit 6d8e63c53f121527898f3228fdecdc72a57022e3 Author: Guido Falsi AuthorDate: 2023-01-15 21:04:24 +0000 Commit: Guido Falsi CommitDate: 2023-01-15 21:05:21 +0000 editors/ghostwriter: Add flavors for qt version 5 and 6. --- editors/ghostwriter/Makefile | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/editors/ghostwriter/Makefile b/editors/ghostwriter/Makefile index 7879f9e05178..afdc9ef9ed74 100644 --- a/editors/ghostwriter/Makefile +++ b/editors/ghostwriter/Makefile @@ -11,9 +11,25 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libhunspell-1.7.so:textproc/hunspell -USES= compiler:c++11-lang desktop-file-utils kde:5 pkgconfig qmake qt:5 -USE_QT= core gui svg webchannel webengine widgets buildtools:build \ - linguisttools:build +FLAVORS= qt5 qt6 +FLAVOR?= ${FLAVORS:[0]} +qt5_PKGNAMESUFFIX= +qt6_PKGNAMESUFFIX= -qt6 +qt5_CONFLICTS_INSTALL= ${PORTNAME}-qt6 +qt6_CONFLICTS_INSTALL= ${PORTNAME} + +USES= compiler:c++11-lang desktop-file-utils kde:5 pkgconfig qmake + +.if ${FLAVOR} == qt5 +USES+= qt:5 +USE_QT= buildtools:build core gui linguisttools:build svg \ + webchannel webengine widgets +RCCREGEXP= \/lib\/qt5\/bin\/rcc +.else +USES+= qt:6 +USE_QT= 5compat base svg tools webchannel webengine +RCCREGEXP= \/libexec\/qt6\/rcc +.endif # cf. PR 224488 LDFLAGS+= -Wl,--as-needed @@ -23,7 +39,7 @@ KDE_INVENT= 151268bcfdca57bba4944caa7172dde9549f0622 office post-configure: @${REINPLACE_CMD} -e 's|^\(build/release/qrc_QtAwesomeFree.cpp:[^\\]*\)\\|\1|' \ -e '/3rdparty\/QtAwesome\/fonts\/Font/d' \ - -e '/\/lib\/qt5\/bin\/rcc \\/d' \ + -e '/${RCCREGEXP} \\/d' \ ${WRKSRC}/Makefile .include