From nobody Sun Jan 15 23:34:48 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 4NwBMZ72YQz2sxln; Sun, 15 Jan 2023 23:34:50 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 4NwBMZ6Xs8z4FbP; Sun, 15 Jan 2023 23:34:50 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673825690; 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=m5A/ONC7bRuZRB2rjNiTb95XsRm4J7jW1ffnmazGJsM=; b=eXq4xfmrwkEqUPnBnUCeOe3p9n6kE+OcTiWnWAVK5XuHzyaJ8QKSugTCEC7R2TDJ4G6z95 ez+aTMUbTxxC/ZkDyNpJHWBe8p3tcD0ct2HODT0qhCV2fKKq35MDGpYo0eLWA03XibBOXf SJwgMuKdD5HgPPRVQR4oc+xJ5abX3UWIgdgY7QZ/69CfP73Etxs9ILyeI1xNYrRlUcXvm/ Phlq8SlTg58USomhytGxELOBdGAb+l1d9Ija1TokAWvdu4gcGSynod/WMW5A4kZHOQNJuR DdxK/jkdm0H5hrpcROxzqDcHvuFd44wSX3CjPo+x5CCgsl9ilSHbQkaSPc1ppg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673825690; 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=m5A/ONC7bRuZRB2rjNiTb95XsRm4J7jW1ffnmazGJsM=; b=Jqxq7J3irUzeaPN3YV9FpEAh3Z2JhgRMesE9axNVG2NYq5y0hqV5EBAh9ppN3Zp1qKw3q3 QlLwSOn7hh+gRjpvt7qyFTfNw+8XEmHrnXtO0dqL7tY4xJsLFynYB77iZdcOVnxsR67c4b syeoAglgXymx+s+Bu4gYpm3cIfLfez4ywPyN/sIEFD6LKtHU90I1oFFSInrH2Y6sqf+KC2 OsMYH2efEcbu9w/ywfMX66+WXlIUsOOiFXIfMyQ3KM7cz0NVGWK8xVQCo302o8z2Lps+yk vpfadeTF4q3DhRXYLlVpcy9FuINYgqW2TvnPMWeeHWvtaPKJFEx9eRep08BtaA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1673825690; a=rsa-sha256; cv=none; b=hvjb9y5fsOcsDX2TZCsJEVNMY9ydEILHPONrFWCnq/14XXt5rrUgADRtMkJfmDTm7SvteZ VpQbwctm65xNP7u9jUcY2/JrmD7tXxihInfS0dg9rmFAabkRo/udT+KANXX2ckrhD4YFkP nVDlUG+maWwlN3gUvYlPKqqbPfe0ARk8ojLcW8h9U7L46VVj70S5Vft9llqjUo3Z/jMBpi a1+M7Q/tFK7n4BmNFpiVD1zVyFPQt4ib/aqGqIhfExUPNOBy/fUhwsS3Z2jP5+IkW0PKMA Qg1jmS/XFTUKH8g1SExP7aES4JzSZIm1V0X7P4NcqKANZJ85982mJDBn87l/WA== 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) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: madpilot/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4NwBMZ1XK8z17v4; Sun, 15 Jan 2023 23:34:50 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Message-ID: <29d824fc-7923-28e0-04f3-69167a8830b5@FreeBSD.org> Date: Mon, 16 Jan 2023 00:34:48 +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> In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-ThisMailContainsUnwantedMimeParts: N 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]} Interesting thing is, using FLAVOR?=${FLAVORS:[1]} works just fine. I originally tested the port like this, but thought that changing the 1 to a 0 was a completely safe change. I was clearly mistaken. I also now noticed many ports use FLAVOR?=flavorname directly, I guess to avoid this issue. So I'm now doing the same. Sorry for having caused trouble! -- Guido Falsi