diff --git a/srcpkgs/ruby/patches/cpp_isinf_isnan.patch b/srcpkgs/ruby/patches/cpp_isinf_isnan.patch deleted file mode 100644 index 533d45815a1..00000000000 --- a/srcpkgs/ruby/patches/cpp_isinf_isnan.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 01839b509c1bb914337124ac3d1f644b05ef90d8 Mon Sep 17 00:00:00 2001 -From: "Urabe, Shyouhei" -Date: Tue, 5 Jun 2018 10:26:06 +0900 -Subject: [PATCH] C++11 is so bad it introduces a nightmare. - -TL;DR see https://developers.redhat.com/blog/2016/02/29/why-cstdlib-is-more-complicated-than-you-might-think/ - - - `isnan` is something relatively new. We need to provide one for - those systems without it. However: - - X/Open defines `int isnan(double)`. Note the `int`. - - C99 defines `isnan(x)` to be a macro. - - C++11 nukes them all, undefines all the "masking macro"s, and - define its own `bool isnan(double)`. Note the `bool`. - - In C++, `int isnan(double)` and `bool isnan(double)` are - incompatible. - - So the mess. - -Signed-off-by: Urabe, Shyouhei ---- - include/ruby/missing.h | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/include/ruby/missing.h b/include/ruby/missing.h -index dc3fd502b5..8df917498e 100644 ---- include/ruby/missing.h.orig -+++ include/ruby/missing.h -@@ -168,6 +168,8 @@ RUBY_EXTERN const union bytesequence4_or_float rb_nan; - # include - # endif - # define isinf(x) (!finite(x) && !isnan(x)) -+# elif __cplusplus >= 201103L -+# include // it must include constexpr bool isinf(double); - # else - RUBY_EXTERN int isinf(double); - # endif -@@ -176,7 +178,11 @@ RUBY_EXTERN int isinf(double); - - #ifndef isnan - # ifndef HAVE_ISNAN -+# if __cplusplus >= 201103L -+# include // it must include constexpr bool isnan(double); -+# else - RUBY_EXTERN int isnan(double); -+# endif - # endif - #endif - --- diff --git a/srcpkgs/ruby/template b/srcpkgs/ruby/template index c11310f621a..e79b7a98708 100644 --- a/srcpkgs/ruby/template +++ b/srcpkgs/ruby/template @@ -2,8 +2,8 @@ _ruby_abiver=2.5.0 pkgname=ruby -version=2.5.1 -revision=5 +version=2.5.3 +revision=1 build_style=gnu-configure configure_args="--enable-shared --disable-rpath DOXYGEN=/usr/bin/doxygen DOT=/usr/bin/dot PKG_CONFIG=/usr/bin/pkg-config" @@ -13,7 +13,7 @@ homepage="http://www.ruby-lang.org/en/" maintainer="Leah Neukirchen " license="Ruby, BSD-2-Clause" distfiles="https://cache.ruby-lang.org/pub/ruby/${version%.*}/${pkgname}-${version}.tar.bz2" -checksum=0f5d20f012baca865381a055e73f22db814615fee3c68083182cb78a4b3b30cb +checksum=228a787ba68a7b20ac6e1d5af3d176d36e8ed600eb754d6325da341c3088ed76 hostmakedepends="pkg-config bison groff" makedepends="zlib-devel readline-devel libffi-devel libressl-devel