From f1c00c8004ab2ff344cdb8dcf14c5c243be70eba Mon Sep 17 00:00:00 2001 From: Omar Vega Ramos Date: Thu, 29 Apr 2021 20:45:59 -0500 Subject: ruby-3.0.1-1.parabola1: updating version --- libre/ruby/PKGBUILD | 27 +++++++++++++++------------ libre/ruby/add-json_pure.patch | 12 ++++++------ libre/ruby/json-libre.patch | 18 +++++++++--------- libre/ruby/remove-json-ext.patch | 38 +++++++++++++++++++------------------- 4 files changed, 49 insertions(+), 46 deletions(-) (limited to 'libre') diff --git a/libre/ruby/PKGBUILD b/libre/ruby/PKGBUILD index d6a755dfd..8e7917dd8 100644 --- a/libre/ruby/PKGBUILD +++ b/libre/ruby/PKGBUILD @@ -18,8 +18,8 @@ pkgname=(ruby ruby-docs) -pkgver=2.7.2 -_jsonver=2.3.0 +pkgver=3.0.1 +_jsonver=2.5.1 pkgrel=1 pkgrel+=.parabola1 _srcrel=1 # increment this to rebuild the sourceball without bumping pkgver @@ -35,11 +35,11 @@ source=(https://cache.ruby-lang.org/pub/ruby/${pkgver:0:3}/ruby-${pkgver}.tar.xz remove-json-ext.patch add-json_pure.patch json-libre.patch) -sha512sums=('7972278b096aa768c7adf2befd26003e18781a29ca317640317d30d93d6e963ded197724c8e2f1dfe1e838c5647176d414a74732a62e931fb50d6f2e0f777349' - '0cda44a77212748d9513e61314dfbc7c0cf82beebcc56eb8b043e4ada698bc475502100389b80fa5c9090341fd1c6d2841fc5c9332e520f1c8dd1084ca505379' - 'cce1402a062ab5a065e7554ae23189cb9c8de0acc27a4c96db5a90a52cfce37fde8d128e95b997e6df05d327d2279a8368276820dfad8b744747ea619ad187ab' - '9ff8a2ec9fdecd05fd506ed6f977dcd483e47611dc6bbe6c4622100a2071c0f6c7b3f813a94b73bebb9f0ed7fe9f6257289cdf971030ad525a3c8a0d065b09c2' - '582017bd0f98878c0ac6f4625854422662d83ae6274a34762082a720052023780dceb17694b1f4e18d9a0dcbb525990341176eac31040aa63099a8b3a8d52071') +sha512sums=('97d2e883656060846b304368d9d836e2f3ef39859c36171c9398a0573818e4ed75bfd7460f901a9553f7f53518c505327a66e74f83704a881469f5ac61fe13d7' + '4df7ec9b86692376e89c2019c2c1ab3ae9af28fb4742864acc6f985c0551fc10795742cc1124d6435e820617c00d4c5f4aa6c83b21d2fff43ed05cd9d0a89087' + 'e3cb4d17872d69d7bc2697b751e27c7f76edbf996f4e3007241cd8a60d2251056cf8dd858f249c0b28088da5b969c63bc5c0d52eef9c95e52e190234d3e46609' + 'c3933f1c6d7ddf669e0cfd8ffdd60abeb59a10bdfcab05a1c1b826ab65bed7019df85c15dd8af0b127a5728d5f6c322fcd724e0b9ecf0d9cdb5d28956050cc9a' + 'bb2cc232a0b096a3c40e219258aaa008183ed9a1f8b3bfd5f84680809f4b60e659f02e1db24480b30e6f11ad726b258da9dab17462621e8bfb8f9b6ed98dfbfd') prepare() { cd "$srcdir/json-${_jsonver}" @@ -60,15 +60,12 @@ prepare() { cp -r ../json-${_jsonver}/lib/* -t lib/ cp ../json-${_jsonver}/json_pure.gemspec -t lib/json/ cp -rT ../json-${_jsonver}/tests test/json + sed -i "s/File.read(\"VERSION\").chomp/\"${_jsonver}\"/g" lib/json/json_pure.gemspec patch -p1 -i ../add-json_pure.patch # Clean up the original json sources cd "$srcdir" rm -rf "json-${_jsonver}" - - cd ruby-${pkgver} - # remove bundled gems, we are going to ship them as separate packages - rm -rf gems/ } build() { @@ -118,12 +115,12 @@ package_ruby() { rm -r "${pkgdir}"/usr/lib/ruby/${rubyver}/{bundler,bundler.rb} rm "${pkgdir}"/usr/bin/{bundle,bundler} rm "${pkgdir}"/usr/lib/ruby/gems/${rubyver}/specifications/default/bundler-*.gemspec - rm "${pkgdir}"/usr/share/man/man1/{bundle,bundle-*}.1 # remove bundled rdoc gem rm -r "${pkgdir}"/usr/lib/ruby/${rubyver}/{rdoc,rdoc.rb} rm "${pkgdir}"/usr/bin/{rdoc,ri} rm "${pkgdir}"/usr/lib/ruby/gems/${rubyver}/specifications/default/rdoc-*.gemspec + rm "${pkgdir}"/usr/share/man/man1/ri.1 # remove irb as it is a separate package now rm -r "${pkgdir}"/usr/lib/ruby/${rubyver}/{irb,irb.rb} @@ -131,8 +128,14 @@ package_ruby() { rm "${pkgdir}"/usr/lib/ruby/gems/${rubyver}/specifications/default/irb-*.gemspec rm "${pkgdir}"/usr/share/man/man1/irb.1 + # remove other binaries that are shipped as separate packages + rm "${pkgdir}"/usr/bin/{rake,rbs,typeprof,erb,racc} + rm "${pkgdir}"/usr/share/man/man1/erb.1 + # remove all bundled gems to avoid conflicts with ruby-* Arch packages rm -r "${pkgdir}"/usr/lib/ruby/gems/${rubyver}/gems/* + rm "${pkgdir}"/usr/lib/ruby/gems/${rubyver}/specifications/*.gemspec + rm "${pkgdir}"/usr/lib/ruby/gems/${rubyver}/cache/*.gem } package_ruby-docs() { diff --git a/libre/ruby/add-json_pure.patch b/libre/ruby/add-json_pure.patch index 5529cc58c..96017494d 100644 --- a/libre/ruby/add-json_pure.patch +++ b/libre/ruby/add-json_pure.patch @@ -2,16 +2,16 @@ diff --git a/doc/maintainers.rdoc b/doc/maintainers.rdoc index 268293a..8063bbf 100644 --- a/doc/maintainers.rdoc +++ b/doc/maintainers.rdoc -@@ -310,6 +310,9 @@ Zachary Scott (zzak) +@@ -348,6 +348,9 @@ 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 - [ext/openssl] - Kazuki Yamaguchi (rhe) - https://github.com/ruby/openssl + [ext/nkf] + NARUSE, Yui (naruse) + https://github.com/ruby/nkf diff --git a/lib/json/.document b/lib/json/.document new file mode 100644 index 0000000000..7ae6b614de 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' 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 -- cgit v1.2.3