Rebuild/update packages for Python 3.5.0 support
This commit is contained in:
@@ -1,8 +1,9 @@
|
||||
# Contributor: Runar Tenfjord < runar dot tenfjord at gmail dot com >
|
||||
|
||||
_realname=matplotlib
|
||||
pkgname=("${MINGW_PACKAGE_PREFIX}-python2-$_realname" "${MINGW_PACKAGE_PREFIX}-python3-$_realname")
|
||||
pkgver=1.4.3
|
||||
pkgbase=mingw-w64-python-${_realname}
|
||||
pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
|
||||
pkgver=1.5.0rc2
|
||||
pkgrel=1
|
||||
pkgdesc="A python plotting library, making publication quality plots (mingw-w64)"
|
||||
arch=('any')
|
||||
@@ -28,8 +29,8 @@ makedepends=(
|
||||
source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/matplotlib/matplotlib/archive/v${pkgver}.tar.gz"
|
||||
setupext.py.patch
|
||||
setup.py.patch)
|
||||
md5sums=('f1bb5e2317cceed593119fad2071e236'
|
||||
'24b0ed92631fd0adb2ae11ff1ef31490'
|
||||
md5sums=('a2a75e5c12bb480ca927913df0995aa9'
|
||||
'cd1ef742fb22f91cfed3c36dd4a6f1e1'
|
||||
'b5f64259a266ccc517586debb8c4e5c8')
|
||||
noextract=("${_realname}-${pkgver}.tar.gz")
|
||||
|
||||
|
||||
@@ -56,7 +56,7 @@
|
||||
return ext
|
||||
|
||||
|
||||
@@ -247,11 +255,11 @@
|
||||
@@ -247,16 +255,16 @@
|
||||
"""
|
||||
Determines whether pkg-config exists on this machine.
|
||||
"""
|
||||
@@ -64,9 +64,14 @@
|
||||
+ if sys.platform == 'win32' and not MSYS:
|
||||
self.has_pkgconfig = False
|
||||
else:
|
||||
try:
|
||||
self.pkg_config = os.environ['PKG_CONFIG']
|
||||
except KeyError:
|
||||
self.pkg_config = 'pkg-config'
|
||||
|
||||
self.set_pkgconfig_path()
|
||||
- status, output = getstatusoutput("pkg-config --help")
|
||||
+ status, output = getstatusoutput('sh -c "pkg-config --help"')
|
||||
- status, output = getstatusoutput(self.pkg_config + " --help")
|
||||
+ status, output = getstatusoutput('sh -c "'+self.pkg_config+' --help"')
|
||||
self.has_pkgconfig = (status == 0)
|
||||
if not self.has_pkgconfig:
|
||||
print("IMPORTANT WARNING:")
|
||||
@@ -102,8 +107,8 @@
|
||||
return None
|
||||
|
||||
status, output = getstatusoutput(
|
||||
- "pkg-config %s --modversion" % (package))
|
||||
+ 'sh -c "pkg-config %s --modversion"' % (package))
|
||||
- self.pkg_config + " %s --modversion" % (package))
|
||||
+ 'sh -c "'+self.pkg_config+' %s --modversion"' % (package))
|
||||
if status == 0:
|
||||
return output
|
||||
return None
|
||||
|
||||
Reference in New Issue
Block a user