[packages/pl] - updated to 6.6.2 - added readline patch (remove duplicate, now conflicting declarations)

qboosh qboosh at pld-linux.org
Fri Mar 7 20:26:08 CET 2014


commit 767486c466f94a9d077f541240116ea9c4811e93
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Fri Mar 7 20:28:54 2014 +0100

    - updated to 6.6.2
    - added readline patch (remove duplicate, now conflicting declarations)

 pl-readline.patch | 12 ++++++++++++
 pl.spec           |  6 ++++--
 2 files changed, 16 insertions(+), 2 deletions(-)
---
diff --git a/pl.spec b/pl.spec
index 86519ee..ed4b8b7 100644
--- a/pl.spec
+++ b/pl.spec
@@ -19,16 +19,17 @@
 Summary:	SWI Prolog Language
 Summary(pl.UTF-8):	Język SWI Prolog
 Name:		pl
-Version:	6.6.1
+Version:	6.6.2
 Release:	1
 License:	LGPL v2.1+
 Group:		Development/Languages
 #Source0Download: http://www.swi-prolog.org/download/stable
 Source0:	http://www.swi-prolog.org/download/stable/src/%{name}-%{version}.tar.gz
-# Source0-md5:	20d9d0d24279d2fd94b64f279dedf35e
+# Source0-md5:	c59d5a614ec1c063d64c6bd31d3e7e23
 Patch0:		%{name}-clib-configure.patch
 Patch1:		%{name}-xpce-install.patch
 Patch2:		%{name}-format.patch
+Patch3:		%{name}-readline.patch
 URL:		http://www.swi-prolog.org/
 BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
@@ -152,6 +153,7 @@ Prolog.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %{__mv} src/Tests/core/test_d_break.pl{,disabled}
 
diff --git a/pl-readline.patch b/pl-readline.patch
new file mode 100644
index 0000000..2151546
--- /dev/null
+++ b/pl-readline.patch
@@ -0,0 +1,12 @@
+--- pl-6.6.2/src/os/pl-rl.c.orig	2014-03-04 11:37:29.000000000 +0100
++++ pl-6.6.2/src/os/pl-rl.c	2014-03-07 19:54:08.411775445 +0100
+@@ -94,9 +94,6 @@
+ #endif
+ 					/* missing prototypes in older */
+ 					/* readline.h versions */
+-extern int rl_begin_undo_group(void);	/* delete when conflict arrises! */
+-extern int rl_end_undo_group(void);
+-extern Function *rl_event_hook;
+ #ifndef HAVE_RL_FILENAME_COMPLETION_FUNCTION
+ #define rl_filename_completion_function filename_completion_function
+ extern char *filename_completion_function(const char *, int);
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/pl.git/commitdiff/767486c466f94a9d077f541240116ea9c4811e93



More information about the pld-cvs-commit mailing list