diff options
Diffstat (limited to 'libre')
| -rw-r--r-- | libre/ruby/PKGBUILD | 8 | ||||
| -rw-r--r-- | libre/ruby/remove-nonfree-ruby-references.patch | 48 |
2 files changed, 24 insertions, 32 deletions
diff --git a/libre/ruby/PKGBUILD b/libre/ruby/PKGBUILD index 3ffd06cdb..1ffa8e54c 100644 --- a/libre/ruby/PKGBUILD +++ b/libre/ruby/PKGBUILD @@ -6,7 +6,7 @@ # Maintainer: André Silva <emulatorman@parabola.nu> pkgname=(ruby ruby-docs) -pkgver=2.2.4 +pkgver=2.3.0 _jsonver=1.8.1 pkgrel=1.parabola1 arch=(i686 x86_64) @@ -21,12 +21,12 @@ source=(https://repo.parabola.nu/other/ruby-libre/ruby-libre-${pkgver}.tar.xz remove-nonfree-json-references.patch remove-nonfree-ruby-references.patch gemrc) -mksha1sums=('9216cf34df7fd5ce8059a6403951d6d47964442a' +mksha1sums=('96e620e38af351c8da63e40cfe217ec79f912ba1' '043ed2df4b0ce2174c9c020ffcb4ec31f9fde560') -sha1sums=('6a0daa9aec7a78a56afb2236d7f506ff4ab07bab' +sha1sums=('0310716e25f732f711d023ee76fb7ef51ffdf291' '2cd288d00c5211e4c9d9338080b30af65cbb143a' '0ba1010a271e6fcc1734f7382b99963f46133ea5' - '57b7f137daf2e925739e8c1d1471b13b9bfa8bbd' + 'da8bdd298104be19221d5ba5353b992d07943840' 'dc536754c8fac2c3d82965c5a708cd8f79562d98') mksource() { diff --git a/libre/ruby/remove-nonfree-ruby-references.patch b/libre/ruby/remove-nonfree-ruby-references.patch index 77966827c..057a3b0ee 100644 --- a/libre/ruby/remove-nonfree-ruby-references.patch +++ b/libre/ruby/remove-nonfree-ruby-references.patch @@ -1,6 +1,6 @@ -diff -Nur ruby-2.2.3.orig/common.mk ruby-2.2.3/common.mk ---- ruby-2.2.3.orig/common.mk 2015-08-15 15:10:16.000000000 -0300 -+++ ruby-2.2.3/common.mk 2015-08-20 01:58:55.065621626 -0300 +diff -Nur ruby-2.3.0.orig/common.mk ruby-2.3.0/common.mk +--- ruby-2.3.0.orig/common.mk 2015-12-24 04:21:30.000000000 -0300 ++++ ruby-2.3.0/common.mk 2016-01-01 00:58:13.284858253 -0300 @@ -15,7 +15,7 @@ RUBYLIB = $(PATH_SEPARATOR) @@ -8,9 +8,9 @@ diff -Nur ruby-2.2.3.orig/common.mk ruby-2.2.3/common.mk -RUN_OPTS = --disable-gems +RUN_OPTS = --disable-gems -I$(srcdir)/../json-1.8.1/lib - SPEC_GIT_BASE = git://github.com/ruby - MSPEC_GIT_URL = $(SPEC_GIT_BASE)/mspec.git -@@ -729,8 +729,6 @@ + GEM_HOME = + GEM_PATH = +@@ -781,8 +781,6 @@ srcs-ext: $(EXT_SRCS) @@ -19,8 +19,8 @@ diff -Nur ruby-2.2.3.orig/common.mk ruby-2.2.3/common.mk LIB_SRCS = $(srcdir)/lib/unicode_normalize/tables.rb srcs-lib: $(LIB_SRCS) -@@ -817,11 +815,6 @@ - top_srcdir=../.. srcdir=. \ +@@ -875,11 +873,6 @@ + Q=$(Q) ECHO=$(ECHO) RM="$(RM)" top_srcdir=../.. srcdir=. VPATH="$(PWD)" \ RUBY="$(BASERUBY)" PATH_SEPARATOR="$(PATH_SEPARATOR)" -$(srcdir)/ext/json/parser/parser.c: $(srcdir)/ext/json/parser/parser.rl @@ -31,14 +31,6 @@ diff -Nur ruby-2.2.3.orig/common.mk ruby-2.2.3/common.mk $(srcdir)/ext/rbconfig/sizeof/sizes.c: $(srcdir)/ext/rbconfig/sizeof/depend \ $(srcdir)/tool/generic_erb.rb $(srcdir)/template/sizes.c.tmpl $(srcdir)/configure.in $(ECHO) generating $@ -diff -Nur ruby-2.2.3.orig/defs/default_gems ruby-2.2.3/defs/default_gems ---- ruby-2.2.3.orig/defs/default_gems 2014-07-15 00:43:04.000000000 -0300 -+++ ruby-2.2.3/defs/default_gems 2015-08-20 01:58:55.065621626 -0300 -@@ -1,4 +1,3 @@ - # gem base directory versioning file [executable files under bin] - rake lib/rake lib/rake.rb [rake] - rdoc lib/rdoc lib/rdoc.rb [rdoc ri] --json ext/json ext/json/lib/json/version.rb diff -Nur ruby-2.2.3.orig/ext/.document ruby-2.2.3/ext/.document --- ruby-2.2.3.orig/ext/.document 2014-08-02 11:55:36.000000000 -0300 +++ ruby-2.2.3/ext/.document 2015-08-20 01:58:55.065621626 -0300 @@ -52,18 +44,18 @@ diff -Nur ruby-2.2.3.orig/ext/.document ruby-2.2.3/ext/.document mathn/complex/complex.c mathn/rational/rational.c nkf/lib -diff -Nur ruby-2.2.3.orig/gems/bundled_gems ruby-2.2.3/gems/bundled_gems ---- ruby-2.2.3.orig/gems/bundled_gems 2014-12-12 11:00:15.000000000 -0200 -+++ ruby-2.2.3/gems/bundled_gems 2015-08-20 01:58:55.065621626 -0300 -@@ -1,3 +1,4 @@ - power_assert 0.2.2 - test-unit 3.0.8 - minitest 5.4.3 +diff -Nur ruby-2.3.0.orig/gems/bundled_gems ruby-2.3.0/gems/bundled_gems +--- ruby-2.3.0.orig/gems/bundled_gems 2015-12-22 14:30:22.000000000 -0300 ++++ ruby-2.3.0/gems/bundled_gems 2016-01-01 00:59:51.899771661 -0300 +@@ -4,3 +4,4 @@ + rake 10.4.2 + net-telnet 0.1.1 + did_you_mean 1.0.0 +json 1.8.1 -diff -Nur ruby-2.2.3.orig/test/ruby/test_module.rb ruby-2.2.3/test/ruby/test_module.rb ---- ruby-2.2.3.orig/test/ruby/test_module.rb 2015-04-12 12:41:32.000000000 -0300 -+++ ruby-2.2.3/test/ruby/test_module.rb 2015-08-20 01:58:55.065621626 -0300 -@@ -202,7 +202,6 @@ +diff -Nur ruby-2.3.0.orig/test/ruby/test_module.rb ruby-2.3.0/test/ruby/test_module.rb +--- ruby-2.3.0.orig/test/ruby/test_module.rb 2015-12-17 23:32:17.000000000 -0300 ++++ ruby-2.3.0/test/ruby/test_module.rb 2016-01-01 00:58:15.961386861 -0300 +@@ -211,7 +211,6 @@ ancestors = Object.ancestors mixins = ancestors - [Object, Kernel, BasicObject] @@ -71,7 +63,7 @@ diff -Nur ruby-2.2.3.orig/test/ruby/test_module.rb ruby-2.2.3/test/ruby/test_mod assert_equal([Object, Kernel, BasicObject], ancestors - mixins) assert_equal([String, Comparable, Object, Kernel, BasicObject], String.ancestors - mixins) end -@@ -436,7 +435,6 @@ +@@ -445,7 +444,6 @@ assert_equal([Mixin], User.included_modules) mixins = Object.included_modules - [Kernel] |