diff options
Diffstat (limited to 'ruby')
| -rw-r--r-- | ruby/.footprint | 8 | ||||
| -rw-r--r-- | ruby/.md5sum | 3 | ||||
| -rw-r--r-- | ruby/Pkgfile | 10 | ||||
| -rw-r--r-- | ruby/ruby-libffi_ver_string.patch | 13 |
4 files changed, 8 insertions, 26 deletions
diff --git a/ruby/.footprint b/ruby/.footprint index 869253c1e..da1c9c5ba 100644 --- a/ruby/.footprint +++ b/ruby/.footprint @@ -1043,9 +1043,9 @@ drwxr-xr-x root/root usr/lib/ruby/gems/2.1/gems/rdoc-4.1.0/ drwxr-xr-x root/root usr/lib/ruby/gems/2.1/gems/rdoc-4.1.0/bin/ -rwxr-xr-x root/root usr/lib/ruby/gems/2.1/gems/rdoc-4.1.0/bin/rdoc -rwxr-xr-x root/root usr/lib/ruby/gems/2.1/gems/rdoc-4.1.0/bin/ri -drwxr-xr-x root/root usr/lib/ruby/gems/2.1/gems/test-unit-2.1.2.0/ -drwxr-xr-x root/root usr/lib/ruby/gems/2.1/gems/test-unit-2.1.2.0/bin/ --rwxr-xr-x root/root usr/lib/ruby/gems/2.1/gems/test-unit-2.1.2.0/bin/testrb +drwxr-xr-x root/root usr/lib/ruby/gems/2.1/gems/test-unit-2.1.3.0/ +drwxr-xr-x root/root usr/lib/ruby/gems/2.1/gems/test-unit-2.1.3.0/bin/ +-rwxr-xr-x root/root usr/lib/ruby/gems/2.1/gems/test-unit-2.1.3.0/bin/testrb drwxr-xr-x root/root usr/lib/ruby/gems/2.1/specifications/ drwxr-xr-x root/root usr/lib/ruby/gems/2.1/specifications/default/ -rw-r--r-- root/root usr/lib/ruby/gems/2.1/specifications/default/bigdecimal-1.2.4.gemspec @@ -1055,7 +1055,7 @@ drwxr-xr-x root/root usr/lib/ruby/gems/2.1/specifications/default/ -rw-r--r-- root/root usr/lib/ruby/gems/2.1/specifications/default/psych-2.0.5.gemspec -rw-r--r-- root/root usr/lib/ruby/gems/2.1/specifications/default/rake-10.1.0.gemspec -rw-r--r-- root/root usr/lib/ruby/gems/2.1/specifications/default/rdoc-4.1.0.gemspec --rw-r--r-- root/root usr/lib/ruby/gems/2.1/specifications/default/test-unit-2.1.2.0.gemspec +-rw-r--r-- root/root usr/lib/ruby/gems/2.1/specifications/default/test-unit-2.1.3.0.gemspec drwxr-xr-x root/root usr/lib/ruby/site_ruby/ drwxr-xr-x root/root usr/lib/ruby/site_ruby/2.1/ drwxr-xr-x root/root usr/lib/ruby/site_ruby/2.1/x86_64-linux/ diff --git a/ruby/.md5sum b/ruby/.md5sum index f431dece1..e6bba8180 100644 --- a/ruby/.md5sum +++ b/ruby/.md5sum @@ -1,2 +1 @@ -ed9b8565bdeccb401d628ec8d54a0774 ruby-2.1.2.tar.bz2 -0fc7c8079e55abd9d1b23779852b441e ruby-libffi_ver_string.patch +fbc50ae56e7ac74501c8955abc248d34 ruby-2.1.3.tar.xz diff --git a/ruby/Pkgfile b/ruby/Pkgfile index 5998c44be..0f7194f3c 100644 --- a/ruby/Pkgfile +++ b/ruby/Pkgfile @@ -4,17 +4,13 @@ # Depends on: gdbm libgmp openssl readline zlib libffi libyaml name=ruby -version=2.1.2 -release=2 -source=(ftp://ftp.ruby-lang.org/pub/$name/2.1/$name-$version.tar.bz2 - $name-libffi_ver_string.patch) +version=2.1.3 +release=1 +source=(ftp://ftp.ruby-lang.org/pub/$name/2.1/$name-$version.tar.xz) build () { cd $name-$version - # fiddle requires a 3-digit version string form libffi - patch -p1 -i $SRC/$name-libffi_ver_string.patch - ./configure --prefix=/usr \ --mandir=/usr/man \ --enable-shared \ diff --git a/ruby/ruby-libffi_ver_string.patch b/ruby/ruby-libffi_ver_string.patch deleted file mode 100644 index 50679e283..000000000 --- a/ruby/ruby-libffi_ver_string.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -Nru ruby-2.1.2.orig/ext/fiddle/extconf.rb ruby-2.1.2/ext/fiddle/extconf.rb ---- ruby-2.1.2.orig/ext/fiddle/extconf.rb 2014-06-03 10:54:39.663000000 +0200 -+++ ruby-2.1.2/ext/fiddle/extconf.rb 2014-06-03 10:56:49.318000000 +0200 -@@ -7,6 +7,9 @@ - pkg_config("libffi") - if ver = pkg_config("libffi", "modversion") - ver = ver.gsub(/-rc\d+/, '') # If ver contains rc version, just ignored. -+ while ver.split('.').size < 3 -+ ver = ver + ".0" -+ end - $defs.push(%{-DRUBY_LIBFFI_MODVERSION=#{ '%d%03d%03d' % ver.split('.') }}) - end - |