- rel 4; builds with readline 7; likely software depending on clisp will need rebuild

diff --git a/clisp-readline.patch b/clisp-readline.patch
new file mode 100644 (file)
index 0000000..19c54f9
--- /dev/null
+++ b/clisp-readline.patch
@@ -0,0 +1,15 @@
+$NetBSD: patch-modules_readline_readline.lisp,v 1.1 2016/09/20 14:10:25 wiz Exp $
+
+rl_readline_state changed from int to unsigned long in readline-7.0.
+
+--- modules/readline/readline.lisp.orig        2010-01-06 22:18:03.000000000 +0000
++++ modules/readline/readline.lisp
+@@ -424,7 +424,7 @@ name in ~/.inputrc. This is preferred wa
+    "The version of this incarnation of the readline library, e.g., 0x0402."))
+ (def-c-var gnu-readline-p (:name "rl_gnu_readline_p") (:type int)
+   (:documentation "True if this is real GNU readline."))
+-(def-c-var readline-state (:name "rl_readline_state") (:type int)
++(def-c-var readline-state (:name "rl_readline_state") (:type ulong)
+   (:documentation "Flags word encapsulating the current readline state."))
+ (def-c-var editing-mode (:name "rl_editing_mode") (:type int)
+   (:documentation "Says which editing mode readline is currently using.

diff --git a/clisp.spec b/clisp.spec
index 7db412a20bcbb70545d8173eceea84c0aa028237..b4353c5a3ad362b2f56dd6c6a1109251cf2da912 100644 (file)
--- a/clisp.spec
+++ b/clisp.spec
@@ -9,7 +9,7 @@ Summary(pl.UTF-8):      Implementacja Common Lisp (ANSI CL)
 Summary(pt_BR.UTF-8):  Implementação do Common Lisp (ANSI CL)
 Name:          clisp
 Version:       2.49
-Release:       3
+Release:       4
 License:       GPL
 Group:         Development/Languages
 Source0:       http://download.sourceforge.net/clisp/%{name}-%{version}.tar.bz2
@@ -17,6 +17,8 @@ Source0:      http://download.sourceforge.net/clisp/%{name}-%{version}.tar.bz2
 Patch0:                %{name}-shell.patch
 Patch1:                %{name}-alpha.patch
 Patch2:                %{name}-glibc.patch
+# https://sourceforge.net/p/clisp/bugs/688/attachment/patch-modules_readline_readline.lisp
+Patch3:                %{name}-readline.patch
 URL:           http://clisp.cons.org/
 BuildRequires: ffcall-devel
 BuildRequires: gettext-tools
@@ -81,6 +83,7 @@ software livre, distribuído sob os termos da GNU GPL.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p0
 
 # changing default -O to optflags causes memory fault on amd64
 # - so something is broken... code or compiler