Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=eeb63c74087a08000022f74472d11bd861c341b1
commit eeb63c74087a08000022f74472d11bd861c341b1 Author: crazy <[email protected]> Date: Sun Apr 16 09:10:03 2017 +0200 ruby-2.4.1-1-x86_64 * Version bump diff --git a/source/devel/ruby/FrugalBuild b/source/devel/ruby/FrugalBuild index 218c819..6fb5666 100644 --- a/source/devel/ruby/FrugalBuild +++ b/source/devel/ruby/FrugalBuild @@ -2,11 +2,8 @@ # Maintainer: crazy <[email protected]> pkgname=ruby -pkgver=2.4.0 -rubyver=2.4.0 -#TODO remove this after upstream fixes packaging -pkgpatch= -pkgrel=2 +pkgver=2.4.1 +pkgrel=1 pkgdesc="An object-oriented programming language." url="http://www.ruby-lang.org/"; depends=('libxml2>=2.9.4-3' 'zlib>=1.2.11-2' 'db>=6.2.23' 'readline>=6.3-14' \ @@ -15,12 +12,11 @@ groups=('devel') archs=("x86_64") _F_archive_grepv="preview\|rc" up2date="Flasttar ftp://ftp.ruby-lang.org/pub/ruby/"; -source=(ftp://ftp.ruby-lang.org/pub/ruby/ruby-${pkgver}$pkgpatch.tar.xz) -sha1sums=('038804bbd0e77508dd2510b729a9f3b325489b2e') +source=(ftp://ftp.ruby-lang.org/pub/${pkgname}/${pkgname}-${pkgver}.tar.xz) +sha1sums=('eb3e25346431214379e3b92c6f6b6e02f7b2503f') replaces=('rake' 'racc' 'rdoc' 'ruby-tk') provides=("${replaces[@]}") conflicts=("${replaces[@]}") -_F_cd_path="ruby-$pkgver$pkgpatch" Fconfopts+=" --enable-shared --enable-debug-env" options+=('static') diff --git a/source/devel/ruby/have-builtins.patch b/source/devel/ruby/have-builtins.patch deleted file mode 100644 index da7e980..0000000 --- a/source/devel/ruby/have-builtins.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 98e565ec78cb4a07ffde8589ac4581fca31e9c17 Mon Sep 17 00:00:00 2001 -From: mrkn <mrkn@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> -Date: Thu, 7 Jan 2016 13:35:32 +0000 -Subject: [PATCH] * ruby.h: undef HAVE_BUILTIN___BUILTIN_CHOOSE_EXPR_CONSTANT_P - and HAVE_BUILTIN___BUILTIN_TYPES_COMPATIBLE_P on C++. [ruby-core:72736] - [Bug #11962] - -git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53455 b2dd03c8-39d4-4d8f-98ff-823fe69b080e ---- - ChangeLog | 6 ++++++ - include/ruby/ruby.h | 7 +++++++ - 2 files changed, 13 insertions(+) - -diff --git a/include/ruby/ruby.h b/include/ruby/ruby.h -index 7aabf5b..82dca14 100644 ---- a/include/ruby/ruby.h -+++ b/include/ruby/ruby.h -@@ -26,6 +26,13 @@ extern "C" { - #include RUBY_EXTCONF_H - #endif - -+#if defined(__cplusplus) -+/* __builtin_choose_expr and __builtin_types_compatible aren't available -+ * on C++. See https://gcc.gnu.org/onlinedocs/gcc/Other-Builtins.html */ -+# undef HAVE_BUILTIN___BUILTIN_CHOOSE_EXPR_CONSTANT_P -+# undef HAVE_BUILTIN___BUILTIN_TYPES_COMPATIBLE_P -+#endif -+ - #include "defines.h" - - #define NORETURN_STYLE_NEW 1 _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
