git: 2d6ae146a01b - 2025Q4 - devel/gitaly: fix build on i386
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 06 Dec 2025 19:59:03 UTC
The branch 2025Q4 has been updated by mfechner:
URL: https://cgit.FreeBSD.org/ports/commit/?id=2d6ae146a01b780fb23f0544f632663b573fb4e9
commit 2d6ae146a01b780fb23f0544f632663b573fb4e9
Author: Matthias Fechner <mfechner@FreeBSD.org>
AuthorDate: 2025-11-30 13:09:55 +0000
Commit: Matthias Fechner <mfechner@FreeBSD.org>
CommitDate: 2025-12-06 19:50:23 +0000
devel/gitaly: fix build on i386
I provided that patch upstream here:
https://gitlab.com/gitlab-org/gitaly/-/merge_requests/8309
(cherry picked from commit 646e363361f02bb33b77742d7455d228e5986853)
---
devel/gitaly/Makefile | 2 ++
devel/gitaly/distinfo | 4 +++-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/devel/gitaly/Makefile b/devel/gitaly/Makefile
index f695543637b8..b197692bc4f7 100644
--- a/devel/gitaly/Makefile
+++ b/devel/gitaly/Makefile
@@ -4,6 +4,8 @@ DISTVERSION= ${GITLAB_VERSION}
PORTREVISION= ${GITLAB_PORTREVISION} # modify it in www/gitlab/Makefile.common
CATEGORIES= devel
+PATCH_SITES= https://gitlab.com/gitlab-org/gitaly/-/merge_requests/
+PATCHFILES+= 8309.patch:-p1 # https://gitlab.com/gitlab-org/gitaly/-/merge_requests/8309, Fix build on i386 system
MAINTAINER= mfechner@FreeBSD.org
COMMENT= Smart reverse proxy for GitLab
WWW= https://gitlab.com/gitlab-org/gitaly
diff --git a/devel/gitaly/distinfo b/devel/gitaly/distinfo
index b0320bff6120..d111abd305d4 100644
--- a/devel/gitaly/distinfo
+++ b/devel/gitaly/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1764220553
+TIMESTAMP = 1764508114
SHA256 (go/devel_gitaly/gitaly-v18.6.1/go.mod) = 1aace7ab09969668d9aad9416851833a2ec122442b060ce133e60d1d7c9b0252
SIZE (go/devel_gitaly/gitaly-v18.6.1/go.mod) = 14044
SHA256 (go/devel_gitaly/gitaly-v18.6.1/gitaly-v18.6.1.tar.bz2) = 598192b4c0ea1f323ff085db5ff02e507d698456fdf5333e562f0360a319abbc
@@ -9,3 +9,5 @@ SHA256 (go/devel_gitaly/gitaly-v18.6.1/gitlab-org-git-419c72cb8ada252b260efc38ff
SIZE (go/devel_gitaly/gitaly-v18.6.1/gitlab-org-git-419c72cb8ada252b260efc38ff91fe201de7c8c3_GL0.tar.gz) = 11822923
SHA256 (go/devel_gitaly/gitaly-v18.6.1/gitlab-org-git-23466173824c0a0f835c0d790c2f38156ae6284a_GL0.tar.gz) = 01a4069b15e9262151b3b97f989d4939ba8966bd5269875add2a34806817c01a
SIZE (go/devel_gitaly/gitaly-v18.6.1/gitlab-org-git-23466173824c0a0f835c0d790c2f38156ae6284a_GL0.tar.gz) = 11745131
+SHA256 (go/devel_gitaly/gitaly-v18.6.1/8309.patch) = 44a7f527e23f818b0c7080ac6f8a56b14f6711b3feca5dd1f59e39557a7e8bce
+SIZE (go/devel_gitaly/gitaly-v18.6.1/8309.patch) = 1287