user/gitlab-foss: use ruby 3.0

This commit is contained in:
Antoine Martin 2023-03-31 12:54:30 -04:00 committed by Antoine Martin
parent 6d0167f943
commit a9beb437a7

View file

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