Befator-Inc-Firmen-Netzwerk/MINGW-packages
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

matplotlib: Fix building/installing

Browse Source
This commit is contained in:
Alexpux
2014-09-19 14:23:38 +04:00
parent be48f46a8d
commit 2732e25a63
3 changed files with 274 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
mingw-w64-python-matplotlib/PKGBUILD
View File

@@ -21,11 +21,29 @@ makedepends=(
"${MINGW_PACKAGE_PREFIX}-python3-dateutil"
"${MINGW_PACKAGE_PREFIX}-python2-pyparsing"
"${MINGW_PACKAGE_PREFIX}-python3-pyparsing"
"${MINGW_PACKAGE_PREFIX}-freetype"
"${MINGW_PACKAGE_PREFIX}-libpng"
#"${MINGW_PACKAGE_PREFIX}-qhull"
)
source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/matplotlib/matplotlib/archive/v$pkgver.tar.gz")
md5sums=('fe5e319b85df48cbfe2e8f3d1a9c60f0')
source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/matplotlib/matplotlib/archive/v$pkgver.tar.gz"
setupext.py.patch
setup.py.patch)
md5sums=('fe5e319b85df48cbfe2e8f3d1a9c60f0'
'4cd2109382ceb06387fac589baff7a58'
'b5f64259a266ccc517586debb8c4e5c8')
noextract=("${_realname}-${pkgver}.tar.gz")
prepare() {
prepare() {
cd $startdir/
# Clean up old sources so re-patching doesn't fail.
[ -d $srcdir/${_realname}-$pkgver ] && rm -rf $srcdir/${_realname}-$pkgver
tar -xzvf ${_realname}-${pkgver}.tar.gz -C $srcdir
cd $srcdir/${_realname}-$pkgver
patch -p1 -i ${srcdir}/setupext.py.patch
patch -p1 -i ${srcdir}/setup.py.patch
cd ${srcdir}
cp -a $_realname-$pkgver $_realname-py2-$pkgver
cp -a $_realname-$pkgver $_realname-py3-$pkgver
@@ -42,33 +60,13 @@ prepare() {
}
build() {
cd ${srcdir}/$_realname-py3-$pkgver
# can not find freetype2 in a clean way
# if [ -d /mingw64/include/freetype2 ]; then
# cp -a /mingw64/include/freetype2/* extern/
# fi
# if [ -d /mingw32/include/freetype2 ]; then
# cp -a /mingw32/include/freetype2/* extern/
# fi
MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
${MINGW_PREFIX}/bin/python3 setup.py build
cd ${srcdir}/$_realname-py2-$pkgver
# can not find freetype2 in a clean way
# if [ -d /mingw64/include/freetype2 ]; then
# cp -a /mingw64/include/freetype2/* extern/
# fi
# if [ -d /mingw32/include/freetype2 ]; then
# cp -a /mingw32/include/freetype2/* extern/
# fi
MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
${MINGW_PREFIX}/bin/python2 setup.py build
cd ${srcdir}/$_realname-py3-$pkgver
MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
${MINGW_PREFIX}/bin/python3 setup.py build
}
package_python3-matplotlib() {
@@ -79,15 +77,17 @@ package_python3-matplotlib() {
"${MINGW_PACKAGE_PREFIX}-python3-pyqt5"
"${MINGW_PACKAGE_PREFIX}-python3-dateutil"
"${MINGW_PACKAGE_PREFIX}-python3-pyparsing"
"${MINGW_PACKAGE_PREFIX}-freetype"
"${MINGW_PACKAGE_PREFIX}-libpng"
#"${MINGW_PACKAGE_PREFIX}-qhull"
)
cd ${srcdir}/$_realname-py3-$pkgver
MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
${MINGW_PREFIX}/bin/python3 setup.py install -O1 --skip-build \
--root "${pkgdir}" --prefix=${MINGW_PREFIX}
--root="${pkgdir}" --prefix=${MINGW_PREFIX}
install -dm755 "${pkgdir}"/usr/share/licenses/python-matplotlib
install -m 644 doc/users/license.rst "${pkgdir}${MINGW_PREFIX}"/share/licenses/python3-matplotlib
install -Dm644 doc/users/license.rst "${pkgdir}${MINGW_PREFIX}"/share/licenses/python3-matplotlib/LICENSE
}
package_python2-matplotlib() {
@@ -98,15 +98,17 @@ package_python2-matplotlib() {
"${MINGW_PACKAGE_PREFIX}-python2-pyqt5"
"${MINGW_PACKAGE_PREFIX}-python2-dateutil"
"${MINGW_PACKAGE_PREFIX}-python2-pyparsing"
"${MINGW_PACKAGE_PREFIX}-freetype"
"${MINGW_PACKAGE_PREFIX}-libpng"
#"${MINGW_PACKAGE_PREFIX}-qhull"
)
cd ${srcdir}/$_realname-py2-$pkgver
MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
${MINGW_PREFIX}/bin/python2 setup.py install -O1 --skip-build \
--root "${pkgdir}" --prefix=${MINGW_PREFIX}
--root="${pkgdir}" --prefix=${MINGW_PREFIX}
install -dm755 "${pkgdir}"/usr/share/licenses/python-matplotlib
install -m 644 doc/users/license.rst "${pkgdir}${MINGW_PREFIX}"/share/licenses/python2-matplotlib
install -Dm644 doc/users/license.rst "${pkgdir}${MINGW_PREFIX}"/share/licenses/python2-matplotlib/LICENSE
}
package_mingw-w64-i686-python2-matplotlib() {

11
mingw-w64-python-matplotlib/setup.py.patch Normal file
View File

@@ -0,0 +1,11 @@
--- old/setup.py 2014-08-26 04:24:27.000000000 +0200
+++ new/setup.py 2014-09-18 23:28:32.597091000 +0200
@@ -97,7 +97,7 @@
setupext.BackendGtk3Agg(),
setupext.BackendGtk3Cairo(),
setupext.BackendGtkAgg(),
- setupext.BackendTkAgg(),
+ #setupext.BackendTkAgg(),
setupext.BackendWxAgg(),
setupext.BackendGtk(),
setupext.BackendAgg(),

228
mingw-w64-python-matplotlib/setupext.py.patch Normal file
View File

@@ -0,0 +1,228 @@
--- old/setupext.py 2014-08-26 04:24:27.000000000 +0200
+++ new/setupext.py 2014-09-19 11:33:06.714884200 +0200
@@ -15,7 +15,7 @@
PY3 = (sys.version_info[0] >= 3)
-
+MSYS = "MSYSTEM" in os.environ
try:
from subprocess import check_output
@@ -43,9 +43,16 @@
return output
-if sys.platform != 'win32':
+if sys.platform != 'win32' or MSYS:
if sys.version_info[0] < 3:
- from commands import getstatusoutput
+ def getstatusoutput(cmd):
+ """Return (status, output) of executing cmd in a shell."""
+ pipe = os.popen(cmd, 'r')
+ text = pipe.read()
+ sts = pipe.close()
+ if sts is None: sts = 0
+ if text[-1:] == '\n': text = text[:-1]
+ return sts, text
else:
from subprocess import getstatusoutput
@@ -121,6 +128,7 @@
directories in `include_dirs`.
"""
for dir in include_dirs:
+ dir = os.popen(' '.join(['cygpath', '-w', dir])).readline().strip()
if os.path.exists(os.path.join(dir, filename)):
return True
return False
@@ -130,7 +138,7 @@
"""
Raises an exception if the given include file can not be found.
"""
- if sys.platform == 'win32':
+ if sys.platform == 'win32' and not MSYS:
include_dirs.extend(os.getenv('INCLUDE', '.').split(';'))
if not has_include_file(include_dirs, filename):
raise CheckFailed(
@@ -220,6 +229,7 @@
"""
ext = DelayedExtension(name, files, *args, **kwargs)
for dir in get_base_dirs():
+ dir = os.popen(' '.join(['cygpath', '-w', dir])).readline().strip()
include_dir = os.path.join(dir, 'include')
if os.path.exists(include_dir):
ext.include_dirs.append(include_dir)
@@ -228,7 +238,6 @@
if os.path.exists(lib_dir):
ext.library_dirs.append(lib_dir)
ext.include_dirs.append('.')
-
return ext
@@ -240,11 +249,11 @@
"""
Determines whether pkg-config exists on this machine.
"""
- if sys.platform == 'win32':
+ if sys.platform == 'win32' and not MSYS:
self.has_pkgconfig = False
else:
self.set_pkgconfig_path()
- status, output = getstatusoutput("pkg-config --help")
+ status, output = getstatusoutput('sh -c "pkg-config --help"')
self.has_pkgconfig = (status == 0)
def set_pkgconfig_path(self):
@@ -280,7 +289,7 @@
command = "{0} --libs --cflags ".format(executable)
try:
- output = check_output(command, shell=True,
+ output = check_output('sh -c "%s"' % command, shell=True,
stderr=subprocess.STDOUT)
except subprocess.CalledProcessError:
pass
@@ -290,11 +299,16 @@
for token in output.split():
attr = flag_map.get(token[:2])
if attr is not None:
- getattr(ext, attr).insert(0, token[2:])
-
+ if attr.endswith('dirs'):
+ dir = os.popen(' '.join(['cygpath', '-w', token[2:]])).readline().strip()
+ getattr(ext, attr).insert(0, dir)
+ else:
+ getattr(ext, attr).insert(0, token[2:])
+
if use_defaults:
basedirs = get_base_dirs()
for base in basedirs:
+ base = os.popen(' '.join(['cygpath', '-w', base])).readline().strip()
for include in default_include_dirs:
dir = os.path.join(base, include)
if os.path.exists(dir):
@@ -316,7 +330,7 @@
return None
status, output = getstatusoutput(
- "pkg-config %s --modversion" % (package))
+ 'sh -c "pkg-config %s --modversion"' % (package))
if status == 0:
return output
return None
@@ -926,20 +938,20 @@
name = "freetype"
def check(self):
- if sys.platform == 'win32':
+ if sys.platform == 'win32' and not MSYS:
return "Unknown version"
- status, output = getstatusoutput("freetype-config --ftversion")
+ status, output = getstatusoutput('sh -c "freetype-config --ftversion"')
if status == 0:
version = output
else:
version = None
-
+
# Early versions of freetype grep badly inside freetype-config,
# so catch those cases. (tested with 2.5.3).
if 'No such file or directory\ngrep:' in version:
version = self.version_from_header()
-
+
return self._check_for_pkg_config(
'freetype2', 'ft2build.h',
min_version='2.4', version=version)
@@ -951,6 +963,7 @@
return version
# Return the first version found in the include dirs.
for include_dir in ext.include_dirs:
+ include_dir = os.popen(' '.join(['cygpath', '-w', include_dir])).readline().strip()
header_fname = os.path.join(include_dir, 'freetype.h')
if os.path.exists(header_fname):
major, minor, patch = 0, 0, 0
@@ -1411,7 +1424,7 @@
p = subprocess.Popen(
'. %s ; eval echo ${%s}' % (file, varname),
shell=True,
- executable="/bin/sh",
+ executable="sh",
stdout=subprocess.PIPE)
result = p.communicate()[0]
return result.decode('ascii')
@@ -1483,7 +1496,7 @@
return tcl_lib, tcl_inc, 'tcl', tk_lib, tk_inc, 'tk'
def add_flags(self, ext):
- if sys.platform == 'win32':
+ if sys.platform == 'win32' and not MSYS:
major, minor1, minor2, s, tmp = sys.version_info
if sys.version_info[0:2] < (3, 4):
ext.include_dirs.extend(['win32_static/include/tcl85'])
@@ -1619,7 +1632,7 @@
return ext
def add_flags(self, ext):
- if sys.platform == 'win32':
+ if sys.platform == 'win32' and not MSYS:
def getoutput(s):
ret = os.popen(s).read().strip()
return ret
@@ -1674,7 +1687,7 @@
'm' in ext.libraries):
ext.libraries.remove('m')
- elif sys.platform != 'win32':
+ elif sys.platform != 'win32' or MSYS:
pkg_config.setup_extension(ext, 'pygtk-2.0')
pkg_config.setup_extension(ext, 'gtk+-2.0')
@@ -2050,7 +2063,7 @@
def check(self):
try:
- output = check_output('dvipng -version', shell=True,
+ output = check_output('sh -c "dvipng -version"', shell=True,
stderr=subprocess.STDOUT)
return "version %s" % output.splitlines()[1].decode().split()[-1]
except (IndexError, ValueError, subprocess.CalledProcessError):
@@ -2063,7 +2076,7 @@
def check(self):
try:
- if sys.platform == 'win32':
+ if sys.platform == 'win32' and not MSYS:
command = 'gswin32c --version'
try:
output = check_output(command, shell=True,
@@ -2073,7 +2086,7 @@
output = check_output(command, shell=True,
stderr=subprocess.STDOUT)
else:
- command = 'gs --version'
+ command = 'sh -c "gs --version"'
output = check_output(command, shell=True,
stderr=subprocess.STDOUT)
return "version %s" % output.decode()[:-1]
@@ -2087,7 +2100,7 @@
def check(self):
try:
- output = check_output('latex -version', shell=True,
+ output = check_output('sh -c "latex -version"', shell=True,
stderr=subprocess.STDOUT)
line = output.splitlines()[0].decode()
pattern = '(3\.1\d+)|(MiKTeX \d+.\d+)'
@@ -2103,7 +2116,7 @@
def check(self):
try:
- output = check_output('pdftops -v', shell=True,
+ output = check_output('sh -c "pdftops -v"', shell=True,
stderr=subprocess.STDOUT)
for line in output.splitlines():
line = line.decode()