diff options
| -rw-r--r-- | libre-testing/ruby/PKGBUILD | 150 | ||||
| -rw-r--r-- | libre-testing/ruby/add-json_pure.patch | 22 | ||||
| -rw-r--r-- | libre-testing/ruby/json-libre.patch | 32 | ||||
| -rw-r--r-- | libre-testing/ruby/remove-json-ext.patch | 94 |
4 files changed, 298 insertions, 0 deletions
diff --git a/libre-testing/ruby/PKGBUILD b/libre-testing/ruby/PKGBUILD new file mode 100644 index 000000000..b56dd678f --- /dev/null +++ b/libre-testing/ruby/PKGBUILD @@ -0,0 +1,150 @@ +# Contributor (Arch): Thomas Dziedzic <gostrc@gmail.com> +# Contributor (Arch): Allan McRae <allan@archlinux.org> +# Contributor (Arch): John Proctor <jproctor@prium.net> +# Contributor (Arch): Jeramy Rutley <jrutley@gmail.com> + +# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> +# Contributor: Daniel Milewski <niitotantei@riseup.net> +# Contributor: André Silva <emulatorman@hyperbola.info> +# Contributor: Luke Shumaker <lukeshu@parabola.nu> +# Contributor: fauno <fauno@parabola.nu> + +# Rationale for inclusion in [libre]: Problematic license of +# generator.c in bundled json extension. +# +# https://labs.parabola.nu/issues/674 +# https://bugs.ruby-lang.org/issues/11844 +# https://github.com/flori/json/issues/277 + + +pkgname=(ruby ruby-docs) +pkgver=2.6.3 +_jsonver=2.1.0 +pkgrel=1 +pkgrel+=.par2 +_srcrel=1 # increment this to rebuild the sourceball without bumping pkgver +arch=(x86_64) +arch+=(i686 armv7h) +url='http://www.ruby-lang.org/en/' +license=(BSD2 custom) +makedepends=(gdbm openssl libffi doxygen graphviz libyaml ttf-dejavu tk) +options=(!emptydirs) +source=(https://cache.ruby-lang.org/pub/ruby/${pkgver:0:3}/ruby-${pkgver}.tar.xz + json-${_jsonver}.tar.gz::https://github.com/flori/json/archive/v${_jsonver}.tar.gz + remove-json-ext.patch + add-json_pure.patch + json-libre.patch) +sha512sums=('959a613f5cf5b3185a1d7a7ba0e1921166b3930f30461b391b1c9fcfe396f56dc3c736123dfc7b4e72c32a97dc5a1eb1fd7f09bcc3793a3c5526f6644ba421c8' + '6019cc26a0919e4d39ae0bf737b51cd9a474c74a55d25f6931ac04d61826bb810d063190a80a29810e57d7457d1a247acd82fd78de2c4c01acb7d73ee9fde603' + '412dff58c77f6cbc598bf49fb09cb416ad88635e9213acc60a1d103e5d093b2d80260c41e07fbc0634047c655756f5bdd8b2f5e59ae8e4b992b598b251b4c3e9' + '303172561a4ba54515fddfd9ea7e0c833e550b0ae5e9f331956f178f8c5e20aa0e3c4036251ddfd04312769ef7d71d83fde0afe64f6fa8e9052ca5a294c62927' + '582017bd0f98878c0ac6f4625854422662d83ae6274a34762082a720052023780dceb17694b1f4e18d9a0dcbb525990341176eac31040aa63099a8b3a8d52071') + + +prepare() { + # Start with the vanilla version of json + cd "$srcdir/json-${_jsonver}" + # Modify it so that 'json' doesn't try to load (non-free!) 'json/ext' + rm -rf -- json.gemspec ext lib/json/ext* + patch -p1 -i ../json-libre.patch + + # Now modify the ruby sources to include the json_pure lib instead + # of the json ext + cd "$srcdir/ruby-${pkgver}" + # remove the json ext + rm -rv ext/json test/json + patch -p1 -i ../remove-json-ext.patch + # and insert the json_pure lib + cp -r ../json-${_jsonver}/lib/* -t lib/ + cp ../json-${_jsonver}/json_pure.gemspec -t lib/json/ + cp -rT ../json-${_jsonver}/tests test/json + 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() { + cd ruby-${pkgver} + + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --sharedstatedir=/var/lib \ + --libexecdir=/usr/lib/ruby \ + --enable-shared \ + --disable-rpath \ + --with-dbm-type=gdbm_compat + + make +} + +check() { + cd ruby-${pkgver} + + make test +} + +package_ruby() { + pkgdesc='An object-oriented language for quick and easy programming' + depends=(gdbm openssl libffi libyaml gmp zlib) + optdepends=( + 'rubygems: Ruby package manager' + 'ruby-docs: Ruby documentation' + 'tk: for Ruby/TK' + ) + + cd ruby-${pkgver} + + make DESTDIR="${pkgdir}" install-nodoc + + install -D -m644 COPYING "${pkgdir}/usr/share/licenses/ruby/LICENSE" + install -D -m644 BSDL "${pkgdir}/usr/share/licenses/ruby/BSDL" + + rubyver=${pkgver:0:3}.0 + + # remove rubygems as it shipped as a separate package + rm -r "${pkgdir}"/usr/lib/ruby/${rubyver}/{rubygems,rubygems.rb} + rm "${pkgdir}"/usr/bin/gem + + # remove bundler as it shipped as a separate package + 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 + + # remove irb as it is a separate package now + rm -r "${pkgdir}"/usr/lib/ruby/${rubyver}/{irb,irb.rb} + rm "${pkgdir}"/usr/bin/irb + rm "${pkgdir}"/usr/lib/ruby/gems/${rubyver}/specifications/default/irb-*.gemspec + rm "${pkgdir}"/usr/share/man/man1/irb.1 + + # remove all bundled gems to avoid conflicts with ruby-* Arch packages + rm -r "${pkgdir}"/usr/lib/ruby/gems/${rubyver}/gems/* +} + +package_ruby-docs() { + pkgdesc='Documentation files for ruby' + + cd ruby-${pkgver} + + make DESTDIR="${pkgdir}" install-doc install-capi + + install -D -m644 COPYING "${pkgdir}/usr/share/licenses/ruby-docs/LICENSE" + install -D -m644 BSDL "${pkgdir}/usr/share/licenses/ruby-docs/BSDL" + + # sometimes it installs ruby/capi/doxygen_objdb_XXXXXXX.tmp; + # otherwise /usr/share/doc is empty + rm -rf "$pkgdir/usr/share/doc" +} diff --git a/libre-testing/ruby/add-json_pure.patch b/libre-testing/ruby/add-json_pure.patch new file mode 100644 index 000000000..5630451ea --- /dev/null +++ b/libre-testing/ruby/add-json_pure.patch @@ -0,0 +1,22 @@ +diff --git a/doc/maintainers.rdoc b/doc/maintainers.rdoc +index ec6a6b7134..11a1079e57 100644 +--- a/doc/maintainers.rdoc ++++ b/doc/maintainers.rdoc +@@ -72,6 +72,8 @@ Zachary Scott (zzak) + Akinori MUSHA (knu) + [lib/irb.rb, lib/irb/*] + Keiju ISHITSUKA (keiju) ++[lib/json] ++ NARUSE, Yui (naruse) + [lib/logger.rb] + Naotoshi Seo (sonots) + [lib/mathn.rb] +diff --git a/lib/json/.document b/lib/json/.document +new file mode 100644 +index 0000000000..7ae6b614de +--- /dev/null ++++ b/lib/json/.document +@@ -0,0 +1,3 @@ ++*.rb ++add/*.rb ++pure/*.rb diff --git a/libre-testing/ruby/json-libre.patch b/libre-testing/ruby/json-libre.patch new file mode 100644 index 000000000..04eced89d --- /dev/null +++ b/libre-testing/ruby/json-libre.patch @@ -0,0 +1,32 @@ +--- 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 12:55:21.359687486 -0500 +@@ -1,14 +1,5 @@ +-case ENV['JSON'] +-when 'pure' +- $:.unshift 'lib' +- require 'json/pure' +-when 'ext' +- $:.unshift 'ext', 'lib' +- require 'json/ext' +-else +- $:.unshift 'ext', 'lib' +- require 'json' +-end ++$:.unshift 'lib' ++require 'json' + + require 'test/unit' + begin diff --git a/libre-testing/ruby/remove-json-ext.patch b/libre-testing/ruby/remove-json-ext.patch new file mode 100644 index 000000000..ba168311a --- /dev/null +++ b/libre-testing/ruby/remove-json-ext.patch @@ -0,0 +1,94 @@ +--- 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. +- +- >>> +- Copyright 2001-2004 Unicode, Inc. +- +- Disclaimer:: +- +- This source code is provided as is by Unicode, Inc. No claims are +- made as to fitness for any particular purpose. No warranties of any +- kind are expressed or implied. The recipient agrees to determine +- applicability of information provided. If this file has been +- purchased on magnetic or optical media from Unicode, Inc., the +- sole remedy for any claim will be exchange of defective media +- within 90 days of receipt. +- +- Limitations on Rights to Redistribute This Code:: +- +- Unicode, Inc. hereby grants the right to freely use the information +- supplied in this file in the creation of products supporting the +- Unicode Standard, and to make copies of this file in any form +- 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:: +--- a/common.mk ++++ b/common.mk +@@ -989,8 +989,7 @@ srcs-ext: $(EXT_SRCS) + realclean-srcs-ext:: + $(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}" \ + RUBY="$(BASERUBY)" PATH_SEPARATOR="$(PATH_SEPARATOR)" + +-$(srcdir)/ext/json/parser/parser.c: $(srcdir)/ext/json/parser/parser.rl +- $(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 + $(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] + Nobuyuki Nakada (nobu) + https://github.com/ruby/io-console +-[ext/json] +- NARUSE, Yui (naruse), Hiroshi SHIBATA (hsbt) +- https://github.com/flori/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 @@ + io/console/console.c + io/nonblock/nonblock.c + io/wait/wait.c +-json/generator/generator.c +-json/lib +-json/parser/parser.c + 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 +@@ -20,9 +20,6 @@ + #io/console + #io/nonblock + #io/wait +-#json +-#json/generator +-#json/parser + #nkf + #objspace + #openssl |