diff options
Diffstat (limited to 'libre/ruby/remove-json-ext.patch')
| -rw-r--r-- | libre/ruby/remove-json-ext.patch | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/libre/ruby/remove-json-ext.patch b/libre/ruby/remove-json-ext.patch index f7111f6fd..6c115addd 100644 --- a/libre/ruby/remove-json-ext.patch +++ b/libre/ruby/remove-json-ext.patch @@ -2,16 +2,16 @@ diff --git a/LEGAL b/LEGAL index 565c4c9..0a7cc0f 100644 --- a/LEGAL +++ b/LEGAL -@@ -657,31 +657,6 @@ ext/digest/sha2/sha2.h:: +@@ -688,31 +688,6 @@ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. --ext/json/generator/generator.c:: +-[ext/json/generator/generator.c] - - The file contains the following copyright notice. - - >>> -- Copyright 2001-2004 Unicode, Inc. +- Copyright 2001-2004:: Unicode, Inc. - - Disclaimer:: - @@ -31,14 +31,14 @@ index 565c4c9..0a7cc0f 100644 - for internal or external distribution as long as this notice - remains attached. - - ext/nkf/nkf-utf8/config.h:: - ext/nkf/nkf-utf8/nkf.c:: - ext/nkf/nkf-utf8/utf8tbl.c:: + [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 -@@ -1026,8 +1026,7 @@ srcs-ext: $(EXT_SRCS) +@@ -1051,8 +1051,7 @@ realclean-srcs-ext:: $(Q)$(RM) $(EXT_SRCS) @@ -48,9 +48,9 @@ index 3706aeb..9bf5627 100644 $(empty) srcs-extra: $(EXTRA_SRCS) -@@ -1140,11 +1139,6 @@ $(srcdir)/ext/ripper/ripper.c: $(srcdir)/ext/ripper/tools/preproc.rb $(srcdir)/p +@@ -1166,11 +1165,6 @@ Q=$(Q) ECHO=$(ECHO) RM="$(RM)" BISON=$(YACC) top_srcdir=../.. srcdir=. VPATH="$${VPATH}" \ - RUBY="$(BASERUBY)" PATH_SEPARATOR="$(PATH_SEPARATOR)" + RUBY="$(BASERUBY)" PATH_SEPARATOR="$(PATH_SEPARATOR)" LANG=C -$(srcdir)/ext/json/parser/parser.c: $(srcdir)/ext/json/parser/parser.rl $(srcdir)/ext/json/parser/prereq.mk - $(ECHO) generating $@ @@ -64,31 +64,31 @@ 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) +@@ -348,10 +348,6 @@ Nobuyuki Nakada (nobu) - https://github.com/ruby/io-console - https://rubygems.org/gems/io-console + https://github.com/ruby/io-wait + https://rubygems.org/gems/io-wait -[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 + [ext/nkf] + NARUSE, Yui (naruse) + https://github.com/ruby/nkf 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 +@@ -36,9 +36,6 @@ + io/console/lib io/nonblock/nonblock.c io/wait/wait.c -json/generator/generator.c -json/lib -json/parser/parser.c + monitor/lib + monitor/monitor.c nkf/lib - nkf/nkf.c - objspace/objspace.c diff --git a/ext/Setup b/ext/Setup index ac79c86..e1b8d40 100644 --- a/ext/Setup |