From a6682059012f6761c2a804f949ea0c87f60a1064 Mon Sep 17 00:00:00 2001
From: Freemor <freemor@freemor.ca>
Date: Tue, 14 Jan 2020 14:36:45 -0400
Subject: Update [libre-testing/ruby] the de-gemmed edition

---
 libre-testing/ruby/remove-json-ext.patch | 47 ++++++++++++++++++++------------
 1 file changed, 29 insertions(+), 18 deletions(-)

(limited to 'libre-testing/ruby/remove-json-ext.patch')

diff --git a/libre-testing/ruby/remove-json-ext.patch b/libre-testing/ruby/remove-json-ext.patch
index ba168311a..f7111f6fd 100644
--- a/libre-testing/ruby/remove-json-ext.patch
+++ b/libre-testing/ruby/remove-json-ext.patch
@@ -1,9 +1,11 @@
+diff --git a/LEGAL b/LEGAL
+index 565c4c9..0a7cc0f 100644
 --- a/LEGAL
 +++ b/LEGAL
 @@ -657,31 +657,6 @@ ext/digest/sha2/sha2.h::
      OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
      SUCH DAMAGE.
-
+ 
 -ext/json/generator/generator.c::
 -
 -  The file contains the following copyright notice.
@@ -32,45 +34,52 @@
  ext/nkf/nkf-utf8/config.h::
  ext/nkf/nkf-utf8/nkf.c::
  ext/nkf/nkf-utf8/utf8tbl.c::
+diff --git a/common.mk b/common.mk
+index 3706aeb..9bf5627 100644
 --- a/common.mk
 +++ b/common.mk
-@@ -989,8 +989,7 @@ srcs-ext: $(EXT_SRCS)
+@@ -1026,8 +1026,7 @@ srcs-ext: $(EXT_SRCS)
  realclean-srcs-ext::
- 	     $(Q)$(RM) $(EXT_SRCS)
-
+ 	$(Q)$(RM) $(EXT_SRCS)
+ 
 -EXTRA_SRCS = $(srcdir)/ext/json/parser/parser.c \
 -	     $(srcdir)/ext/date/zonetab.h \
 +EXTRA_SRCS = $(srcdir)/ext/date/zonetab.h \
  	     $(empty)
-
+ 
  srcs-extra: $(EXTRA_SRCS)
-@@ -1006,11 +1005,6 @@
- 		Q=$(Q) ECHO=$(ECHO) RM="$(RM)" top_srcdir=../.. srcdir=. VPATH="$${VPATH}" \
+@@ -1140,11 +1139,6 @@ $(srcdir)/ext/ripper/ripper.c: $(srcdir)/ext/ripper/tools/preproc.rb $(srcdir)/p
+ 		Q=$(Q) ECHO=$(ECHO) RM="$(RM)" BISON=$(YACC) top_srcdir=../.. srcdir=. VPATH="$${VPATH}" \
  		RUBY="$(BASERUBY)" PATH_SEPARATOR="$(PATH_SEPARATOR)"
  
--$(srcdir)/ext/json/parser/parser.c: $(srcdir)/ext/json/parser/parser.rl
+-$(srcdir)/ext/json/parser/parser.c: $(srcdir)/ext/json/parser/parser.rl $(srcdir)/ext/json/parser/prereq.mk
 -	$(ECHO) generating $@
 -	$(Q) $(CHDIR) $(@D) && $(exec) $(MAKE) -f prereq.mk $(mflags) \
 -		Q=$(Q) ECHO=$(ECHO) top_srcdir=../../.. srcdir=. VPATH=../../.. BASERUBY="$(BASERUBY)"
 -
- $(srcdir)/ext/date/zonetab.h: $(srcdir)/ext/date/zonetab.list
+ $(srcdir)/ext/date/zonetab.h: $(srcdir)/ext/date/zonetab.list $(srcdir)/ext/date/prereq.mk
  	$(ECHO) generating $@
  	$(Q) $(CHDIR) $(@D) && $(exec) $(MAKE) -f prereq.mk $(mflags) \
---- a/doc/maintainers.rdoc	2017-12-22 18:08:05.000000000 -0500
-+++ b/doc/maintainers.rdoc	2018-01-07 09:57:59.999596681 -0500
-@@ -253,9 +253,6 @@
- [ext/io/console]
+diff --git a/doc/maintainers.rdoc b/doc/maintainers.rdoc
+index 98de9f2..268293a 100644
+--- a/doc/maintainers.rdoc
++++ b/doc/maintainers.rdoc
+@@ -310,10 +310,6 @@ Zachary Scott (zzak)
    Nobuyuki Nakada (nobu)
    https://github.com/ruby/io-console
+   https://rubygems.org/gems/io-console
 -[ext/json]
 -  NARUSE, Yui (naruse), Hiroshi SHIBATA (hsbt)
 -  https://github.com/flori/json
+-  https://rubygems.org/gems/json
  [ext/openssl]
    Kazuki Yamaguchi (rhe)
    https://github.com/ruby/openssl
---- a/ext/.document	2017-09-03 08:31:34.000000000 -0500
-+++ b/ext/.document	2018-01-07 09:58:54.180475610 -0500
-@@ -27,9 +27,6 @@
+diff --git a/ext/.document b/ext/.document
+index 6a49157..97e5120 100644
+--- a/ext/.document
++++ b/ext/.document
+@@ -27,9 +27,6 @@ gdbm/gdbm.c
  io/console/console.c
  io/nonblock/nonblock.c
  io/wait/wait.c
@@ -80,8 +89,10 @@
  nkf/lib
  nkf/nkf.c
  objspace/objspace.c
---- a/ext/Setup	2017-04-20 03:21:24.000000000 -0500
-+++ b/ext/Setup	2018-01-07 10:06:52.168822642 -0500
+diff --git a/ext/Setup b/ext/Setup
+index ac79c86..e1b8d40 100644
+--- a/ext/Setup
++++ b/ext/Setup
 @@ -20,9 +20,6 @@
  #io/console
  #io/nonblock
-- 
cgit v1.2.3