diff --git a/srcpkgs/ruby/patches/fiddle-libffi-version.patch b/srcpkgs/ruby/patches/fiddle-libffi-version.patch deleted file mode 100644 index db5b516c030..00000000000 --- a/srcpkgs/ruby/patches/fiddle-libffi-version.patch +++ /dev/null @@ -1,14 +0,0 @@ -Patch for ruby 2.1.2, upstream for next 2.1.x. - ---- ext/fiddle/extconf.rb 2014/06/20 22:48:41 46484 -+++ ext/fiddle/extconf.rb 2014/06/21 03:54:19 46485 -@@ -7,7 +7,8 @@ - pkg_config("libffi") - if ver = pkg_config("libffi", "modversion") - ver = ver.gsub(/-rc\d+/, '') # If ver contains rc version, just ignored. -- $defs.push(%{-DRUBY_LIBFFI_MODVERSION=#{ '%d%03d%03d' % ver.split('.') }}) -+ ver = (ver.split('.') + [0,0])[0,3] -+ $defs.push(%{-DRUBY_LIBFFI_MODVERSION=#{ '%d%03d%03d' % ver }}) - end - - unless have_header('ffi.h') diff --git a/srcpkgs/ruby/template b/srcpkgs/ruby/template index 14aa4ca1841..b03fb5f0a2b 100644 --- a/srcpkgs/ruby/template +++ b/srcpkgs/ruby/template @@ -1,6 +1,6 @@ # Template build file for 'ruby'. pkgname=ruby -version=2.1.2 +version=2.1.3 _ruby_abiver=2.1.0 revision=1 build_style=gnu-configure @@ -11,7 +11,7 @@ homepage="http://www.ruby-lang.org/en/" maintainer="Juan RP " license="BSD" distfiles="ftp://ftp.ruby-lang.org/pub/ruby/2.1/${pkgname}-${version}.tar.bz2" -checksum=6948b02570cdfb89a8313675d4aa665405900e27423db408401473f30fc6e901 +checksum=36ce72f84ae4129f6cc66e33077a79d87b018ea7bf1dbc3d353604bf006f76d6 hostmakedepends="pkg-config bison groff doxygen graphviz" makedepends="zlib-devel readline-devel>=6.3 libffi-devel libressl-devel @@ -19,14 +19,12 @@ makedepends="zlib-devel readline-devel>=6.3 libffi-devel libressl-devel replaces="ruby-rdoc>=0 ruby-gems>=0 ruby-irb>=0" if [ "$CROSS_BUILD" ]; then - hostmakedepends+=" ruby>=${version}" + hostmakedepends+=" ruby" fi pre_build() { # Force getaddrinfo detection. sed -e 's,\(checking_for("wide getaddrinfo") {try_\)run,\1link,' -i ext/socket/extconf.rb - # Fix for readline>=6.3 - sed -e 's,(Function \*),,g' -i ext/readline/readline.c } ruby-devel-docs_package() { @@ -36,7 +34,6 @@ ruby-devel-docs_package() { vmove usr/share/doc } } - ruby-devel_package() { depends="ruby-${version}_${revision}" short_desc+=" - development files" @@ -47,7 +44,6 @@ ruby-devel_package() { vmove usr/lib/pkgconfig } } - ruby-ri_package() { depends="ruby-${version}_${revision}" short_desc="Ruby Interactive reference"