diff --git a/srcpkgs/python-matplotlib/patches/20_matplotlibrc_path_search_fix.patch b/srcpkgs/python-matplotlib/patches/20_matplotlibrc_path_search_fix.patch index ea4e92e0243..cf46c18a567 100644 --- a/srcpkgs/python-matplotlib/patches/20_matplotlibrc_path_search_fix.patch +++ b/srcpkgs/python-matplotlib/patches/20_matplotlibrc_path_search_fix.patch @@ -2,13 +2,13 @@ Description: Fixes the path to search for matplotlibrc file Forwarded: not-needed Author: Sandro Tosi ---- lib/matplotlib/__init__.py -+++ lib/matplotlib/__init__.py -@@ -653,10 +653,12 @@ def _get_data_path(): - raise RuntimeError('Path in environment MATPLOTLIBDATA not a directory') +--- ./lib/matplotlib/__init__.py ++++ ./lib/matplotlib/__init__.py +@@ -681,10 +681,12 @@ def _get_data_path(): return path -- path = os.sep.join([os.path.dirname(__file__), 'mpl-data']) + _file = _decode_filesystem_path(__file__) +- path = os.sep.join([os.path.dirname(_file), 'mpl-data']) + path = '/usr/share/matplotlib/mpl-data' if os.path.isdir(path): return path @@ -18,7 +18,7 @@ Author: Sandro Tosi # setuptools' namespace_packages may highjack this init file # so need to try something known to be in matplotlib, not basemap import matplotlib.afm -@@ -777,7 +779,7 @@ def matplotlib_fname(): +@@ -812,7 +814,7 @@ def matplotlib_fname(): home, '.matplotlib', 'matplotlibrc') return fname diff --git a/srcpkgs/python-matplotlib/template b/srcpkgs/python-matplotlib/template index ab1b52ad781..beebb463cff 100644 --- a/srcpkgs/python-matplotlib/template +++ b/srcpkgs/python-matplotlib/template @@ -1,32 +1,29 @@ # Template file for 'python-matplotlib' pkgname=python-matplotlib -version=1.4.3 -revision=3 +version=1.5.0 +revision=1 wrksrc="matplotlib-${version}" build_style=python-module python_versions="2.7 3.4" hostmakedepends="pkg-config python-setuptools python3.4-setuptools" -# XXX: use internal copy of agg and pycxx, highly patched +# XXX: use internal copy of agg, highly patched makedepends=" python-devel python3.4-devel python-numpy python3.4-numpy - python-six python3.4-six python-dateutil python3.4-dateutil python-pytz + python-cycler python3.4-cycler python-dateutil python3.4-dateutil python-pytz python3.4-pytz python-tornado python3.4-tornado python-parsing python3.4-parsing python-PyQt4-devel python-PyQt5-devel python-pyside python3.4-pyside python-cairocffi python3.4-cairocffi python-gobject-devel pygtk-devel gtk+3-devel tk-devel python-tkinter python3.4-tkinter wxPython-devel freetype-devel libpng-devel libqhull-devel" -depends="python-matplotlib-data>=${version}_${revision} python-numpy python-six +depends="python-matplotlib-data>=${version}_${revision} python-numpy python-cycler python-dateutil python-parsing python-pytz" -replaces="python-matplotlib-cairo>=0 python-matplotlib-gtk>=0 python-matplotlib-gtk3>=0 - python-matplotlib-qtshared>=0 python-matplotlib-qt4>=0 python-matplotlib-qt5>=0 - python-matplotlib-tk>=0 python-matplotlib-web>=0 python-matplotlib-wx>=0" pycompile_module="matplotlib mpl_toolkits pylab.py" short_desc="Python2 2D/3D plotting library" maintainer="Alessio Sergi " homepage="http://matplotlib.org/" license="matplotlib, BSD, MIT" distfiles="${PYPI_SITE}/m/matplotlib/matplotlib-${version}.tar.gz" -checksum=61f201c6a82e89e4d9e324266203fad44f95fd8f36d8eec0d8690273e1182f75 +checksum=67b08b1650a00a6317d94b76a30a47320087e5244920604c5462188cba0c2646 export XDG_RUNTIME_DIR=/tmp @@ -62,11 +59,8 @@ python-matplotlib-data_package() { } } python3.4-matplotlib_package() { - replaces="python3.4-matplotlib-cairo>=0 python3.4-matplotlib-gtk3>=0 - python3.4-matplotlib-qtshared>=0 python3.4-matplotlib-qt4>=0 - python3.4-matplotlib-qt5>=0 python3.4-matplotlib-tk>=0 python3.4-matplotlib-web>=0" depends="python-matplotlib-data>=${version}_${revision} python3.4-numpy - python3.4-six python3.4-dateutil python3.4-parsing python3.4-pytz" + python3.4-cycler python3.4-dateutil python3.4-parsing python3.4-pytz" short_desc="${short_desc/Python2/Python3.4}" pycompile_version="3.4" pycompile_module="matplotlib mpl_toolkits pylab.py"