Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 20 Jan 2023 21:38:00 GMT
From:      Jan Beich <jbeich@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: fe17c673307c - main - games/veloren: embed commit hash instead of tag name
Message-ID:  <202301202138.30KLc0vK001470@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by jbeich:

URL: https://cgit.FreeBSD.org/ports/commit/?id=fe17c673307c44a8944490b1c47c6d39eecfdbda

commit fe17c673307c44a8944490b1c47c6d39eecfdbda
Author:     Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2023-01-20 20:54:45 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2023-01-20 21:34:04 +0000

    games/veloren: embed commit hash instead of tag name
    
    WARN veloren_client: Server is running 185dccc1[2023-01-06], you are running v0.14.0[2023-01-06], versions might be incompatible!
    
    https://gitlab.com/veloren/veloren/-/commit/b8e12811bf46
---
 games/veloren/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games/veloren/Makefile b/games/veloren/Makefile
index 89b679a781af..32830d81a377 100644
--- a/games/veloren/Makefile
+++ b/games/veloren/Makefile
@@ -48,7 +48,7 @@ post-patch:
 	@${REINPLACE_CMD} -e 's/"git"/"${TRUE}"/' \
 		${WRKSRC}/common/build.rs
 # Extract (snapshot) version from the port instead of empty file
-	@${REINPLACE_CMD} -e '/GIT_HASH/s/=.*/= "${DISTVERSIONFULL}";/' \
+	@${REINPLACE_CMD} -e '/GIT_HASH/s/=.*/= "${GL_COMMIT:C/(.{8}).*/\1/}";/' \
 		-e "/GIT_DATE.*static/s/=.*/= \"$$(date -r $$(${AWK} '/TIMESTAMP/ { print $$3 }' \
 			${DISTINFO_FILE}) +'%Y-%m-%d-%H:%M')\";/" \
 		${WRKSRC}/common/src/util/mod.rs



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202301202138.30KLc0vK001470>