python-matplotlib: update to 2.1.1.
Update patch for new version (maintaining previous behavior).
This commit is contained in:
parent
9b80d73f0c
commit
6c1a8b4964
2 changed files with 18 additions and 26 deletions
|
@ -1,29 +1,21 @@
|
|||
Description: Fixes the path to search for matplotlibrc file
|
||||
Forwarded: not-needed
|
||||
Author: Sandro Tosi <morph@debian.org>
|
||||
|
||||
--- ./lib/matplotlib/__init__.py
|
||||
+++ ./lib/matplotlib/__init__.py
|
||||
@@ -681,10 +681,12 @@ def _get_data_path():
|
||||
return path
|
||||
@@ -663,6 +663,10 @@
|
||||
if os.path.isdir(path):
|
||||
return path
|
||||
|
||||
_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
|
||||
|
||||
+ raise RuntimeError('Could not find the matplotlib data files')
|
||||
+ if os.path.isdir(path):
|
||||
+ return path
|
||||
+
|
||||
# setuptools' namespace_packages may highjack this init file
|
||||
# so need to try something known to be in matplotlib, not basemap
|
||||
import matplotlib.afm
|
||||
@@ -812,7 +814,7 @@ def matplotlib_fname():
|
||||
home, '.matplotlib', 'matplotlibrc')
|
||||
return fname
|
||||
raise RuntimeError('Could not find the matplotlib data files')
|
||||
|
||||
- path = get_data_path() # guaranteed to exist or raise
|
||||
+ path = '/etc' # guaranteed to exist or raise
|
||||
fname = os.path.join(path, 'matplotlibrc')
|
||||
if not os.path.exists(fname):
|
||||
warnings.warn('Could not find matplotlibrc; using defaults')
|
||||
|
||||
@@ -732,6 +736,7 @@
|
||||
yield os.path.join(matplotlibrc, 'matplotlibrc')
|
||||
yield os.path.join(_get_configdir(), 'matplotlibrc')
|
||||
yield os.path.join(get_data_path(), 'matplotlibrc')
|
||||
+ yield os.path.join('/etc', 'matplotlibrc')
|
||||
|
||||
for fname in gen_candidates():
|
||||
if os.path.isfile(fname):
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
# Template file for 'python-matplotlib'
|
||||
pkgname=python-matplotlib
|
||||
version=2.0.2
|
||||
revision=2
|
||||
version=2.1.1
|
||||
revision=1
|
||||
wrksrc="matplotlib-${version}"
|
||||
build_style=python-module
|
||||
hostmakedepends="pkg-config python-setuptools python3-setuptools"
|
||||
|
@ -24,7 +24,7 @@ maintainer="Alessio Sergi <al3hex@gmail.com>"
|
|||
homepage="http://matplotlib.org/"
|
||||
license="matplotlib, BSD, MIT"
|
||||
distfiles="${PYPI_SITE}/m/matplotlib/matplotlib-${version}.tar.gz"
|
||||
checksum=0ffbc44faa34a8b1704bc108c451ecf87988f900ef7ce757b8e2e84383121ff1
|
||||
checksum=659f5e1aa0e0f01488c61eff47560c43b8be511c6a29293d7f3896ae17bd8b23
|
||||
|
||||
export XDG_RUNTIME_DIR=/tmp
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue