diff options
| -rw-r--r-- | libre/ruby/PKGBUILD | 8 | ||||
| -rw-r--r-- | libre/ruby/json-2.1.0-libre.patch | 15 |
2 files changed, 18 insertions, 5 deletions
diff --git a/libre/ruby/PKGBUILD b/libre/ruby/PKGBUILD index 772bea4fa..2f7008eea 100644 --- a/libre/ruby/PKGBUILD +++ b/libre/ruby/PKGBUILD @@ -19,8 +19,8 @@ pkgname=(ruby ruby-docs) pkgver=2.5.0 _jsonver=2.1.0 -pkgrel=1.parabola1 -_srcrel=1 # increment this to rebuild the sourceball without bumping pkgver +pkgrel=1.parabola2 +_srcrel=2 # increment this to rebuild the sourceball without bumping pkgver arch=(i686 x86_64 armv7h) url='http://www.ruby-lang.org/en/' license=(BSD2 custom) @@ -28,7 +28,7 @@ makedepends=(gdbm openssl libffi doxygen graphviz libyaml ttf-dejavu tk) options=(!emptydirs) source=(https://repo.parabola.nu/other/ruby-libre/ruby-${pkgver}-libre${_srcrel}.tar.gz gemrc) -sha512sums=('e94355d3d9b6882f4dc355ca6721a0ce1b777f7f1144144adfa2e5732acbfb69f16b062ce9fad5be0e2e06ac49db0171d9e9fcc43c78836b5bbf3a5b97ef145e' +sha512sums=('c4c9927aeb493b181e95dcdd2e167de66cc855102acda59e4795b7fa974d2005878dbd019cb8380ad2bdf6c67c72990cf84260769ffa57c8033b975f455197a7' '8cafd14d414ee3c16aa94f79072bc6c100262f925dc1300e785846c3fabbbbffc1356b8e2223af5684e3340c55032d41231179ffa948bb12e01dbae0f4131911') mkdepends=('ruby') # for 'gem build' @@ -41,7 +41,7 @@ mksha512sums=('55714a33d7661fe8b432f73c34fd67b49699f8b79df1cbd680a74899124d31111 'dbfd2517e87571e25fea832f50535e76c07972e15f48050ad7b08b04993c566ae7b5e8b1dd0e3cd65eb6161290026eaa71ff4528e98a92e37983066b4929cfb1' '303172561a4ba54515fddfd9ea7e0c833e550b0ae5e9f331956f178f8c5e20aa0e3c4036251ddfd04312769ef7d71d83fde0afe64f6fa8e9052ca5a294c62927' '6019cc26a0919e4d39ae0bf737b51cd9a474c74a55d25f6931ac04d61826bb810d063190a80a29810e57d7457d1a247acd82fd78de2c4c01acb7d73ee9fde603' - 'ccbcbc964e08c10470f1552cec5bcf71fc14f4f6faf83e51fcaf01b662596f5400e7f60279209c9d4df03e3c798b9008383667375f884a1115ac96956053a38d') + '582017bd0f98878c0ac6f4625854422662d83ae6274a34762082a720052023780dceb17694b1f4e18d9a0dcbb525990341176eac31040aa63099a8b3a8d52071') mksource() { # Start with the vanilla version of json diff --git a/libre/ruby/json-2.1.0-libre.patch b/libre/ruby/json-2.1.0-libre.patch index 7b188ad91..04eced89d 100644 --- a/libre/ruby/json-2.1.0-libre.patch +++ b/libre/ruby/json-2.1.0-libre.patch @@ -1,5 +1,18 @@ +--- a/lib/json.rb 2017-04-18 04:16:28.000000000 -0500 ++++ b/lib/json.rb 2018-01-07 12:54:09.516275320 -0500 +@@ -55,9 +55,5 @@ + module JSON + require 'json/version' + +- begin +- require 'json/ext' +- rescue LoadError +- require 'json/pure' +- end ++ require 'json/pure' + end --- a/tests/test_helper.rb 2017-04-18 04:16:28.000000000 -0500 -+++ b/tests/test_helper.rb 2018-01-07 10:52:13.466053202 -0500 ++++ b/tests/test_helper.rb 2018-01-07 12:55:21.359687486 -0500 @@ -1,14 +1,5 @@ -case ENV['JSON'] -when 'pure' |