user/gitlab-foss: use ruby-rugged aport

This commit is contained in:
Antoine Martin 2023-03-10 00:39:19 -05:00 committed by Antoine Martin
parent 0b9ba64c9a
commit de8c371842

View file

@ -5,7 +5,7 @@ pkgname=gitlab-foss
_pkgname=${pkgname%-foss}
pkgver=15.9.2
_gittag=v$pkgver
pkgrel=3
pkgrel=4
pkgdesc="A version control for your server"
url="https://gitlab.com/gitlab-org/gitlab-foss"
arch="x86_64"
@ -46,7 +46,6 @@ makedepends="
icu-dev
libffi-dev
libgcrypt-dev
libgit2-dev
libpq-dev
libxml2-dev
libxslt-dev
@ -56,7 +55,8 @@ makedepends="
protobuf-dev
re2-dev
ruby-dev
ruby-grpc
ruby-grpc=~1.42.0
ruby-rugged=~1.5.0.1
yarn>=1.2.0
"
pkgusers="git"
@ -100,14 +100,16 @@ prepare() {
# Remove all locale files except en.
find locale -type d -mindepth 1 ! -name en -exec rm -rf {} +
# This Google gem is totally messed, so we can't install it from
# RubyGems using Bundler.
mkdir -p vendor/gems/grpc
cp -r "$sysgemdir"/gems/grpc-*/* vendor/gems/grpc/
cp "$sysgemdir"/specifications/grpc-*.gemspec \
vendor/gems/grpc/grpc.gemspec
cp "$sysgemdir"/extensions/*/*/grpc-*/grpc/*.so \
vendor/gems/grpc/src/ruby/lib/grpc/
# Some gems are broken, so we copy our fixed version
# instead of installing it from RubyGems using Bundler.
for i in grpc rugged; do
mkdir -p vendor/gems/$i/src/ruby/lib/$i
cp -r "$sysgemdir"/gems/$i-*/* vendor/gems/$i/
cp "$sysgemdir"/specifications/$i-*.gemspec \
vendor/gems/$i/$i.gemspec
cp "$sysgemdir"/extensions/*/*/$i-*/$i/*.so \
vendor/gems/$i/src/ruby/lib/$i/
done
}
build() {
@ -127,9 +129,6 @@ build() {
--with-xml2-include=/usr/include/libxml2 \
--with-xslt-include=/usr/include/libxslt
bundle config --local build.ruby-magic --enable-system-libraries
# compatibility with libgit 1.5.1 has issues
# bundle config --local build.rugged --use-system-libraries
# https://github.com/protocolbuffers/protobuf/issues/2335#issuecomment-579913357
bundle config --local build.google-protobuf --with-cflags=-D__va_copy=va_copy
bundle config --local path "vendor/bundle"