From 45a11233fd246d3adca28ae3d3bc4ec4901d976a Mon Sep 17 00:00:00 2001
From: Antoine Martin <dev@ayakael.net>
Date: Fri, 31 Mar 2023 12:54:30 -0400
Subject: [PATCH] user/gitlab-foss: use ruby 3.0

---
 user/gitlab-foss/APKBUILD | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/user/gitlab-foss/APKBUILD b/user/gitlab-foss/APKBUILD
index 8e0c7ff..a793427 100644
--- a/user/gitlab-foss/APKBUILD
+++ b/user/gitlab-foss/APKBUILD
@@ -5,7 +5,7 @@ pkgname=gitlab-foss
 _pkgname=${pkgname%-foss}
 pkgver=15.9.3
 _gittag=v$pkgver
-pkgrel=0
+pkgrel=1
 pkgdesc="A version control for your server"
 url="https://gitlab.com/gitlab-org/gitlab-foss"
 arch="x86_64"
@@ -25,15 +25,15 @@ depends="
 	py-docutils
 	python3
 	redis>=2.8
-	ruby
-	ruby-bigdecimal
-	ruby-bundler
-	ruby-fiddle
-	ruby-io-console
-	ruby-irb
-	ruby-json
-	ruby-rake
-	ruby-webrick
+	ruby3.0
+	ruby3.0-bigdecimal
+	ruby3.0-bundler
+	ruby3.0-fiddle
+	ruby3.0-io-console
+	ruby3.0-irb
+	ruby3.0-json
+	ruby3.0-rake
+	ruby3.0-webrick
 	shared-mime-info
 	tzdata
 	"
@@ -54,9 +54,9 @@ makedepends="
 	openssl-dev
 	protobuf-dev
 	re2-dev
-	ruby-dev
-	ruby-grpc=~1.42.0
-	ruby-rugged=~1.5.0.1
+	ruby3.0-dev
+	ruby3.0-grpc=~1.42.0
+	ruby3.0-rugged=~1.5.0.1
 	yarn>=1.2.0
 	"
 pkgusers="git"
@@ -144,6 +144,9 @@ build() {
 	# Remove faulty RPATH.
 	chrpath -d vendor/bundle/ruby/*/extensions/*/*/ruby-magic-*/magic/magic.so
 
+	# cp grpc lib
+	cp vendor/gems/grpc/src/ruby/lib/grpc/grpc_c.so vendor/bundle/ruby/*/gems/grpc-*/src/ruby/lib/grpc/grpc_c.so
+
 	# Patch installed gem gitlab-markup to use python3.
 	# Option "-S" causes that Python cannot find docutils module.
 	sed -i 's/python2 -S/python3/g' \