diff --git a/mingw-w64-python3-matplotlib/PKGBUILD b/mingw-w64-python3-matplotlib/PKGBUILD index b5a7408c18..eff762d12f 100644 --- a/mingw-w64-python3-matplotlib/PKGBUILD +++ b/mingw-w64-python3-matplotlib/PKGBUILD @@ -3,7 +3,7 @@ _realname=matplotlib pkgbase=mingw-w64-python3-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") -pkgver=3.0.3 +pkgver=3.1.0 pkgrel=1 pkgdesc="A python plotting library, making publication quality plots (mingw-w64)" arch=('any') @@ -26,9 +26,11 @@ optdepends=("${MINGW_PACKAGE_PREFIX}-python3-pyqt5: Qt5Agg/Qt5Cairo backend" "${MINGW_PACKAGE_PREFIX}-python3-tornado: WebAgg backend") source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/matplotlib/matplotlib/archive/v${pkgver}.tar.gz" + "https://jqueryui.com/resources/download/jquery-ui-1.12.1.zip" setupext.py.patch) -sha256sums=('d384a58409c1c23b8760b6f3d84ebed2c936df7dcb82797e983faaf30ae4d69d' - '4a40f33ceda86f4a70d71fc97f28e799fe6973f9358fd9d1dac9b40cc2f0c7fc') +sha256sums=('7b4173b611520d0635041639b1a5193acf44f79a7988181003756b4d350931e5' + 'f8233674366ab36b2c34c577ec77a3d70cac75d2e387d8587f3836345c0f624d' + '329283ed24e3f91a628f204885d296dec1d8ad0e0dda2ef58a53a08c6ab8d959') prepare() { cd "${srcdir}/${_realname}-${pkgver}" @@ -44,11 +46,16 @@ build() { } package() { - cd "${srcdir}/${_realname}-${pkgver}" + cd "${srcdir}/${_realname}-${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} + local pyver=$(${MINGW_PREFIX}/bin/python3 -c "import sys;sys.stdout.write('.'.join(map(str, sys.version_info[:2])))") + local query_dest="${pkgdir}${MINGW_PREFIX}/lib/python${pyver}/site-packages/matplotlib/backends/web_backend" + mkdir -p "${query_dest}" + cp -R "${srcdir}/jquery-ui-1.12.1" "${query_dest}" - install -Dm644 doc/users/license.rst "${pkgdir}${MINGW_PREFIX}"/share/licenses/python3-matplotlib/LICENSE + MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \ + ${MINGW_PREFIX}/bin/python3 setup.py install -O1 --skip-build \ + --root="${pkgdir}" --prefix=${MINGW_PREFIX} + + install -Dm644 doc/users/license.rst "${pkgdir}${MINGW_PREFIX}"/share/licenses/python3-matplotlib/LICENSE } diff --git a/mingw-w64-python3-matplotlib/setupext.py.patch b/mingw-w64-python3-matplotlib/setupext.py.patch index b5e6d33637..77585e5763 100644 --- a/mingw-w64-python3-matplotlib/setupext.py.patch +++ b/mingw-w64-python3-matplotlib/setupext.py.patch @@ -1,37 +1,28 @@ ---- matplotlib-3.0.0/setupext.py.orig 2018-09-18 05:17:52.000000000 +0200 -+++ matplotlib-3.0.0/setupext.py 2018-09-20 12:51:06.529116400 +0200 -@@ -22,6 +22,7 @@ - import setuptools - import versioneer +--- 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 @@ + + _log = logging.getLogger(__name__) +MSYS = "MSYSTEM" in os.environ def _get_xdg_cache_dir(): """ -@@ -267,7 +268,7 @@ - """ - Determines whether pkg-config exists on this machine. - """ +@@ -220,7 +221,7 @@ + def __init__(self): + """Determines whether pkg-config exists on this machine.""" + self.pkg_config = None +- if sys.platform != 'win32': ++ if sys.platform != 'win32' or MSYS: + pkg_config = os.environ.get('PKG_CONFIG', 'pkg-config') + if shutil.which(pkg_config) is not None: + self.pkg_config = pkg_config +@@ -276,7 +277,7 @@ + + # conda Windows header and library paths. + # https://github.com/conda/conda/issues/2312 re: getting the env dir. - if sys.platform == 'win32': + if sys.platform == 'win32' and not MSYS: - self.has_pkgconfig = False - else: - self.pkg_config = os.environ.get('PKG_CONFIG', 'pkg-config') -@@ -946,7 +947,7 @@ - if options.get('local_freetype'): - return "Using local version for testing" - -- if sys.platform == 'win32': -+ if sys.platform == 'win32' and not MSYS: - try: - check_include_file(get_include_dirs(), 'ft2build.h', 'freetype') - except CheckFailed: -@@ -1176,7 +1177,7 @@ - } - - def check(self): -- if sys.platform == 'win32': -+ if sys.platform == 'win32' and not MSYS: - check_include_file(get_include_dirs(), 'png.h', 'png') - return 'Using unknown version found on system.' - + conda_env_path = (os.getenv('CONDA_PREFIX') # conda >= 4.1 + or os.getenv('CONDA_DEFAULT_ENV')) # conda < 4.1 + if conda_env_path and os.path.isdir(conda_env_path):