From nobody Sun Jan 15 23:46:57 2023 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 4NwBdZ74PJz2t0P0; Sun, 15 Jan 2023 23:46:58 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4NwBdZ6ZC8z4G0p; Sun, 15 Jan 2023 23:46:58 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673826418; 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: in-reply-to:in-reply-to:references:references; bh=VQla8CE7MA3xUd8freRglQMkEmZOGInpDAUj3pOTWA4=; b=JMAM5fk3gLOm+rZbSBTSz3z0+rReM6X6wwMX2YzM1yWqJNGY4WD7ycwrnEPbxhqCsz8Cmd w3KVa5Vb0iSf7z0ND7buZGEje/BsU5p38/z4VWmKxkYprns1BRu8vp5yxONiFDG+XAA6Tt ouiZrWkxLWnnvBCgWPR3HibIygMmWlMkGn9a053BdCTsZEOSCqXQI9ptQqD7QXIyvon2aD ceYULJUXkdsuhCB+EjcMBkD06+d4KS2lSShF6bbMiD6E/leMfmQWk93le/dIEYE7W7z5Zp zgcEZZZuktpH8N1d8ij7ADoYXS3wW4gH7X/haPicriNCv6narnbQZWvO1mKOUg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673826418; 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: in-reply-to:in-reply-to:references:references; bh=VQla8CE7MA3xUd8freRglQMkEmZOGInpDAUj3pOTWA4=; b=dYy9FIV1+Y/8qfb4Fe29A9WOBrr7BUamirxYVDNkNeOIYBwjn33tRLTbMrNMgpmsSSKPTv 6GgAUrxQcqweSM6okpWEzJaPdpAit40nL9cyIQfihxAF2Tuk55vOWX08MiCcHdZ0OWcYy4 PJ8J7mb9qZgPk+4xJtGE6PVKMuyNYn6+ovBJvvFAsUy0SMB/BKOA17SS7wKlRTskPilUFv 2QdlozkcEHEdvV+XHaiKVB+FtXYtQGV9fL5zA5lwFoz8pbtEaJPQpWMeKNMpP5K4Mn95+U zgJenxXeFM9TJRqR0FPzahtMaDb85prLn5GtYrNA95JI71O8TidpuBtJ30cXrA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1673826418; a=rsa-sha256; cv=none; b=csUYy6pKRGppXdn83ocmyIn9hGH6NkkuUKKZ9y6i90as28ZQXgbP046DqU4SNvQaA8urFF pH4vA0fsfGPwuTb/67L7G/2ncdMwe/Ay9c9dq3hkh2fuNG8BgnHIW1N+5LRmEC68hFHLY3 1BibL44WowyaZEPjLsJ39xzYlSTZTrhLAcLkS2zg0ohc3G5MsSuTvkzbZFHirX7RVdKnEY CrlyMGcEryuBTpJ0N3kNW6KuL6HopeFqyeoz2pkCWX2tiSypmwiwPOnpppSOhPODyidp5f u96cRdW2akFkzgHpq+WjOMyUf3/sodhzG+uPZ/e1k9D69K7lDLJHtjMYbhPM+g== Received: from [172.24.42.21] (host-82-49-66-164.retail.telecomitalia.it [82.49.66.164]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (Client did not present a certificate) (Authenticated sender: madpilot/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4NwBdZ1YRGz16hQ; Sun, 15 Jan 2023 23:46:58 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Message-ID: <04494f1b-1594-c17f-4be8-fe6aec22b58e@FreeBSD.org> Date: Mon, 16 Jan 2023 00:46:57 +0100 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:102.0) Gecko/20100101 Thunderbird/102.6.1 Subject: Re: git: 6d8e63c53f12 - main - editors/ghostwriter: Add flavors for qt version 5 and 6. Content-Language: en-US From: Guido Falsi To: Dan Langille , ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org References: <202301152105.30FL5PVk045777@gitrepo.freebsd.org> <06f05b0c-2c75-4b7a-a3cb-01cc08b0927b@app.fastmail.com> <29d824fc-7923-28e0-04f3-69167a8830b5@FreeBSD.org> In-Reply-To: <29d824fc-7923-28e0-04f3-69167a8830b5@FreeBSD.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-ThisMailContainsUnwantedMimeParts: N On 16/01/23 00:34, Guido Falsi wrote: > On 16/01/23 00:10, Guido Falsi wrote: >> On 16/01/23 00:04, Dan Langille wrote: >>> On Sun, Jan 15, 2023, at 4:05 PM, Guido Falsi wrote: >>>> 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 >>> >>> This commit seems to have upset something: >> >> Hi, yes this happened to me too and I'm trying to figure out what I >> did wrong. >> >> I'll back it out if I can't figure out what the problem is, but I'd >> like to try to fix it before doing that, just give me a little time. >> > > Fixed in dafb3cafaf774e89c3ebd1500ce56fba5665da02 > > What caused the issue was the line FLAVOR?=${FLAVORS:[0]} Sorry, I now see my mistake. I got confused about how this makefile syntax works. Sorry again for the trouble I caused! -- Guido Falsi