Date: Monday, October 12, 2015 @ 15:17:39 Author: fyan Revision: 143775
upgpkg: python-matplotlib 1.4.3-4 add a patch for sagemath (suggested by arojas) Added: python-matplotlib/trunk/fix-numpy-warning.patch Modified: python-matplotlib/trunk/PKGBUILD Deleted: python-matplotlib/trunk/ffmpeg-2.0.patch -------------------------+ PKGBUILD | 11 +++-- ffmpeg-2.0.patch | 98 ---------------------------------------------- fix-numpy-warning.patch | 35 ++++++++++++++++ 3 files changed, 43 insertions(+), 101 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2015-10-12 12:57:05 UTC (rev 143774) +++ PKGBUILD 2015-10-12 13:17:39 UTC (rev 143775) @@ -8,7 +8,7 @@ pkgbase=python-matplotlib pkgname=('python2-matplotlib' 'python-matplotlib') pkgver=1.4.3 -pkgrel=3 +pkgrel=4 pkgdesc="A python plotting library, making publication quality plots" arch=('i686' 'x86_64') url='http://matplotlib.org' @@ -21,10 +21,15 @@ 'python2-pyparsing' 'pygtk' 'python-six' 'ghostscript' 'texlive-bin' 'python-tornado' 'python2-tornado' 'gtk3' 'wxpython' 'python-pyqt5' 'python2-pyqt5' 'libxkbcommon-x11' 'python-pillow' 'python2-pillow') -source=("$pkgbase-$pkgver.tar.gz::https://github.com/matplotlib/matplotlib/archive/v$pkgver.tar.gz") -sha512sums=('4aebbda31934bedbee5206b783e5cbe07db17367d50117a50bb80b7ea4aad987ec225958bed58885c561f00582c309d6e8c0a69861d3b4210a09b2d63975d2aa') +source=("$pkgbase-$pkgver.tar.gz::https://github.com/matplotlib/matplotlib/archive/v$pkgver.tar.gz" + fix-numpy-warning.patch) +sha512sums=('4aebbda31934bedbee5206b783e5cbe07db17367d50117a50bb80b7ea4aad987ec225958bed58885c561f00582c309d6e8c0a69861d3b4210a09b2d63975d2aa' + '5cfb8458c1b71f853cc1571fc0e4c8e3ebcf555f24a043a9b94f023e16dca8aa700339646783453918b0dc986de0f9d622f6e04ca785882ce189247b7f7a60b3') prepare() { + # https://github.com/matplotlib/matplotlib/commit/5e8fb6213394ee27ea0d5ff6337ef6efd3e9c667 + (cd matplotlib-${pkgver}; patch -p1 -i ../fix-numpy-warning.patch) + cp -a matplotlib-${pkgver} matplotlib-${pkgver}-py2 cd matplotlib-${pkgver} Deleted: ffmpeg-2.0.patch =================================================================== --- ffmpeg-2.0.patch 2015-10-12 12:57:05 UTC (rev 143774) +++ ffmpeg-2.0.patch 2015-10-12 13:17:39 UTC (rev 143775) @@ -1,98 +0,0 @@ -From 1935f1273aef443895a4da4e5f2c4aa86103a414 Mon Sep 17 00:00:00 2001 -From: Vlad Seghete <vlad.segh...@gmail.com> -Date: Mon, 25 Nov 2013 13:35:57 -0600 -Subject: [PATCH 1/3] fixes issue #2482 and adds note about incompatibility - between bbox options and animation backends - ---- - lib/matplotlib/animation.py | 8 ++++---- - matplotlibrc.template | 4 ++++ - 2 files changed, 8 insertions(+), 4 deletions(-) - -diff --git a/lib/matplotlib/animation.py b/lib/matplotlib/animation.py -index 295d60d..9078c5d 100644 ---- a/lib/matplotlib/animation.py -+++ b/lib/matplotlib/animation.py -@@ -399,9 +399,9 @@ class FFMpegFileWriter(FileMovieWriter, FFMpegBase): - def _args(self): - # Returns the command line parameters for subprocess to use - # ffmpeg to create a movie using a collection of temp images -- return [self.bin_path(), '-vframes', str(self._frame_counter), -- '-r', str(self.fps), '-i', -- self._base_temp_name()] + self.output_args -+ return [self.bin_path(), '-i', self._base_temp_name()-vframes, -+ '-vframes', str(self._frame_counter), -+ '-r', str(self.fps), ] + self.output_args - - - # Base class of avconv information. AVConv has identical arguments to -diff --git a/matplotlibrc.template b/matplotlibrc.template -index 473d624..e4d3593 100644 ---- a/matplotlibrc.template -+++ b/matplotlibrc.template -@@ -380,6 +380,10 @@ backend : %(backend)s - #savefig.edgecolor : white # figure edgecolor when saving - #savefig.format : png # png, ps, pdf, svg - #savefig.bbox : standard # 'tight' or 'standard'. -+ # 'tight' is incompatible with pipe-based animation -+ # backends but will workd with temporary file based ones: -+ # e.g. setting animation.writer to ffmpeg will not work, -+ # use ffmpeg_file instead - #savefig.pad_inches : 0.1 # Padding to be used when bbox is set to 'tight' - #savefig.jpeg_quality: 95 # when a jpeg is saved, the default quality parameter. - #savefig.directory : ~ # default directory in savefig dialog box, --- -1.8.5.1 - - -From f38fcb392d1d247b933f00e65022892007fb8325 Mon Sep 17 00:00:00 2001 -From: Vlad Seghete <vlad.segh...@gmail.com> -Date: Mon, 25 Nov 2013 13:52:53 -0600 -Subject: [PATCH 2/3] fixed a typo - ---- - lib/matplotlib/animation.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/matplotlib/animation.py b/lib/matplotlib/animation.py -index 9078c5d..07c6d27 100644 ---- a/lib/matplotlib/animation.py -+++ b/lib/matplotlib/animation.py -@@ -399,7 +399,7 @@ class FFMpegFileWriter(FileMovieWriter, FFMpegBase): - def _args(self): - # Returns the command line parameters for subprocess to use - # ffmpeg to create a movie using a collection of temp images -- return [self.bin_path(), '-i', self._base_temp_name()-vframes, -+ return [self.bin_path(), '-i', self._base_temp_name(), - '-vframes', str(self._frame_counter), - '-r', str(self.fps), ] + self.output_args - --- -1.8.5.1 - - -From 5c8f3d605ff045ddfbc3ca950aef85366617af5a Mon Sep 17 00:00:00 2001 -From: Vlad Seghete <vlad.segh...@gmail.com> -Date: Mon, 25 Nov 2013 14:17:54 -0600 -Subject: [PATCH 3/3] fixed another typo - ---- - lib/matplotlib/animation.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/matplotlib/animation.py b/lib/matplotlib/animation.py -index 07c6d27..9854ca2 100644 ---- a/lib/matplotlib/animation.py -+++ b/lib/matplotlib/animation.py -@@ -401,7 +401,7 @@ def _args(self): - # ffmpeg to create a movie using a collection of temp images - return [self.bin_path(), '-i', self._base_temp_name(), - '-vframes', str(self._frame_counter), -- '-r', str(self.fps), ] + self.output_args -+ '-r', str(self.fps)] + self.output_args - - - # Base class of avconv information. AVConv has identical arguments to --- -1.8.5.1 - Added: fix-numpy-warning.patch =================================================================== --- fix-numpy-warning.patch (rev 0) +++ fix-numpy-warning.patch 2015-10-12 13:17:39 UTC (rev 143775) @@ -0,0 +1,35 @@ +From 5e8fb6213394ee27ea0d5ff6337ef6efd3e9c667 Mon Sep 17 00:00:00 2001 +From: Jens Hedegaard Nielsen <jens.niel...@ucl.ac.uk> +Date: Sat, 15 Aug 2015 09:15:57 +0100 +Subject: [PATCH] Make sure _edgecolors is a string before comparison + +Fixes numpy deprecation warning. Comparing a numpy array to a string +will return an array in future numpy versions +--- + lib/matplotlib/collections.py | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/lib/matplotlib/collections.py b/lib/matplotlib/collections.py +index 6b87963..37393c6 100644 +--- a/lib/matplotlib/collections.py ++++ b/lib/matplotlib/collections.py +@@ -617,7 +617,8 @@ def get_facecolor(self): + get_facecolors = get_facecolor + + def get_edgecolor(self): +- if self._edgecolors == str('face'): ++ if (isinstance(self._edgecolors, six.string_types) ++ and self._edgecolors == str('face')): + return self.get_facecolors() + else: + return self._edgecolors +@@ -678,7 +679,8 @@ def set_alpha(self, alpha): + except (AttributeError, TypeError, IndexError): + pass + try: +- if self._edgecolors_original != str('face'): ++ if (not isinstance(self._edgecolors_original, six.string_types) ++ or self._edgecolors_original != str('face')): + self._edgecolors = mcolors.colorConverter.to_rgba_array( + self._edgecolors_original, self._alpha) + except (AttributeError, TypeError, IndexError):