From nobody Mon Jul 17 18:19:41 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 4R4Vjj52GRz4nqsb; Mon, 17 Jul 2023 18:19:53 +0000 (UTC) (envelope-from eduardo@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 4R4Vjj4bl8z3NP4; Mon, 17 Jul 2023 18:19:53 +0000 (UTC) (envelope-from eduardo@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689617993; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=QB1jSpVw5xQKyZKnppvHvP26yKATLzokKswALY5RcTg=; b=Q8vb08K2TXqO/ee7MmKDxuxaAiL+KPHx4fy7dpCcvv9Z2ciZS89uWkP7ogHF9QtGKyA3bH n7+ULEPdB4d21L52lx8t91zhpFhqHwLcIPxpBemwY1Ju2ApZ4pKkbNECyJqF6ArPvwz57q TpvOYALK8jrfiCqhgbwpa/qHqZIsv3mIdWcFjKrCDOs3ksq22EuUsafPvkmEpW5yNPL6iI qZ5xv2SAId/UUlde3dMF/XoLuI2YYc9LTfbMAR7DPJb3LSZdMWvMiaxiJne3afgcGmd+S9 Tu9BmHNdT502LM2M/wPlt4qeiJTlG6ipBmGXE9l17MjYzfufsC6Z0lC1bMNFIA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689617993; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=QB1jSpVw5xQKyZKnppvHvP26yKATLzokKswALY5RcTg=; b=wWkK10VHCTvd+jkpd/gGOibC8bWs72br+d0ylePmWmdn64F8EytfjEShZsH0ubE8ULpI6M 2BkZlSVr9IQF7/ExpjOy8VCaifKCOf3HCRg2ZYk/X+tPA/dLdRSaAvyEGjVQaZespHBQ8B 687UJ61O3fFic41W8EppUX+VVR6A81WpeCOK9zQSm8mZrHAxbzLL2LhBPPCHFCgZyIxpG1 Bm5XzQG3nYuxAsbGynUAoMQMqYl3cU/Q2h88GMEynXP2220uZ2zQpkWNwRBsEE4ooNloLH 5vedSutUpa/V1Pwlvk1bh1ntPJEJmqEOMOKHDDjghaGLPQsT7mhsy3lkdr7diQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689617993; a=rsa-sha256; cv=none; b=vao4GNXqjVGsguxod77J6Np0xjbQlGOugeDWIFKymsyAUf5qI0OkVwDQ7rx/8z71zIHe+m UVZfG1kuSh2DcXNiKR2xYD/dWKomRTkJ3qOjhYhjHpWtw1fRW+z4mDwLM5AAV1rEC1nd4J qVnHm4j56UVdrfn7W9ouAWnQ/lXOT91AN0b8TWwf9HjpvZwcBhu2U6jnXeJeXjvarw3ErI jDOWPdqO10e4OKwfb027P8zAwSUZBi2RkE50vlg+Hfr5gnY9kGfMMsSmN8gO03hcOMLIRQ F9gFmuJT8BzYmAyBwdDaL4umYFD2Ye86xjcao/ueyRmZGPOpPlcnCz55lXSeCg== Received: from mail-qt1-f182.google.com (mail-qt1-f182.google.com [209.85.160.182]) (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-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) (Authenticated sender: eduardo) by smtp.freebsd.org (Postfix) with ESMTPSA id 4R4Vjj3Y1Zz1Nx8; Mon, 17 Jul 2023 18:19:53 +0000 (UTC) (envelope-from eduardo@freebsd.org) Received: by mail-qt1-f182.google.com with SMTP id d75a77b69052e-4035dd6b349so37803621cf.3; Mon, 17 Jul 2023 11:19:53 -0700 (PDT) X-Gm-Message-State: ABy/qLYpiHpn5Rk56RAls/AbsQ+/C8m4p9Aop08aBdPk/qm3byZBlIYa hT96rSv84n3D4K2BSk/m4EZv10C+4Mo3pszgXro= X-Google-Smtp-Source: APBJJlGosejTPhWrfT0zIud8ZiNyR7bng89sNTXSgF3z2qfwMCqEcB4CjpbNIVkWrjAC5pqgotDE4BE3rmNLTwIrUJ8= X-Received: by 2002:ac8:5f90:0:b0:3ff:3345:b880 with SMTP id j16-20020ac85f90000000b003ff3345b880mr14095601qta.47.1689617992672; Mon, 17 Jul 2023 11:19:52 -0700 (PDT) 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 References: <202307171439.36HEdl10064013@gitrepo.freebsd.org> In-Reply-To: <202307171439.36HEdl10064013@gitrepo.freebsd.org> From: Nuno Teixeira Date: Mon, 17 Jul 2023 19:19:41 +0100 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: git: 8ba9e3e85bca - main - net-im/quaternion: update to a newer GH commit To: Adriaan de Groot Cc: ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org, dev-commits-ports-main@freebsd.org Content-Type: multipart/alternative; boundary="000000000000426de40600b2d8dc" X-ThisMailContainsUnwantedMimeParts: N --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 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 > AuthorDate: 2023-07-16 21:28:56 +0000 > Commit: Adriaan de Groot > 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 > 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
Hello Adriaan,

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>

In this case we still have version 0.0.95.1 but in= reality:
---
git describe --tags 447d8ec4f9904= 99fb589a37b7e8eae8c6781cadc
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.

<= div>Have you tried "Example 18. Using USE_GITHUB to Acces= s a Commit Between Two Versions" from porters handbook"?
I think that DISTVERSION will accept "-beta3-4" and will tr= anslate it to PORTVERSION nicely.
When it's not possible we c= an use -gYYYYMMDD too.

Further checks goes to `pkg= version -t old.version new.version` to see if it is ok and prevent port ep= och bump.

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):

archivers/maxcso
editor= s/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 b= ranch main has been updated by adridg:

URL: https://cgi= t.FreeBSD.org/ports/commit/?id=3D8ba9e3e85bca8ac4b2bb3fcc8ac8cfada84aa7fa

commit 8ba9e3e85bca8ac4b2bb3fcc8ac8cfada84aa7fa
Author:=C2=A0 =C2=A0 =C2=A0Adriaan de Groot <adridg@FreeBSD.org>
AuthorDate: 2023-07-16 21:28:56 +0000
Commit:=C2=A0 =C2=A0 =C2=A0Adriaan de Groot <adridg@FreeBSD.org>
CommitDate: 2023-07-17 14:39:44 +0000

=C2=A0 =C2=A0 net-im/quaternion: update to a newer GH commit

=C2=A0 =C2=A0 This is so that quaternion can build against latest quaternio= n.

=C2=A0 =C2=A0 Includes work from rakuco@ https://reviews.freebsd.o= rg/D41045
---
=C2=A0net-im/quaternion/Makefile=C2=A0 | 22 +++++++++++++---------
=C2=A0net-im/quaternion/distinfo=C2=A0 |=C2=A0 6 +++---
=C2=A0net-im/quaternion/pkg-plist |=C2=A0 3 ++-
=C2=A03 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 @@
=C2=A0PORTNAME=3D=C2=A0 =C2=A0 =C2=A0 Quaternion
=C2=A0DISTVERSION=3D=C2=A0 =C2=A00.0.95.1
+PORTREVISION=3D=C2=A0 2
=C2=A0CATEGORIES=3D=C2=A0 =C2=A0 net-im

=C2=A0MAINTAINER=3D=C2=A0 =C2=A0 adridg@FreeBSD.org
=C2=A0COMMENT=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0Matrix IM client based on Qt tec= hnologies
=C2=A0WWW=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0https= ://github.com/quotient-im/Quaternion/

-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
-
-LICENSE=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0GPLv3
-LICENSE_FILE=3D=C2=A0 ${WRKSRC}/COPYING
+LICENSE=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0GPLv3+
+LICENSE_FILE=3D=C2=A0 ${WRKSRC}/LICENSES/GPL-3.0-or-later.txt

=C2=A0LIB_DEPENDS=3D=C2=A0 =C2=A0libqt5keychain.so:security/qtkeychain@qt5 = \
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0libsecret-1.so:secu= rity/libsecret
-BUILD_DEPENDS=3D libquotient>=3D0.7:net-im/libquotient
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0libsecret-1.so:secu= rity/libsecret \
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0libolm.so:security/= olm
+BUILD_DEPENDS=3D libquotient>=3D0.8:net-im/libquotient
=C2=A0# Quotient is a static lib, doesn't need to be in RUN_DEPENDS

-USES=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 cmake compiler:c++17-lang gettex= t-runtime gnome \
+USES=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 cmake compiler:c++17-lang deskto= p-file-utils \
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0gettext-runtime gno= me \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 localbase:ldflags q= t:5 tar:xz
=C2=A0USE_GNOME=3D=C2=A0 =C2=A0 =C2=A0glib20
-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 \
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0quickcontrols quick= controls2 \
+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 \
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0quickcontrols quick= controls2 sql widgets \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 buildtools:build li= nguist:build qmake:build

+CMAKE_OFF=3D=C2=A0 =C2=A0 =C2=A0BUILD_WITH_QT6
+
=C2=A0USE_GITHUB=3D=C2=A0 =C2=A0 yes
=C2=A0GH_ACCOUNT=3D=C2=A0 =C2=A0 quotient-im
+GH_TAGNAME=3D=C2=A0 =C2=A0 447d8ec4f990499fb589a37b7e8eae8c6781cadc

=C2=A0.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 69f034241dddc8d943= 6a895bb76b022e492e61e2f49d9a80ed8d79ab12b63a0e
-SIZE (quotient-im-Quaternion-0.0.95.1_GH0.tar.gz) =3D 1224589
+TIMESTAMP =3D 1689544557
+SHA256 (quotient-im-Quaternion-0.0.95.1-447d8ec4f990499fb589a37b7e8eae8c67= 81cadc_GH0.tar.gz) =3D 3c7e83987d56dbddb1a7ad947345280f8f399381d7f1129928c5= 745cf8c58240
+SIZE (quotient-im-Quaternion-0.0.95.1-447d8ec4f990499fb589a37b7e8eae8c6781= cadc_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 @@
=C2=A0bin/quaternion
=C2=A0share/Quotient/quaternion/translations/quaternion_de.qm
+share/Quotient/quaternion/translations/quaternion_en.qm
=C2=A0share/Quotient/quaternion/translations/quaternion_en_GB.qm
=C2=A0share/Quotient/quaternion/translations/quaternion_es.qm
=C2=A0share/Quotient/quaternion/translations/quaternion_pl.qm
@@ -11,5 +12,5 @@ share/icons/hicolor/22x22/apps/quaternion.png
=C2=A0share/icons/hicolor/32x32/apps/quaternion.png
=C2=A0share/icons/hicolor/48x48/apps/quaternion.png
=C2=A0share/icons/hicolor/64x64/apps/quaternion.png
-share/icons/hicolor/scalable/apps/quaternion.svgz
+share/icons/hicolor/scalable/apps/quaternion.svg
=C2=A0share/metainfo/com.github.quaternion.appdata.xml


--
Nuno Teixeira
FreeBSD Committ= er (ports)
--000000000000426de40600b2d8dc--