matplotlib: port sed call to the main patch

This way we notice if something changes upstream.
This commit is contained in:
Christoph Reiter
2021-02-07 12:13:18 +01:00
parent e312092d41
commit e69933d20c
2 changed files with 19 additions and 8 deletions

View File

@@ -34,13 +34,12 @@ optdepends=("${MINGW_PACKAGE_PREFIX}-python-pyqt5: Qt5Agg/Qt5Cairo backend"
source=("${_realname}-${pkgver}.tar.gz"::"https://pypi.io/packages/source/${_realname:0:1}/${_realname}/${_realname}-${pkgver}.tar.gz"
setupext.py.patch)
sha256sums=('3e477db76c22929e4c6876c44f88d790aacdf3c3f8f3a90cb1975c0bf37825b0'
'a2f0e6b9f7e40881cb1b83025f8797e1431d97068189c2a0468bb84f7ce28945')
'43a13325f23d2be8ef3b1c8f14be0640df690c52742101beb21f7c4eaad30425')
prepare() {
cd "${srcdir}/${_realname}-${pkgver}"
patch -p1 -i ${srcdir}/setupext.py.patch
# Use system freetype and qhull
sed -e 's|#system_freetype = False|system_freetype = True|' -e 's|#system_qhull = False|system_qhull = True|' setup.cfg.template > setup.cfg
cd ${srcdir}
rm -rf python-build-${CARCH} | true
cp -r "${_realname}-${pkgver}" "python-build-${CARCH}"

View File

@@ -1,6 +1,6 @@
--- matplotlib-3.1.0/setupext.py.orig 2019-05-18 03:55:28.000000000 +0200
+++ matplotlib-3.1.0/setupext.py 2019-05-19 11:31:01.633173900 +0200
@@ -24,6 +24,7 @@
--- matplotlib-3.3.4/setupext.py.orig 2021-01-28 09:30:28.000000000 +0100
+++ matplotlib-3.3.4/setupext.py 2021-02-07 12:11:03.590667300 +0100
@@ -20,6 +20,7 @@
_log = logging.getLogger(__name__)
@@ -8,7 +8,19 @@
def _get_xdg_cache_dir():
"""
@@ -232,7 +233,7 @@
@@ -146,9 +147,9 @@
options = {
'backend': config.get('rc_options', 'backend', fallback=None),
'system_freetype': config.getboolean(
- 'libs', 'system_freetype', fallback=sys.platform.startswith('aix')),
+ 'libs', 'system_freetype', fallback=sys.platform.startswith('aix') or MSYS),
'system_qhull': config.getboolean('libs', 'system_qhull',
- fallback=False),
+ fallback=False or MSYS),
}
@@ -171,7 +172,7 @@
"""
Get path to pkg-config and set up the PKG_CONFIG environment variable.
"""
@@ -17,7 +29,7 @@
return None
pkg_config = os.environ.get('PKG_CONFIG', 'pkg-config')
if shutil.which(pkg_config) is None:
@@ -276,7 +277,7 @@
@@ -223,7 +224,7 @@
# conda Windows header and library paths.
# https://github.com/conda/conda/issues/2312 re: getting the env dir.