diff --git a/user/gitlab-foss/APKBUILD b/user/gitlab-foss/APKBUILD index 74ba6f3..2eedddf 100644 --- a/user/gitlab-foss/APKBUILD +++ b/user/gitlab-foss/APKBUILD @@ -5,7 +5,7 @@ pkgname=gitlab-foss _pkgname=${pkgname%-foss} pkgver=16.8.0 _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 aarch64" @@ -79,6 +79,7 @@ source="https://gitlab.com/gitlab-org/gitlab-foss/-/archive/$_gittag/gitlab-foss $_pkgname.logrotate bin-wrapper.in downgrade-sys-filesystem-depend.patch + glfm_markdown_fix-library-location.diff " builddir="$srcdir/gitlab-foss-$_gittag" @@ -144,6 +145,12 @@ build() { bundle install --no-cache + # Patch intalled gem glfm_markdown to look for rust library at right path + ( + cd vendor/bundle/ruby/*/gems/gitlab-glfm-markdown-*/ + patch -p1 -i "$srcdir"/glfm_markdown_fix-library-location.diff + ) + # Replace bundled CA bundle with symlink. ( cd vendor/bundle/ruby/*/gems/aws-sdk-core-*/ @@ -393,4 +400,5 @@ cb4ec100f0ea7ffcbb37aead8423e636629e2f4848b2974a7b2468e96cb1081ca732ac336417b08d 57f258246925fbef0780caebdf005983c72fe3db1ab3242a1e00137bd322f5ec6c0fd958db7178b8fc22103d071f550d6f71f08422bcd9e859d2a734b2ecef00 gitlab.logrotate a944c3886388ba1574bf8c96b6de4d9f24ef4a83f553c31a224e17a3b01f2a5c65b60c59b7ed7ca4b25670c60ea8dd41b96a8a623d909d2bb09bdf2520ed7f23 bin-wrapper.in ab9a09fca6126b18b76e61380990dc217f915162985880e90b905b3210a1fef229af3db1f1ca180177d3cba91ab5fe33798ac685055abf0adc44a1b630f71b39 downgrade-sys-filesystem-depend.patch +95c2079a8b56d4571c3f9d54c3be380d36f64b7e48164468513778185957325a33c7693436b7e75f98f07aa767fda95d5852f957849199fd1f9bc6e6074e3ddc glfm_markdown_fix-library-location.diff " diff --git a/user/gitlab-foss/glfm_markdown_fix-library-location.diff b/user/gitlab-foss/glfm_markdown_fix-library-location.diff new file mode 100644 index 0000000..3d5bfd8 --- /dev/null +++ b/user/gitlab-foss/glfm_markdown_fix-library-location.diff @@ -0,0 +1,13 @@ +diff --git a/lib/glfm_markdown/loader.rb.orig b/lib/glfm_markdown/loader.rb +index 295d549..6718619 100644 +--- a/lib/glfm_markdown/loader.rb.orig ++++ b/lib/glfm_markdown/loader.rb +@@ -2,7 +2,7 @@ + + def load_rust_extension + ruby_version = /(\d+\.\d+)/.match(RUBY_VERSION) +- require_relative "./#{ruby_version}/glfm_markdown" ++ require_relative "../../lib/glfm_markdown" + rescue LoadError + require 'glfm_markdown/glfm_markdown' + end