aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libraries/matplotlib/libpng-1.4.patch12
-rw-r--r--libraries/matplotlib/matplotlib.SlackBuild11
-rw-r--r--libraries/matplotlib/matplotlib.info8
-rw-r--r--libraries/matplotlib/slack-desc4
4 files changed, 11 insertions, 24 deletions
diff --git a/libraries/matplotlib/libpng-1.4.patch b/libraries/matplotlib/libpng-1.4.patch
deleted file mode 100644
index 8fe04de8af34f..0000000000000
--- a/libraries/matplotlib/libpng-1.4.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur matplotlib-0.99.1.1-orig/src/_png.cpp matplotlib-0.99.1.1/src/_png.cpp
---- matplotlib-0.99.1.1-orig/src/_png.cpp 2010-01-25 01:42:32.000000000 -0500
-+++ matplotlib-0.99.1.1/src/_png.cpp 2010-01-25 01:43:17.000000000 -0500
-@@ -290,7 +290,7 @@
-
- //free the png memory
- png_read_end(png_ptr, info_ptr);
-- png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL);
-+ png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
- fclose(fp);
- for (row = 0; row < height; row++)
- delete [] row_pointers[row];
diff --git a/libraries/matplotlib/matplotlib.SlackBuild b/libraries/matplotlib/matplotlib.SlackBuild
index 11ffa42bbdfd0..517f7f61df14c 100644
--- a/libraries/matplotlib/matplotlib.SlackBuild
+++ b/libraries/matplotlib/matplotlib.SlackBuild
@@ -5,20 +5,19 @@
# Written by Aleksandar Samardzic <asamardzic@gmail.com>
# Updated to 0.99.1.2 by João Felipe Santos <joao.eel@gmail.com>
# Patch for libpng borrowed from Arch Linux
+# Updated for version 1.1.0 by Serban Udrea <S.Udrea@gsi.de>
PRGNAM=matplotlib
-VERSION=${VERSION:-0.99.1.2}
+VERSION=${VERSION:-1.1.0}
BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
-TARBALL_VERSION=0.99.1.1 # Tarball dir has wrong version number
+TARBALL_VERSION=1.1.0 # Tarball sometimes has a wrong version number
-# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
i?86) ARCH=i486 ;;
arm*) ARCH=arm ;;
- # Unless $ARCH is already set, use uname -m for all other archs:
*) ARCH=$( uname -m ) ;;
esac
fi
@@ -43,7 +42,7 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
-patch -p1 < $CWD/libpng-1.4.patch
+# patch -p1 < $CWD/libpng-1.4.patch # Does not seem to be needed anymore
# Use setup.cfg to tell setup.py not to install pytz and dateutil
mv setup.cfg.template setup.cfg
@@ -57,7 +56,7 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
cp -a \
- CHANGELOG INSTALL INTERACTIVE KNOWN_BUGS README.txt TODO \
+ CHANGELOG INSTALL README.txt TODO \
$PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/libraries/matplotlib/matplotlib.info b/libraries/matplotlib/matplotlib.info
index 9e7968f7bfbdc..25789440da36a 100644
--- a/libraries/matplotlib/matplotlib.info
+++ b/libraries/matplotlib/matplotlib.info
@@ -1,10 +1,10 @@
PRGNAM="matplotlib"
-VERSION="0.99.1.2"
+VERSION="1.1.0"
HOMEPAGE="http://matplotlib.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/matplotlib/matplotlib-0.99.1.2.tar.gz"
-MD5SUM="952e2c992e4a762b8538171f51c9140a"
+DOWNLOAD="http://kent.dl.sourceforge.net/project/matplotlib/matplotlib/matplotlib-1.1.0/matplotlib-1.1.0.tar.gz"
+MD5SUM="57a627f30b3b27821f808659889514c2"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
MAINTAINER="Serban Udrea"
EMAIL="S.Udrea@gsi.de"
-APPROVED="pprkut"
+APPROVED="pprkut,Niels Horn"
diff --git a/libraries/matplotlib/slack-desc b/libraries/matplotlib/slack-desc
index c7a91e2ea1dc1..07979cdc7ede2 100644
--- a/libraries/matplotlib/slack-desc
+++ b/libraries/matplotlib/slack-desc
@@ -5,14 +5,14 @@
# make exactly 11 lines for the formatting to be correct. It's also
# customary to leave one space after the ':'.
- |-----handy-ruler--------------------------------------------------|
+ |-----handy-ruler------------------------------------------------------|
matplotlib: matplotlib (a Python 2D plotting library)
matplotlib:
matplotlib: Matplotlib is a plotting library for Python which uses
matplotlib: syntax similar to MATLAB. Matplotlib produces publication
matplotlib: quality figures in a variety of hardcopy formats and
matplotlib: interactive environments across platforms.
-matplotlib:
+matplotlib:
matplotlib: Homepage: http://matplotlib.sourceforge.net/
matplotlib:
matplotlib: