[arch-commits] Commit in ruby/trunk (2 files)

[Anatol Pomozov]

    Date: Friday, May 9, 2014 @ 04:08:08
  Author: anatolik
Revision: 212144

upgpkg: ruby 2.1.2-1

Modified:
  ruby/trunk/PKGBUILD
Deleted:
  ruby/trunk/0001-Fix-undeclared-identifier-error-by-using-the-actual-.patch

-----------------------------------------------------------------+
 0001-Fix-undeclared-identifier-error-by-using-the-actual-.patch |   26 ----------
 PKGBUILD                                                        |   16 +-----
 2 files changed, 5 insertions(+), 37 deletions(-)

Deleted: 0001-Fix-undeclared-identifier-error-by-using-the-actual-.patch
===================================================================
--- 0001-Fix-undeclared-identifier-error-by-using-the-actual-.patch	2014-05-09 01:21:38 UTC (rev 212143)
+++ 0001-Fix-undeclared-identifier-error-by-using-the-actual-.patch	2014-05-09 02:08:08 UTC (rev 212144)
@@ -1,26 +0,0 @@
-From 4c4da3fc650a3595ecc06f49072f1ffae07db706 Mon Sep 17 00:00:00 2001
-From: Thomas Dziedzic <gostrc at gmail.com>
-Date: Sat, 1 Mar 2014 21:41:28 -0800
-Subject: [PATCH] Fix undeclared identifier error by using the actual type of
- rl_pre_input_hook
-
----
- ext/readline/readline.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/ext/readline/readline.c b/ext/readline/readline.c
-index 659adb9..7bc0eed 100644
---- a/ext/readline/readline.c
-+++ b/ext/readline/readline.c
-@@ -1974,7 +1974,7 @@ Init_readline()
- 
-     rl_attempted_completion_function = readline_attempted_completion_function;
- #if defined(HAVE_RL_PRE_INPUT_HOOK)
--    rl_pre_input_hook = (Function *)readline_pre_input_hook;
-+    rl_pre_input_hook = (rl_hook_func_t *)readline_pre_input_hook;
- #endif
- #ifdef HAVE_RL_CATCH_SIGNALS
-     rl_catch_signals = 0;
--- 
-1.9.0
-

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-05-09 01:21:38 UTC (rev 212143)
+++ PKGBUILD	2014-05-09 02:08:08 UTC (rev 212144)
@@ -4,8 +4,8 @@
 # Contributor: Jeramy Rutley <jrutley at gmail.com>
 
 pkgname=('ruby' 'ruby-docs')
-pkgver=2.1.1
-pkgrel=2
+pkgver=2.1.2
+pkgrel=1
 arch=('i686' 'x86_64')
 url='http://www.ruby-lang.org/en/'
 license=('BSD' 'custom')
@@ -16,21 +16,15 @@
 options=('!emptydirs' '!makeflags' 'staticlibs')
 source=("http://cache.ruby-lang.org/pub/ruby/${pkgver:0:3}/ruby-${pkgver}.tar.bz2"
         'gemrc'
-        'disable_sse2_on_i686.patch'
-        '0001-Fix-undeclared-identifier-error-by-using-the-actual-.patch')
-sha1sums=('a7fd539f64864bc00fc64444d2d814df6c19fd4a'
+        'disable_sse2_on_i686.patch')
+sha1sums=('29a615966c7feb6554be736e7dcd590c770ee692'
           'de4b760b7e2cd9af88ca67536ce37b950f1ee514'
-          '92592bca7e4bbe760202b1bc356a8e3a1a9446b5'
-          '52e10cb0577c1281c664e0f34b51053ef7644f33')
+          '92592bca7e4bbe760202b1bc356a8e3a1a9446b5')
 
 
 prepare() {
   cd ruby-${pkgver}
 
-  # readline 6.3 doesn't define Function anymore
-  # https://bugs.ruby-lang.org/issues/9578
-  patch -Np1 -i ${srcdir}/0001-Fix-undeclared-identifier-error-by-using-the-actual-.patch
-
   # FS#39470
   patch -Np1 -i ${srcdir}/disable_sse2_on_i686.patch
 }