summaryrefslogtreecommitdiff
path: root/libre/ruby/json-libre.patch
diff options
context:
space:
mode:
Diffstat (limited to 'libre/ruby/json-libre.patch')
-rw-r--r--libre/ruby/json-libre.patch18
1 files changed, 9 insertions, 9 deletions
diff --git a/libre/ruby/json-libre.patch b/libre/ruby/json-libre.patch
index 04eced89d..c1a8b5231 100644
--- a/libre/ruby/json-libre.patch
+++ b/libre/ruby/json-libre.patch
@@ -1,6 +1,6 @@
---- 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 @@
+--- a/lib/json.rb 2020-12-22 07:48:50.000000000 -0500
++++ b/lib/json.rb 2021-04-29 12:34:01.408506564 -0500
+@@ -575,9 +575,5 @@
module JSON
require 'json/version'
@@ -11,21 +11,21 @@
- 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 12:55:21.359687486 -0500
+--- a/tests/test_helper.rb 2020-12-22 07:48:50.000000000 -0500
++++ b/tests/test_helper.rb 2021-04-29 12:32:24.248506757 -0500
@@ -1,14 +1,5 @@
-case ENV['JSON']
-when 'pure'
-- $:.unshift 'lib'
+- $:.unshift File.join(__dir__, '../lib')
- require 'json/pure'
-when 'ext'
-- $:.unshift 'ext', 'lib'
+- $:.unshift File.join(__dir__, '../ext'), File.join(__dir__, '../lib')
- require 'json/ext'
-else
-- $:.unshift 'ext', 'lib'
+- $:.unshift File.join(__dir__, '../ext'), File.join(__dir__, '../lib')
- require 'json'
-end
-+$:.unshift 'lib'
++$:.unshift File.join(__dir__, '../lib')
+require 'json'
require 'test/unit'