From a09553ac6c535ce804805e7f143d7daa932efa25 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Thu, 20 Mar 2014 14:36:24 +0000
Subject: main/ruby: build fix for readline-6.3

---
 main/ruby/APKBUILD           | 12 ++++++++----
 main/ruby/readline-6.3.patch | 11 +++++++++++
 2 files changed, 19 insertions(+), 4 deletions(-)
 create mode 100644 main/ruby/readline-6.3.patch

(limited to 'main')

diff --git a/main/ruby/APKBUILD b/main/ruby/APKBUILD
index 4df8ab42e..0f448ab20 100644
--- a/main/ruby/APKBUILD
+++ b/main/ruby/APKBUILD
@@ -3,7 +3,7 @@
 pkgname=ruby
 pkgver=2.0.0_p353
 _pkgver=${pkgver/_/-}
-pkgrel=0
+pkgrel=1
 
 _abi=2.0.0
 
@@ -21,6 +21,7 @@ subpackages="$pkgname-doc $pkgname-dev $pkgname-irb
 	"
 patches="
 	ruby-io.patch
+	readline-6.3.patch
 	"
 source="ftp://ftp.ruby-lang.org/pub/ruby/${pkgver%.*}/${pkgname}-${_pkgver}.tar.bz2
 	$patches"
@@ -196,8 +197,11 @@ libs() {
 }
 
 md5sums="20eb8f067d20f6b76b7e16cce2a85a55  ruby-2.0.0-p353.tar.bz2
-7a4d86c7bf1ddad97f1cde52d849202f  ruby-io.patch"
+7a4d86c7bf1ddad97f1cde52d849202f  ruby-io.patch
+5f396d3d9825441a0d112c3a95885074  readline-6.3.patch"
 sha256sums="3de4e4d9aff4682fa4f8ed2b70bd0d746fae17452fc3d3a8e8f505ead9105ad9  ruby-2.0.0-p353.tar.bz2
-f8822c378f94ecce7214c370703db74723e2b3ce9efa956840036b1ffd8f32e1  ruby-io.patch"
+f8822c378f94ecce7214c370703db74723e2b3ce9efa956840036b1ffd8f32e1  ruby-io.patch
+e61a58c5f59500f636b0e6a62434f68c772e8d6af29acdc54afbaf3c3f911f06  readline-6.3.patch"
 sha512sums="52aa64c5991e61cc49c2062672554353bc88ab563da93a1d1591257153c2f6d8de02417a33d7a585eb0102f1079a993e46671fb6c97c62eac8615de567b575f2  ruby-2.0.0-p353.tar.bz2
-af001e5540e65e3a042d193a56cb46c3983de1c77ca89869406816561021480741b856996d252a97913fb882cb739949f6dbb6754790e54258b58a9d861be1ba  ruby-io.patch"
+af001e5540e65e3a042d193a56cb46c3983de1c77ca89869406816561021480741b856996d252a97913fb882cb739949f6dbb6754790e54258b58a9d861be1ba  ruby-io.patch
+439f14cb2718b03502018df42d27def3761c7bb67be5104769527d8f0d2342a92fd4f326748f03ab6287a864daa7b2d13f5539cc577bb9315b8af6b9d45600ac  readline-6.3.patch"
diff --git a/main/ruby/readline-6.3.patch b/main/ruby/readline-6.3.patch
new file mode 100644
index 000000000..809580df6
--- /dev/null
+++ b/main/ruby/readline-6.3.patch
@@ -0,0 +1,11 @@
+--- ./ext/readline/readline.c.orig
++++ ./ext/readline/readline.c
+@@ -1883,7 +1883,7 @@
+ 
+     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;
-- 
cgit v1.2.3