diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2019-09-04 08:13:59 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2019-09-04 11:04:55 +0000 |
| commit | eca7aefa4fe7b2e48cee2ab070d30f2adb80de58 (patch) | |
| tree | 8936210cb71629632f718ab9210f02310963ab5d | |
| parent | d174f9d0a5d3c8549edd29fa82d4cbcc8cb3f342 (diff) | |
| download | aports-eca7aefa4fe7b2e48cee2ab070d30f2adb80de58.tar.bz2 aports-eca7aefa4fe7b2e48cee2ab070d30f2adb80de58.tar.xz | |
main/ruby: backport patch for loosen up rdoc dependency
| -rw-r--r-- | main/ruby/APKBUILD | 6 | ||||
| -rw-r--r-- | main/ruby/avoid-rdoc-hook-when-its-failed-to-load-rdoc-library.patch | 24 |
2 files changed, 28 insertions, 2 deletions
diff --git a/main/ruby/APKBUILD b/main/ruby/APKBUILD index eaba76ab7e..e1c5a07ea7 100644 --- a/main/ruby/APKBUILD +++ b/main/ruby/APKBUILD @@ -28,7 +28,7 @@ pkgname=ruby pkgver=2.6.3 _abiver="${pkgver%.*}.0" -pkgrel=0 +pkgrel=1 pkgdesc="An object-oriented language for quick and easy programming" url="https://www.ruby-lang.org/" arch="all" @@ -64,6 +64,7 @@ source="https://cache.ruby-lang.org/pub/$pkgname/${pkgver%.*}/$pkgname-$pkgver.t rubygems-avoid-platform-specific-gems.patch test_insns-lower-recursion-depth.patch fix-get_main_stack.patch + avoid-rdoc-hook-when-its-failed-to-load-rdoc-library.patch " replaces="ruby-gems" builddir="$srcdir/$pkgname-$pkgver" @@ -342,4 +343,5 @@ _mvgem() { sha512sums="8503b86da60e38da4f1a1553b2570d4125c1823280e6fb6d07825a0e92dd7b628e13147ebde085702cbf5c5eddfe7fa5a2445996bc29164196a53bc917b02112 ruby-2.6.3.tar.gz cfdc5ea3b2e2ea69c51f38e8e2180cb1dc27008ca55cc6301f142ebafdbab31c3379b3b6bba9ff543153876dd98ed2ad194df3255b7ea77a62e931c935f80538 rubygems-avoid-platform-specific-gems.patch 814fe6359505b70d8ff680adf22f20a74b4dbd3fecc9a63a6c2456ee9824257815929917b6df5394ed069a6869511b8c6dce5b95b4acbbb7867c1f3a975a0150 test_insns-lower-recursion-depth.patch -8d730f02f76e53799f1c220eb23e3d2305940bb31216a7ab1e42d3256149c0721c7d173cdbfe505023b1af2f5cb3faa233dcc1b5d560fa8f980c17c2d29a9d81 fix-get_main_stack.patch" +8d730f02f76e53799f1c220eb23e3d2305940bb31216a7ab1e42d3256149c0721c7d173cdbfe505023b1af2f5cb3faa233dcc1b5d560fa8f980c17c2d29a9d81 fix-get_main_stack.patch +cc6acabcf8d237ba75309f7c3b5fbe6bd68b2e355d2c4a656a50dea6dda4ab8153db90399b23d301ee463d56274f629aa40b2958646122f71925b4e2e602304d avoid-rdoc-hook-when-its-failed-to-load-rdoc-library.patch" diff --git a/main/ruby/avoid-rdoc-hook-when-its-failed-to-load-rdoc-library.patch b/main/ruby/avoid-rdoc-hook-when-its-failed-to-load-rdoc-library.patch new file mode 100644 index 0000000000..690d245a57 --- /dev/null +++ b/main/ruby/avoid-rdoc-hook-when-its-failed-to-load-rdoc-library.patch @@ -0,0 +1,24 @@ +From c16675582a68800ef17b6056110e0a8bcdb38b55 Mon Sep 17 00:00:00 2001 +From: SHIBATA Hiroshi <hsbt@ruby-lang.org> +Date: Tue, 22 Jan 2019 09:37:23 +0900 +Subject: [PATCH] Avoid rdoc hook when it's failed to load rdoc library. + + Fixed #2483 +--- + lib/rubygems/rdoc.rb | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/lib/rubygems/rdoc.rb b/lib/rubygems/rdoc.rb +index dfaf7c55bf..4e16fbb86f 100644 +--- a/lib/rubygems/rdoc.rb ++++ b/lib/rubygems/rdoc.rb +@@ -18,7 +18,7 @@ + module Gem + RDoc = ::RDoc::RubygemsHook + end ++ ++ Gem.done_installing(&Gem::RDoc.method(:generation_hook)) + rescue LoadError + end +- +-Gem.done_installing(&Gem::RDoc.method(:generation_hook)) |