summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIgor <igor29768@gmail.com>2015-11-19 00:03:38 +0700
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2015-11-19 00:04:58 +0700
commit87c5d302fcece010e17b256db4d60f7ff5e40fec (patch)
tree608df01fe537edd6680222724bc5ce3299af00b1
parent2c54e81a6809eb7924c96bb3e6529fa7f9fb501c (diff)
downloadslackbuilds-87c5d302fcece010e17b256db4d60f7ff5e40fec.tar.gz
libraries/cln: Updated for version 1.3.4 + new maintainer.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
-rw-r--r--libraries/cln/cln.SlackBuild21
-rw-r--r--libraries/cln/cln.info10
-rw-r--r--libraries/cln/patches/cln.git-3c6225a8b3fedffaba7279d86db96b8f180b3f28.patch34
-rw-r--r--libraries/cln/patches/cln.git-4985c8a7895076df62758466c86cd1bc9df10438.patch159
4 files changed, 11 insertions, 213 deletions
diff --git a/libraries/cln/cln.SlackBuild b/libraries/cln/cln.SlackBuild
index 62c160f9a5..4cd6164218 100644
--- a/libraries/cln/cln.SlackBuild
+++ b/libraries/cln/cln.SlackBuild
@@ -22,8 +22,8 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=cln
-VERSION=1.3.2
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-1.3.4}
+BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@@ -66,12 +66,7 @@ find -L . \
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-o -perm 511 \) -exec chmod 755 {} \; -o \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-# Apply some patches from git
-for i in $CWD/patches/* ; do patch -p1 < $i ; done
-
-autoreconf -i
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
@@ -90,19 +85,15 @@ CXXFLAGS="$SLKCFLAGS" \
make
make install DESTDIR=$PKG
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
rm -f $PKG/usr/info/dir
gzip -9 $PKG/usr/info/*
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/examples
-cp -a \
- COPYING INSTALL* NEWS README TODO \
- $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
- examples/*.cc examples/*.1 \
- $PKG/usr/doc/$PRGNAM-$VERSION/examples
+cp -a COPYING INSTALL* NEWS README TODO $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a examples/*.cc examples/*.1 $PKG/usr/doc/$PRGNAM-$VERSION/examples
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
find $PKG/usr/man -type f -exec gzip -9 {} \;
diff --git a/libraries/cln/cln.info b/libraries/cln/cln.info
index 5b46ea3527..7c81fd2c94 100644
--- a/libraries/cln/cln.info
+++ b/libraries/cln/cln.info
@@ -1,10 +1,10 @@
PRGNAM="cln"
-VERSION="1.3.2"
+VERSION="1.3.4"
HOMEPAGE="http://www.ginac.de/CLN"
-DOWNLOAD="http://www.ginac.de/CLN/cln-1.3.2.tar.bz2"
-MD5SUM="d897cce94d9c34d106575ed4ec865d71"
+DOWNLOAD="http://www.ginac.de/CLN/cln-1.3.4.tar.bz2"
+MD5SUM="30ef9d2f02ef5c3f8d221a8692f8b28e"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
-MAINTAINER="Andrew Psaltis"
-EMAIL="ampsaltis@gmail.com"
+MAINTAINER="Igor"
+EMAIL="igor29768@gmail.com"
diff --git a/libraries/cln/patches/cln.git-3c6225a8b3fedffaba7279d86db96b8f180b3f28.patch b/libraries/cln/patches/cln.git-3c6225a8b3fedffaba7279d86db96b8f180b3f28.patch
deleted file mode 100644
index 42a5a1c3ed..0000000000
--- a/libraries/cln/patches/cln.git-3c6225a8b3fedffaba7279d86db96b8f180b3f28.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From: Richard Kreckel <kreckel@ginac.de>
-Date: Fri, 2 Mar 2012 22:40:34 +0000 (+0100)
-Subject: Fix bug in converting cl_LF to float, double.
-X-Git-Url: http://www.ginac.de/CLN/cln.git/?p=cln.git;a=commitdiff_plain;h=3c6225a8b3fedffaba7279d86db96b8f180b3f28
-
-Fix bug in converting cl_LF to float, double.
----
-
-diff --git a/src/float/conv/cl_LF_to_double.cc b/src/float/conv/cl_LF_to_double.cc
-index 078bd1b..f9f5e86 100644
---- a/src/float/conv/cl_LF_to_double.cc
-+++ b/src/float/conv/cl_LF_to_double.cc
-@@ -20,7 +20,7 @@ double double_approx (const cl_LF& x)
- {
- // x entpacken:
- var cl_signean sign;
-- var sintL exp;
-+ var sintE exp;
- var uintD* ptr;
- var uintC len;
- LF_decode(x, { return 0.0; }, sign=,exp=,ptr=,len=,);
-diff --git a/src/float/conv/cl_LF_to_float.cc b/src/float/conv/cl_LF_to_float.cc
-index 913b08e..b476d04 100644
---- a/src/float/conv/cl_LF_to_float.cc
-+++ b/src/float/conv/cl_LF_to_float.cc
-@@ -20,7 +20,7 @@ float float_approx (const cl_LF& x)
- {
- // x entpacken:
- var cl_signean sign;
-- var sintL exp;
-+ var sintE exp;
- var uintD* ptr;
- var uintC len;
- LF_decode(x, { return 0.0; }, sign=,exp=,ptr=,len=,);
diff --git a/libraries/cln/patches/cln.git-4985c8a7895076df62758466c86cd1bc9df10438.patch b/libraries/cln/patches/cln.git-4985c8a7895076df62758466c86cd1bc9df10438.patch
deleted file mode 100644
index c2109dc3f6..0000000000
--- a/libraries/cln/patches/cln.git-4985c8a7895076df62758466c86cd1bc9df10438.patch
+++ /dev/null
@@ -1,159 +0,0 @@
-From: Richard Kreckel <kreckel@ginac.de>
-Date: Sun, 18 Mar 2012 23:35:03 +0000 (+0100)
-Subject: Avoid input stream fail state when reading number at EOF.
-X-Git-Url: http://www.ginac.de/CLN/cln.git/?p=cln.git;a=commitdiff_plain;h=4985c8a7895076df62758466c86cd1bc9df10438
-
-Avoid input stream fail state when reading number at EOF.
-
-istream::get() puts the stream in fail state when trying to read at
-EOF. This is best avoided by first peek()ing what is available.
----
-
-diff --git a/README b/README
-index 7de3f55..d445d55 100644
---- a/README
-+++ b/README
-@@ -1,8 +1,8 @@
- Class Library for Numbers
-
- Copyright (c) Bruno Haible 1988-2008
--Copyright (c) Richard Kreckel 2000-2009
--Copyright (c) Alexei Sheplyakov 2008
-+Copyright (c) Richard Kreckel 2000-2012
-+Copyright (c) Alexei Sheplyakov 2008-2010
-
- GPL
-
-diff --git a/doc/cln.texi b/doc/cln.texi
-index 354cacc..d5ed502 100644
---- a/doc/cln.texi
-+++ b/doc/cln.texi
-@@ -36,7 +36,7 @@ Published by Bruno Haible, @code{<haible@@clisp.cons.org>} and
- Richard B. Kreckel, @code{<kreckel@@ginac.de>}.
-
- Copyright (C) Bruno Haible 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008.
--Copyright (C) Richard B. Kreckel 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011.
-+Copyright (C) Richard B. Kreckel 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012.
- Copyright (C) Alexei Sheplyakov 2008, 2010.
-
- Permission is granted to make and distribute verbatim copies of
-diff --git a/src/base/cl_free.cc b/src/base/cl_free.cc
-index ccda8af..a829aa2 100644
---- a/src/base/cl_free.cc
-+++ b/src/base/cl_free.cc
-@@ -34,8 +34,8 @@ void cl_free_heap_object (cl_heap* pointer)
- static const char * copyright_notice[] = {
- " \n"
- "Copyright (c) Bruno Haible 1988-2008 \n"
-- "Copyright (c) Richard Kreckel 2000-2009 \n"
-- "Copyright (c) Alexei Sheplyakov 2008 \n"
-+ "Copyright (c) Richard Kreckel 2000-2012 \n"
-+ "Copyright (c) Alexei Sheplyakov 2008-2010 \n"
- " \n"
- "This program is free software; you can redistribute it and/or modify\n"
- "it under the terms of the GNU General Public License as published by\n"
-diff --git a/src/complex/input/cl_N_read_stream.cc b/src/complex/input/cl_N_read_stream.cc
-index 139af04..fc207aa 100644
---- a/src/complex/input/cl_N_read_stream.cc
-+++ b/src/complex/input/cl_N_read_stream.cc
-@@ -91,13 +91,10 @@ const cl_N read_complex (std::istream& stream, const cl_read_flags& flags)
- goto syntax1;
- loop {
- buffer.push(c);
-- c = stream.get();
-- if (stream.eof() || stream.fail())
-- break;
-- if (!number_char_p(c)) {
-- stream.putback(c);
-+ c = stream.peek(); // Avoid fail state on EOF.
-+ if (stream.eof() || stream.fail() || !number_char_p(c))
- break;
-- }
-+ c = stream.get();
- }
- done:
- // Parse the number.
-diff --git a/src/float/input/cl_F_read_stream.cc b/src/float/input/cl_F_read_stream.cc
-index baafc3b..044e4d6 100644
---- a/src/float/input/cl_F_read_stream.cc
-+++ b/src/float/input/cl_F_read_stream.cc
-@@ -82,13 +82,10 @@ const cl_F read_float (std::istream& stream, const cl_read_flags& flags)
- goto syntax1;
- loop {
- buffer.push(c);
-- c = stream.get();
-- if (stream.eof() || stream.fail())
-- break;
-- if (!number_char_p(c)) {
-- stream.putback(c);
-+ c = stream.peek(); // Avoid fail state on EOF.
-+ if (stream.eof() || stream.fail() || !number_char_p(c))
- break;
-- }
-+ c = stream.get();
- }
- // Parse the number.
- return read_float(flags,
-diff --git a/src/integer/input/cl_I_read_stream.cc b/src/integer/input/cl_I_read_stream.cc
-index 227d845..b242ae7 100644
---- a/src/integer/input/cl_I_read_stream.cc
-+++ b/src/integer/input/cl_I_read_stream.cc
-@@ -82,13 +82,10 @@ const cl_I read_integer (std::istream& stream, const cl_read_flags& flags)
- goto syntax1;
- loop {
- buffer.push(c);
-- c = stream.get();
-- if (stream.eof() || stream.fail())
-- break;
-- if (!number_char_p(c)) {
-- stream.putback(c);
-+ c = stream.peek(); // Avoid fail state on EOF.
-+ if (stream.eof() || stream.fail() || !number_char_p(c))
- break;
-- }
-+ c = stream.get();
- }
- // Parse the number.
- return read_integer(flags,
-diff --git a/src/rational/input/cl_RA_read_stream.cc b/src/rational/input/cl_RA_read_stream.cc
-index bba1d03..9e5f4f6 100644
---- a/src/rational/input/cl_RA_read_stream.cc
-+++ b/src/rational/input/cl_RA_read_stream.cc
-@@ -83,13 +83,10 @@ const cl_RA read_rational (std::istream& stream, const cl_read_flags& flags)
- goto syntax1;
- loop {
- buffer.push(c);
-- c = stream.get();
-- if (stream.eof() || stream.fail())
-- break;
-- if (!number_char_p(c)) {
-- stream.putback(c);
-+ c = stream.peek(); // Avoid fail state on EOF.
-+ if (stream.eof() || stream.fail() || !number_char_p(c))
- break;
-- }
-+ c = stream.get();
- }
- // Parse the number.
- return read_rational(flags,
-diff --git a/src/real/input/cl_R_read_stream.cc b/src/real/input/cl_R_read_stream.cc
-index 56b01d3..c032eee 100644
---- a/src/real/input/cl_R_read_stream.cc
-+++ b/src/real/input/cl_R_read_stream.cc
-@@ -82,13 +82,10 @@ const cl_R read_real (std::istream& stream, const cl_read_flags& flags)
- goto syntax1;
- loop {
- buffer.push(c);
-- c = stream.get();
-- if (stream.eof() || stream.fail())
-- break;
-- if (!number_char_p(c)) {
-- stream.putback(c);
-+ c = stream.peek(); // Avoid fail state on EOF.
-+ if (stream.eof() || stream.fail() || !number_char_p(c))
- break;
-- }
-+ c = stream.get();
- }
- // Parse the number.
- return read_real(flags,