Index | Thread | Search

From:
Stuart Henderson <stu@spacehopper.org>
Subject:
Re: quazip-qt6-1.4(archivers/quazip,qt6)
To:
Rafael Sadowski <rafael@sizeofvoid.org>
Cc:
ports <ports@openbsd.org>, Brian Callahan <bcallah@openbsd.org>
Date:
Sun, 30 Jun 2024 13:00:58 +0100

Download raw body.

Thread
Ah, missed that. I would suggest moving the various PKGNAME-related 
variables up near the top of the file where they are normally placed. You 
will still need to bump REVISION.

-- 
  Sent from a phone, apologies for poor formatting.

On 30 June 2024 12:26:34 Rafael Sadowski <rafael@sizeofvoid.org> wrote:

> On Sun Jun 30, 2024 at 12:10:49PM GMT, Stuart Henderson wrote:
>> This will break updates - you don't provide a path for updates from the old
>> quazip-qt5-$V PKGNAME to the new quazip-$V, are missing a REVISION bump to
>> take the version number higher than the previous, and don't have conflict
>> markers.
>
> Where do you see new "quazip-$V"? Current quazip-qt5-1.4 will not
> change. IMO there is not even a reason for a bump because the current
> package will not change.
>
>>
>> --
>>  Sent from a phone, apologies for poor formatting.
>>
>> On 30 June 2024 11:48:21 Rafael Sadowski <rafael@sizeofvoid.org> wrote:
>>
>> > Add qt6 flavor to quazip.
>> >
>> > I know there are other ways to do this, but I followed the path that
>> > worked well for the other Qt6 FLAVORS.
>> >
>> > OK?
>> >
>> > Index: Makefile
>> > ===================================================================
>> > RCS file: /cvs/ports/archivers/quazip/Makefile,v
>> > diff -u -p -r1.22 Makefile
>> > --- Makefile	6 Sep 2023 13:18:43 -0000	1.22
>> > +++ Makefile	30 Jun 2024 10:45:30 -0000
>> > @@ -1,26 +1,41 @@
>> > COMMENT =	Qt/C++ wrapper for ZIP/UNZIP package
>> > CATEGORIES =	archivers
>> >
>> > +V =		1.4
>> > GH_ACCOUNT =	stachenov
>> > GH_PROJECT =	quazip
>> > -V =		1.4
>> > GH_TAGNAME =	v$V
>> > -PKGNAME =	quazip-qt5-$V
>> >
>
> ... moved below
>
>> > -			-DQUAZIP_QT_MAJOR_VERSION=5
>> > +.if ${FLAVOR:Mqt6}
>> > +FULLPKGNAME=	quazip-qt6-${V}
>> > +PKGNAME =	quazip-qt6-$V
>> > +WANTLIB += ${COMPILER_LIBCXX} Qt6Core Qt6Core5Compat bz2 m z
>> > +MODULES +=	x11/qt6
>> > +LIB_DEPENDS +=	x11/qt6/qt5compat
>> > +CONFIGURE_ARGS +=	-DQUAZIP_QT_MAJOR_VERSION=6
>> > +.else
>> > +PKGNAME =	quazip-qt5-$V
>
> PKGNAME not changed for the current qt port