From a24c9bc5a4fa6c3d9f65c57d5c8224ac17d8d07c Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Mon, 28 Mar 2022 18:49:24 +0200 Subject: [PATCH] - updated to 3.5.1 - removed obsolete system-qhull patch --- python3-matplotlib-system-qhull.patch | 20 ----- python3-matplotlib.spec | 113 +++++++++++++++++--------- 2 files changed, 73 insertions(+), 60 deletions(-) delete mode 100644 python3-matplotlib-system-qhull.patch diff --git a/python3-matplotlib-system-qhull.patch b/python3-matplotlib-system-qhull.patch deleted file mode 100644 index 8623ce0..0000000 --- a/python3-matplotlib-system-qhull.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- matplotlib-3.2.1/setupext.py.orig 2020-03-18 05:07:16.000000000 +0100 -+++ matplotlib-3.2.1/setupext.py 2020-04-02 22:15:45.165821667 +0200 -@@ -181,6 +181,7 @@ - - lft = bool(os.environ.get('MPLLOCALFREETYPE', False)) - options['local_freetype'] = lft or options.get('local_freetype', False) -+options['local_qhull'] = False - - staticbuild = bool(os.environ.get('MPLSTATICBUILD', os.name == 'nt')) - options['staticbuild'] = staticbuild or options.get('staticbuild', False) -@@ -678,6 +679,9 @@ - name = "qhull" - - def add_flags(self, ext): -+ if not options.get('local_qhull', False): -+ ext.libraries.append('qhull') -+ return - # Qhull doesn't distribute pkg-config info, so we have no way of - # knowing whether a system install is recent enough. Thus, always use - # the vendored version. diff --git a/python3-matplotlib.spec b/python3-matplotlib.spec index 8e099d2..d55f232 100644 --- a/python3-matplotlib.spec +++ b/python3-matplotlib.spec @@ -1,8 +1,12 @@ # # Conditional build: -%bcond_with tests # unit tests [many failures as of 1.5.3] +%bcond_with doc # Sphinx documentation +%bcond_with tests # unit tests [many failures as of 3.5.1, esp. with system freetype] +%bcond_without system_freetype # system freetype library +%bcond_without system_qhull # system qhull library # TODO: +# - finish doc # - use system fonts (mpl-data/fonts/ttf/{STIX,cm}*.ttf) and metrics (mpl-data/fonts/{afm,pdfcorefonts}/*.afm) in mpl-data dir? # - make sure all dependencies that are available for Python3 are build for Python3 # and included in BR when neccessary @@ -10,59 +14,75 @@ Summary: Matlab(TM) style Python plotting package Summary(pl.UTF-8): Pakiet do rysowania w Pythonie podobny do Matlaba(TM) Name: python3-%{module} -Version: 3.2.1 -Release: 4 +Version: 3.5.1 +Release: 1 License: PSF Group: Libraries/Python #Source0Download: https://github.com/matplotlib/matplotlib/releases Source0: https://github.com/matplotlib/matplotlib/archive/v%{version}/matplotlib-%{version}.tar.gz -# Source0-md5: 9186b1e9f1fc7d555f2abf64b35dea5b +# Source0-md5: 87af8f1bc31dbe2ea4cb54a8406aa6d6 Source1: https://jqueryui.com/resources/download/jquery-ui-1.12.1.zip # Source1-md5: e0cfea21c9d1acd37fb58592f2c1f50d -Patch0: %{name}-system-qhull.patch URL: https://matplotlib.org/ +# currently internal agg is used #BuildRequires: agg-devel -BuildRequires: freetype-devel >= 1:2.6.1 -BuildRequires: ghostscript -BuildRequires: gtk+3 >= 3.0 -BuildRequires: libpng-devel >= 1.2 +%{?with_system_freetype:BuildRequires: freetype-devel >= 1:2.6.1} BuildRequires: libstdc++-devel -BuildRequires: ncurses-devel BuildRequires: pkgconfig +BuildRequires: python3 >= 1:3.7 +BuildRequires: python3-certifi >= 2020.6.20 +BuildRequires: python3-devel >= 1:3.7 +BuildRequires: python3-numpy-devel >= 1:1.17 +BuildRequires: python3-setuptools +BuildRequires: python3-setuptools_scm >= 4 +BuildRequires: python3-setuptools_scm_git_archive +%{?with_system_qhull:BuildRequires: qhull-devel >= 2015.2} +BuildRequires: rpm-pythonprov +BuildRequires: rpmbuild(macros) >= 1.714 +%if %{with tests} +BuildRequires: ghostscript +BuildRequires: gtk+3 >= 3.0 # /usr/bin/pdftops BuildRequires: poppler-progs -BuildRequires: python3 >= 1:3.6 -BuildRequires: python3-2to3 -BuildRequires: python3-PyQt4 +# or PyQt6>=6.1, PySide6, PySide2 BuildRequires: python3-PyQt5 BuildRequires: python3-cycler >= 0.10 -BuildRequires: python3-dateutil >= 2.2 -BuildRequires: python3-devel >= 1:3.6 -BuildRequires: python3-numpy-devel >= 1:1.7.1 -# or cairocffi -BuildRequires: python3-pycairo -BuildRequires: python3-pygobject3-devel >= 3.0 -BuildRequires: python3-pyparsing >= 2.1.7 -BuildRequires: python3-pytz -BuildRequires: python3-six >= 1.10 -BuildRequires: python3-setuptools -# for import pyqtconfig needed by qt detection. -BuildRequires: python3-sip-devel -BuildRequires: python3-tkinter -BuildRequires: python3-tornado -#BuildRequires: python3-wxPython >= 2.9 -%if %{with tests} +BuildRequires: python3-dateutil >= 2.7 +BuildRequires: python3-fonttools >= 4.22.0 BuildRequires: python3-kiwisolver >= 1.0.1 +BuildRequires: python3-packaging >= 20.0 +BuildRequires: python3-pillow >= 6.2.0 +# or cairocffi >= 0.8 +BuildRequires: python3-pycairo >= 1.11.0 +BuildRequires: python3-pygobject3 >= 3.0 +BuildRequires: python3-pyparsing >= 2.2.1 BuildRequires: python3-pytest >= 3.6 -%endif -BuildRequires: qhull-devel >= 2015.2 -BuildRequires: rpm-pythonprov -BuildRequires: rpmbuild(macros) >= 1.714 +BuildRequires: python3-pytz +BuildRequires: python3-tkinter >= 1:3.7 +BuildRequires: python3-tornado >= 5 +#BuildRequires: python3-wxPython >= 4 # /usr/bin/dvipng BuildRequires: texlive -BuildRequires: tk-devel -Requires: freetype >= 1:2.6.1 -Requires: python3-modules >= 1:3.6 +BuildRequires: texlive-xetex +# Font EU1/lmr/m/n/10=[lmroman10-regular]:mapping=tex-text at 10.0pt +#BuildRequires: texlive-??? +%endif +%if %{with doc} +BuildRequires: python3-colorspacious +BuildRequires: python3-ipython +BuildRequires: python3-ipywidgets +BuildRequires: python3-mpl-sphinx-theme +BuildRequires: python3-numpydoc >= 0.8 +BuildRequires: python3-packaging >= 20 +BuildRequires: python3-scipy +BuildRequires: python3-sphinx_copybutton +BuildRequires: python3-sphinx_gallery >= 0.10 +BuildRequires: python3-sphinx_panels +BuildRequires: python3-sphinxcontrib-svg2pdfconverter >= 1.1.0 +BuildRequires: sphinx-pdg >= 2.0.1 +%endif +%{?with_system_freetype:Requires: freetype >= 1:2.6.1} +Requires: python3-modules >= 1:3.7 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -79,18 +99,31 @@ przechodzących z Matlaba. %prep %setup -q -n %{module}-%{version} -%patch0 -p1 unzip -q %{SOURCE1} -d lib/matplotlib/backends/web_backend +cat >mplsetup.cfg <