Date: Mon, 17 Jul 2023 19:19:41 +0100 From: Nuno Teixeira <eduardo@freebsd.org> To: Adriaan de Groot <adridg@freebsd.org> Cc: ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org, dev-commits-ports-main@freebsd.org Subject: Re: git: 8ba9e3e85bca - main - net-im/quaternion: update to a newer GH commit Message-ID: <CAFDf7UJLnGVU0H4yK4xa5t8ZVv0%2BhCC4cYB2NJc6_zLiodW_gA@mail.gmail.com> In-Reply-To: <202307171439.36HEdl10064013@gitrepo.freebsd.org> References: <202307171439.36HEdl10064013@gitrepo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--000000000000426de40600b2d8dc Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Hello Adriaan, Using port revision to update source is not good, it is used for something added that implies differences during build, e.g., patches, options, dependencies, etc. In this case we still have version 0.0.95.1 but in reality: --- git describe --tags 447d8ec4f990499fb589a37b7e8eae8c6781cadc 0.0.96-beta3-4-g447d8ec --- that is 0.0.96-beta3 version with 4 commits until 447d8ec commit. This means that next release will be 0.0.96. Have you tried "Example 18. Using USE_GITHUB to Access a Commit Between Two Versions" from porters handbook"? I think that DISTVERSION will accept "-beta3-4" and will translate it to PORTVERSION nicely. When it's not possible we can use -gYYYYMMDD too. Further checks goes to `pkg version -t old.version new.version` to see if it is ok and prevent port epoch bump. Examples where I used it, because release is old and no new release is available or because there was some rush in commit (gitup): archivers/maxcso editors/amp net/gitup graphics/phototonic x11/xclip Cheers, Adriaan de Groot <adridg@freebsd.org> escreveu no dia segunda, 17/07/2023 =C3=A0(s) 15:39: > The branch main has been updated by adridg: > > URL: > https://cgit.FreeBSD.org/ports/commit/?id=3D8ba9e3e85bca8ac4b2bb3fcc8ac8c= fada84aa7fa > > commit 8ba9e3e85bca8ac4b2bb3fcc8ac8cfada84aa7fa > Author: Adriaan de Groot <adridg@FreeBSD.org> > AuthorDate: 2023-07-16 21:28:56 +0000 > Commit: Adriaan de Groot <adridg@FreeBSD.org> > CommitDate: 2023-07-17 14:39:44 +0000 > > net-im/quaternion: update to a newer GH commit > > This is so that quaternion can build against latest quaternion. > > Includes work from rakuco@ https://reviews.freebsd.org/D41045 > --- > net-im/quaternion/Makefile | 22 +++++++++++++--------- > net-im/quaternion/distinfo | 6 +++--- > net-im/quaternion/pkg-plist | 3 ++- > 3 files changed, 18 insertions(+), 13 deletions(-) > > diff --git a/net-im/quaternion/Makefile b/net-im/quaternion/Makefile > index 195b4211efb3..bcc9fe46e920 100644 > --- a/net-im/quaternion/Makefile > +++ b/net-im/quaternion/Makefile > @@ -1,29 +1,33 @@ > PORTNAME=3D Quaternion > DISTVERSION=3D 0.0.95.1 > +PORTREVISION=3D 2 > CATEGORIES=3D net-im > > MAINTAINER=3D adridg@FreeBSD.org > COMMENT=3D Matrix IM client based on Qt technologies > WWW=3D https://github.com/quotient-im/Quaternion/ > > -BROKEN=3D No upstream release compatible with libquotient > 0.7 yet > - > -LICENSE=3D GPLv3 > -LICENSE_FILE=3D ${WRKSRC}/COPYING > +LICENSE=3D GPLv3+ > +LICENSE_FILE=3D ${WRKSRC}/LICENSES/GPL-3.0-or-later.txt > > LIB_DEPENDS=3D libqt5keychain.so:security/qtkeychain@qt5 \ > - libsecret-1.so:security/libsecret > -BUILD_DEPENDS=3D libquotient>=3D0.7:net-im/libquotient > + libsecret-1.so:security/libsecret \ > + libolm.so:security/olm > +BUILD_DEPENDS=3D libquotient>=3D0.8:net-im/libquotient > # Quotient is a static lib, doesn't need to be in RUN_DEPENDS > > -USES=3D cmake compiler:c++17-lang gettext-runtime gnome \ > +USES=3D cmake compiler:c++17-lang desktop-file-utils \ > + gettext-runtime gnome \ > localbase:ldflags qt:5 tar:xz > USE_GNOME=3D glib20 > -USE_QT=3D core dbus declarative gui multimedia network > widgets \ > - quickcontrols quickcontrols2 \ > +USE_QT=3D core dbus declarative gui multimedia network \ > + quickcontrols quickcontrols2 sql widgets \ > buildtools:build linguist:build qmake:build > > +CMAKE_OFF=3D BUILD_WITH_QT6 > + > USE_GITHUB=3D yes > GH_ACCOUNT=3D quotient-im > +GH_TAGNAME=3D 447d8ec4f990499fb589a37b7e8eae8c6781cadc > > .include <bsd.port.mk> > diff --git a/net-im/quaternion/distinfo b/net-im/quaternion/distinfo > index 2d654c352d3d..e439dc16d7f2 100644 > --- a/net-im/quaternion/distinfo > +++ b/net-im/quaternion/distinfo > @@ -1,3 +1,3 @@ > -TIMESTAMP =3D 1674504277 > -SHA256 (quotient-im-Quaternion-0.0.95.1_GH0.tar.gz) =3D > 69f034241dddc8d9436a895bb76b022e492e61e2f49d9a80ed8d79ab12b63a0e > -SIZE (quotient-im-Quaternion-0.0.95.1_GH0.tar.gz) =3D 1224589 > +TIMESTAMP =3D 1689544557 > +SHA256 > (quotient-im-Quaternion-0.0.95.1-447d8ec4f990499fb589a37b7e8eae8c6781cadc= _GH0.tar.gz) > =3D 3c7e83987d56dbddb1a7ad947345280f8f399381d7f1129928c5745cf8c58240 > +SIZE > (quotient-im-Quaternion-0.0.95.1-447d8ec4f990499fb589a37b7e8eae8c6781cadc= _GH0.tar.gz) > =3D 1641909 > diff --git a/net-im/quaternion/pkg-plist b/net-im/quaternion/pkg-plist > index 9d3589576b24..a4c7295e9128 100644 > --- a/net-im/quaternion/pkg-plist > +++ b/net-im/quaternion/pkg-plist > @@ -1,5 +1,6 @@ > bin/quaternion > share/Quotient/quaternion/translations/quaternion_de.qm > +share/Quotient/quaternion/translations/quaternion_en.qm > share/Quotient/quaternion/translations/quaternion_en_GB.qm > share/Quotient/quaternion/translations/quaternion_es.qm > share/Quotient/quaternion/translations/quaternion_pl.qm > @@ -11,5 +12,5 @@ share/icons/hicolor/22x22/apps/quaternion.png > share/icons/hicolor/32x32/apps/quaternion.png > share/icons/hicolor/48x48/apps/quaternion.png > share/icons/hicolor/64x64/apps/quaternion.png > -share/icons/hicolor/scalable/apps/quaternion.svgz > +share/icons/hicolor/scalable/apps/quaternion.svg > share/metainfo/com.github.quaternion.appdata.xml > --=20 Nuno Teixeira FreeBSD Committer (ports) --000000000000426de40600b2d8dc Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable <div dir=3D"ltr"><div>Hello Adriaan,</div><div><br></div><div>Using port re= vision to update source is not good, it is used for something added that im= plies differences during build, e.g., patches, options, dependencies, etc.<= /div><div><br></div><div>In this case we still have version 0.0.95.1 but in= reality:<br></div><div>---<br></div><div>git describe --tags 447d8ec4f9904= 99fb589a37b7e8eae8c6781cadc<br>0.0.96-beta3-4-g447d8ec</div><div>---<br></d= iv><div>that is 0.0.96-beta3 version with 4 commits until 447d8ec commit.</= div><div>This means that next release will be 0.0.96.</div><div><br></div><= div>Have you tried "Example 18. Using <code>USE_GITHUB</code> to Acces= s a Commit Between Two Versions" from porters handbook"?<br></div= ><div>I think that DISTVERSION will accept "-beta3-4" and will tr= anslate it to PORTVERSION nicely.</div><div>When it's not possible we c= an use -gYYYYMMDD too.</div><div><br></div><div>Further checks goes to `pkg= version -t old.version new.version` to see if it is ok and prevent port ep= och bump.<br></div><div><br></div><div>Examples where I used it, because re= lease is old and no new release is available or because there was some rush= in commit (gitup):<br></div><div><br></div><div>archivers/maxcso<br>editor= s/amp<br>net/gitup<br>graphics/phototonic<br>x11/xclip</div><div><br></div>= <div>Cheers,<br></div></div><br><div class=3D"gmail_quote"><div dir=3D"ltr"= class=3D"gmail_attr">Adriaan de Groot <<a href=3D"mailto:adridg@freebsd= .org">adridg@freebsd.org</a>> escreveu no dia segunda, 17/07/2023 =C3=A0= (s) 15:39:<br></div><blockquote class=3D"gmail_quote" style=3D"margin:0px 0= px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">The b= ranch main has been updated by adridg:<br> <br> URL: <a href=3D"https://cgit.FreeBSD.org/ports/commit/?id=3D8ba9e3e85bca8ac= 4b2bb3fcc8ac8cfada84aa7fa" rel=3D"noreferrer" target=3D"_blank">https://cgi= t.FreeBSD.org/ports/commit/?id=3D8ba9e3e85bca8ac4b2bb3fcc8ac8cfada84aa7fa</= a><br> <br> commit 8ba9e3e85bca8ac4b2bb3fcc8ac8cfada84aa7fa<br> Author:=C2=A0 =C2=A0 =C2=A0Adriaan de Groot <adridg@FreeBSD.org><br> AuthorDate: 2023-07-16 21:28:56 +0000<br> Commit:=C2=A0 =C2=A0 =C2=A0Adriaan de Groot <adridg@FreeBSD.org><br> CommitDate: 2023-07-17 14:39:44 +0000<br> <br> =C2=A0 =C2=A0 net-im/quaternion: update to a newer GH commit<br> <br> =C2=A0 =C2=A0 This is so that quaternion can build against latest quaternio= n.<br> <br> =C2=A0 =C2=A0 Includes work from rakuco@ <a href=3D"https://reviews.freebsd= .org/D41045" rel=3D"noreferrer" target=3D"_blank">https://reviews.freebsd.o= rg/D41045</a><br> ---<br> =C2=A0net-im/quaternion/Makefile=C2=A0 | 22 +++++++++++++---------<br> =C2=A0net-im/quaternion/distinfo=C2=A0 |=C2=A0 6 +++---<br> =C2=A0net-im/quaternion/pkg-plist |=C2=A0 3 ++-<br> =C2=A03 files changed, 18 insertions(+), 13 deletions(-)<br> <br> diff --git a/net-im/quaternion/Makefile b/net-im/quaternion/Makefile<br> index 195b4211efb3..bcc9fe46e920 100644<br> --- a/net-im/quaternion/Makefile<br> +++ b/net-im/quaternion/Makefile<br> @@ -1,29 +1,33 @@<br> =C2=A0PORTNAME=3D=C2=A0 =C2=A0 =C2=A0 Quaternion<br> =C2=A0DISTVERSION=3D=C2=A0 =C2=A00.0.95.1<br> +PORTREVISION=3D=C2=A0 2<br> =C2=A0CATEGORIES=3D=C2=A0 =C2=A0 net-im<br> <br> =C2=A0MAINTAINER=3D=C2=A0 =C2=A0 adridg@FreeBSD.org<br> =C2=A0COMMENT=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0Matrix IM client based on Qt tec= hnologies<br> =C2=A0WWW=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0<a href=3D"https://git= hub.com/quotient-im/Quaternion/" rel=3D"noreferrer" target=3D"_blank">https= ://github.com/quotient-im/Quaternion/</a><br> <br> -BROKEN=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 No upstre= am release compatible with libquotient 0.7 yet<br> -<br> -LICENSE=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0GPLv3<br> -LICENSE_FILE=3D=C2=A0 ${WRKSRC}/COPYING<br> +LICENSE=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0GPLv3+<br> +LICENSE_FILE=3D=C2=A0 ${WRKSRC}/LICENSES/GPL-3.0-or-later.txt<br> <br> =C2=A0LIB_DEPENDS=3D=C2=A0 =C2=A0libqt5keychain.so:security/qtkeychain@qt5 = \<br> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0libsecret-1.so:secu= rity/libsecret<br> -BUILD_DEPENDS=3D libquotient>=3D0.7:net-im/libquotient<br> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0libsecret-1.so:secu= rity/libsecret \<br> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0libolm.so:security/= olm<br> +BUILD_DEPENDS=3D libquotient>=3D0.8:net-im/libquotient<br> =C2=A0# Quotient is a static lib, doesn't need to be in RUN_DEPENDS<br> <br> -USES=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 cmake compiler:c++17-lang gettex= t-runtime gnome \<br> +USES=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 cmake compiler:c++17-lang deskto= p-file-utils \<br> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0gettext-runtime gno= me \<br> =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 localbase:ldflags q= t:5 tar:xz<br> =C2=A0USE_GNOME=3D=C2=A0 =C2=A0 =C2=A0glib20<br> -USE_QT=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 core dbus= declarative gui multimedia network widgets \<br> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0quickcontrols quick= controls2 \<br> +USE_QT=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 core dbus= declarative gui multimedia network \<br> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0quickcontrols quick= controls2 sql widgets \<br> =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 buildtools:build li= nguist:build qmake:build<br> <br> +CMAKE_OFF=3D=C2=A0 =C2=A0 =C2=A0BUILD_WITH_QT6<br> +<br> =C2=A0USE_GITHUB=3D=C2=A0 =C2=A0 yes<br> =C2=A0GH_ACCOUNT=3D=C2=A0 =C2=A0 quotient-im<br> +GH_TAGNAME=3D=C2=A0 =C2=A0 447d8ec4f990499fb589a37b7e8eae8c6781cadc<br> <br> =C2=A0.include <<a href=3D"http://bsd.port.mk" rel=3D"noreferrer" target= =3D"_blank">bsd.port.mk</a>><br> diff --git a/net-im/quaternion/distinfo b/net-im/quaternion/distinfo<br> index 2d654c352d3d..e439dc16d7f2 100644<br> --- a/net-im/quaternion/distinfo<br> +++ b/net-im/quaternion/distinfo<br> @@ -1,3 +1,3 @@<br> -TIMESTAMP =3D 1674504277<br> -SHA256 (quotient-im-Quaternion-0.0.95.1_GH0.tar.gz) =3D 69f034241dddc8d943= 6a895bb76b022e492e61e2f49d9a80ed8d79ab12b63a0e<br> -SIZE (quotient-im-Quaternion-0.0.95.1_GH0.tar.gz) =3D 1224589<br> +TIMESTAMP =3D 1689544557<br> +SHA256 (quotient-im-Quaternion-0.0.95.1-447d8ec4f990499fb589a37b7e8eae8c67= 81cadc_GH0.tar.gz) =3D 3c7e83987d56dbddb1a7ad947345280f8f399381d7f1129928c5= 745cf8c58240<br> +SIZE (quotient-im-Quaternion-0.0.95.1-447d8ec4f990499fb589a37b7e8eae8c6781= cadc_GH0.tar.gz) =3D 1641909<br> diff --git a/net-im/quaternion/pkg-plist b/net-im/quaternion/pkg-plist<br> index 9d3589576b24..a4c7295e9128 100644<br> --- a/net-im/quaternion/pkg-plist<br> +++ b/net-im/quaternion/pkg-plist<br> @@ -1,5 +1,6 @@<br> =C2=A0bin/quaternion<br> =C2=A0share/Quotient/quaternion/translations/quaternion_de.qm<br> +share/Quotient/quaternion/translations/quaternion_en.qm<br> =C2=A0share/Quotient/quaternion/translations/quaternion_en_GB.qm<br> =C2=A0share/Quotient/quaternion/translations/quaternion_es.qm<br> =C2=A0share/Quotient/quaternion/translations/quaternion_pl.qm<br> @@ -11,5 +12,5 @@ share/icons/hicolor/22x22/apps/quaternion.png<br> =C2=A0share/icons/hicolor/32x32/apps/quaternion.png<br> =C2=A0share/icons/hicolor/48x48/apps/quaternion.png<br> =C2=A0share/icons/hicolor/64x64/apps/quaternion.png<br> -share/icons/hicolor/scalable/apps/quaternion.svgz<br> +share/icons/hicolor/scalable/apps/quaternion.svg<br> =C2=A0share/metainfo/com.github.quaternion.appdata.xml<br> </blockquote></div><br clear=3D"all"><br><span class=3D"gmail_signature_pre= fix">-- </span><br><div dir=3D"ltr" class=3D"gmail_signature"><div dir=3D"l= tr"><span style=3D"color:rgb(102,102,102)">Nuno Teixeira<br>FreeBSD Committ= er (ports)</span></div></div> --000000000000426de40600b2d8dc--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAFDf7UJLnGVU0H4yK4xa5t8ZVv0%2BhCC4cYB2NJc6_zLiodW_gA>