forge/ayaports
1
0
Fork 0
Code Issues 43 Pull requests 11 Projects Releases Packages Wiki Activity Actions

user/gitlab-foss: fix glfm_markdown libary location #366

Merged
ayakael merged 1 commit from gitlab-foss/fix-md-location into edge 2024-01-22 04:33:16 +00:00
Conversation 0 Commits 1 Files changed 2 +22 -1
2 changed files with 22 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
user/gitlab-foss/APKBUILD
View file

@ -5,7 +5,7 @@ pkgname=gitlab-foss
_pkgname=${pkgname%-foss} _pkgname=${pkgname%-foss}
pkgver=16.8.0 pkgver=16.8.0
_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 aarch64" arch="x86_64 aarch64"
@ -79,6 +79,7 @@ source="https://gitlab.com/gitlab-org/gitlab-foss/-/archive/$_gittag/gitlab-foss
$_pkgname.logrotate $_pkgname.logrotate
bin-wrapper.in bin-wrapper.in
downgrade-sys-filesystem-depend.patch downgrade-sys-filesystem-depend.patch
glfm_markdown_fix-library-location.diff
" "
builddir="$srcdir/gitlab-foss-$_gittag" builddir="$srcdir/gitlab-foss-$_gittag"
@ -144,6 +145,12 @@ build() {
bundle install --no-cache 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. # Replace bundled CA bundle with symlink.
( (
cd vendor/bundle/ruby/*/gems/aws-sdk-core-*/ cd vendor/bundle/ruby/*/gems/aws-sdk-core-*/
@ -393,4 +400,5 @@ cb4ec100f0ea7ffcbb37aead8423e636629e2f4848b2974a7b2468e96cb1081ca732ac336417b08d
57f258246925fbef0780caebdf005983c72fe3db1ab3242a1e00137bd322f5ec6c0fd958db7178b8fc22103d071f550d6f71f08422bcd9e859d2a734b2ecef00 gitlab.logrotate 57f258246925fbef0780caebdf005983c72fe3db1ab3242a1e00137bd322f5ec6c0fd958db7178b8fc22103d071f550d6f71f08422bcd9e859d2a734b2ecef00 gitlab.logrotate
a944c3886388ba1574bf8c96b6de4d9f24ef4a83f553c31a224e17a3b01f2a5c65b60c59b7ed7ca4b25670c60ea8dd41b96a8a623d909d2bb09bdf2520ed7f23 bin-wrapper.in a944c3886388ba1574bf8c96b6de4d9f24ef4a83f553c31a224e17a3b01f2a5c65b60c59b7ed7ca4b25670c60ea8dd41b96a8a623d909d2bb09bdf2520ed7f23 bin-wrapper.in
ab9a09fca6126b18b76e61380990dc217f915162985880e90b905b3210a1fef229af3db1f1ca180177d3cba91ab5fe33798ac685055abf0adc44a1b630f71b39 downgrade-sys-filesystem-depend.patch ab9a09fca6126b18b76e61380990dc217f915162985880e90b905b3210a1fef229af3db1f1ca180177d3cba91ab5fe33798ac685055abf0adc44a1b630f71b39 downgrade-sys-filesystem-depend.patch
95c2079a8b56d4571c3f9d54c3be380d36f64b7e48164468513778185957325a33c7693436b7e75f98f07aa767fda95d5852f957849199fd1f9bc6e6074e3ddc glfm_markdown_fix-library-location.diff
" "

13
user/gitlab-foss/glfm_markdown_fix-library-location.diff Normal file
View file

@ -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