From a5833b063ee315f6ff50f3f12934360fedee3e366ad1d1ee33d99dc94dd0d77d Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Thu, 27 Oct 2016 10:54:10 +0000 Subject: [PATCH] bsc#1007196 OBS-URL: https://build.opensuse.org/package/show/devel:languages:misc/clisp?expand=0&rev=51 --- clisp.changes | 6 ++++++ clisp.spec | 10 ++++++++-- modules_readline_readline.lisp.patch | 15 +++++++++++++++ 3 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 modules_readline_readline.lisp.patch diff --git a/clisp.changes b/clisp.changes index 3d831b9..e46a82a 100644 --- a/clisp.changes +++ b/clisp.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Oct 27 10:52:29 UTC 2016 - werner@suse.de + +- Add patch modules_readline_readline.lisp.patch to reflect the + API change in libreadline in rl_readline_state(3) (boo#1007196) + ------------------------------------------------------------------- Fri Aug 14 12:53:11 UTC 2015 - normand@linux.vnet.ibm.com diff --git a/clisp.spec b/clisp.spec index 68fe361..115fa53 100644 --- a/clisp.spec +++ b/clisp.spec @@ -1,7 +1,7 @@ # # spec file for package clisp # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -55,6 +55,8 @@ Patch14: clisp-hostname.patch # PATCH-EXTEND-UPSTREAM Make armv7l work Patch15: clisp-arm.patch Patch16: clisp-db6.diff +#PATCH-FIX-UPSTREAM boo#1007196 +Patch17: modules_readline_readline.lisp.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %global vimdir %{_datadir}/vim/site/after/syntax @@ -83,6 +85,7 @@ BuildRequires: xorg-x11-devel # to BuildRequires # %define debug no +%global rlver %(rpm -q --qf '%{VERSION}' readline-devel | sed 's/\\.//g') Requires(pre): vim Requires(pre): vim-data Requires: ffcall @@ -140,7 +143,10 @@ contains two nice applications. %endif %patch14 -p0 %patch15 -p0 -%patch -P 16 -p1 +%patch16 -p1 +%if 0%{rlver} >= 70 +%patch17 -p0 +%endif %build # diff --git a/modules_readline_readline.lisp.patch b/modules_readline_readline.lisp.patch new file mode 100644 index 0000000..0d63767 --- /dev/null +++ b/modules_readline_readline.lisp.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.