diff --git a/community/python-matplotlib/PKGBUILD b/community/python-matplotlib/PKGBUILD index d992bb9d8..a06631984 100644 --- a/community/python-matplotlib/PKGBUILD +++ b/community/python-matplotlib/PKGBUILD @@ -10,8 +10,8 @@ # - disable lto via setup.cfg pkgname=python-matplotlib -pkgver=3.3.0 -pkgrel=3 +pkgver=3.3.1 +pkgrel=1 pkgdesc="A python plotting library, making publication quality plots" arch=(x86_64) url="https://matplotlib.org" @@ -36,34 +36,30 @@ makedepends=(git rsync python-setuptools checkdepends=(python-pytest-xdist python-pytest-runner xorg-server-xvfb texlive-core texlive-latexextra inkscape mencoder ffmpeg imagemagick ttf-freefont python-pandas) -source=("https://github.com/matplotlib/matplotlib/archive/v${pkgver}/${pkgname}-${pkgver}.tar.gz" - matplotlib-fix-path-of-degenerate-polygons.patch::"https://github.com/matplotlib/matplotlib/commit/07847dd2.patch") -sha512sums=('79555a175ef1e63da4f3d2457dc44dd825dbe4b5833696fa9ba57bfc654dc4df286ede4357ee276f19d674be1cb622e8718000a74c1f122cc13641f4d3ad0ada' - 'b16c4af737a08004ad83f5eb058ffd1470f6cb522114ef8ef74e211887a6c00809b7f475cdb83cceb46aaaff6acfd0c25c8ba1fbcbf2fd536e09efde35e80e2a') +source=("https://github.com/matplotlib/matplotlib/archive/v$pkgver/$pkgname-$pkgver.tar.gz") +sha512sums=('b6eceb4244ffef9aabafb6889563e9be503272599022e45c54e70c9e76a791e9ffb9f108a993a42f2e8f25bebb94483e75a8c17924224ccc1a19ce3aa5268196') prepare() { - cd matplotlib-${pkgver} - patch -p1 -i ../matplotlib-fix-path-of-degenerate-polygons.patch # Fix path of degenerate polygons - + cd matplotlib-$pkgver # Use system freetype and qhull, disable LTO sed -e 's|#system_freetype = False|system_freetype = True|' -e 's|#system_qhull = False|system_qhull = True|' -e 's|#enable_lto = True|enable_lto = False|' setup.cfg.template > setup.cfg } build() { - cd matplotlib-${pkgver} + cd matplotlib-$pkgver python setup.py build } check() { - cd matplotlib-${pkgver} + cd matplotlib-$pkgver xvfb-run -a -s "+extension GLX +extension RANDR +render -screen 0 1280x1024x24" \ python setup.py pytest --addopts="-n auto" || warning "Tests failed" # Different font rendering details } package_python-matplotlib() { - cd matplotlib-${pkgver} - python setup.py install --root "${pkgdir}" --prefix=/usr --optimize=1 --skip-build - install -Dm644 doc/users/license.rst -t "${pkgdir}"/usr/share/licenses/${pkgname}/ + cd matplotlib-$pkgver + python setup.py install --root "$pkgdir" --prefix=/usr --optimize=1 --skip-build + install -Dm644 doc/users/license.rst -t "$pkgdir"/usr/share/licenses/$pkgname/ # Needed since https://github.com/matplotlib/matplotlib/pull/14170 - rm -r "${pkgdir}"/usr/lib/python3.8/site-packages/{matplotlib,mpl_toolkits}/tests/ + rm -r "$pkgdir"/usr/lib/python3.8/site-packages/{matplotlib,mpl_toolkits}/tests/ }