From 63d95ef5f26a633e3a08b4dfb4eeadfd624e0883 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Thu, 5 Dec 2024 15:32:28 -0500 Subject: [PATCH] Update to latest version --- .gitignore | 2 ++ 0001-matplotlibrc-path-search-fix.patch | 12 ++++++------ 0002-Unpin-NumPy-build-requirement.patch | 10 +++++----- ...version-to-2.13.1-and-update-tolerances.patch | 16 ++++++++-------- ...de_windows-implementation-on-32-bit-x86.patch | 4 ++-- python-matplotlib.spec | 6 ++++-- sources | 4 ++-- 7 files changed, 29 insertions(+), 25 deletions(-) diff --git a/.gitignore b/.gitignore index 83645e4..f8d4aa8 100644 --- a/.gitignore +++ b/.gitignore @@ -112,3 +112,5 @@ matplotlib-1.0.0-without-gpc.tar.gz /matplotlib-3.9.0-with-freetype-2.13.1.tar.gz /matplotlib-3.9.1.tar.gz /matplotlib-3.9.1-with-freetype-2.13.1.tar.gz +/matplotlib-3.9.3.tar.gz +/matplotlib-3.9.3-with-freetype-2.13.1.tar.gz diff --git a/0001-matplotlibrc-path-search-fix.patch b/0001-matplotlibrc-path-search-fix.patch index 5ba6270..41c9932 100644 --- a/0001-matplotlibrc-path-search-fix.patch +++ b/0001-matplotlibrc-path-search-fix.patch @@ -1,4 +1,4 @@ -From 7aa7b4d240236c0660be400a7a9ef7d5837e6d47 Mon Sep 17 00:00:00 2001 +From b85e909efee16d840db527a849111eedde9acb89 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Wed, 27 Sep 2017 19:35:59 -0400 Subject: [PATCH 1/4] matplotlibrc path search fix @@ -9,10 +9,10 @@ Signed-off-by: Elliott Sales de Andrade 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py -index 9e9325a27d..346e3d3454 100644 +index ad4676b11a..b925a4a703 100644 --- a/lib/matplotlib/__init__.py +++ b/lib/matplotlib/__init__.py -@@ -586,7 +586,8 @@ def get_cachedir(): +@@ -589,7 +589,8 @@ def get_cachedir(): @_logged_cached('matplotlib data path: %s') def get_data_path(): """Return the path to Matplotlib data.""" @@ -22,7 +22,7 @@ index 9e9325a27d..346e3d3454 100644 def matplotlib_fname(): -@@ -606,6 +607,7 @@ def matplotlib_fname(): +@@ -609,6 +610,7 @@ def matplotlib_fname(): is not defined) - On other platforms, - ``$HOME/.matplotlib/matplotlibrc`` if ``$HOME`` is defined @@ -30,7 +30,7 @@ index 9e9325a27d..346e3d3454 100644 - Lastly, it looks in ``$MATPLOTLIBDATA/matplotlibrc``, which should always exist. """ -@@ -624,6 +626,7 @@ def matplotlib_fname(): +@@ -627,6 +629,7 @@ def matplotlib_fname(): yield matplotlibrc yield os.path.join(matplotlibrc, 'matplotlibrc') yield os.path.join(get_configdir(), 'matplotlibrc') @@ -39,5 +39,5 @@ index 9e9325a27d..346e3d3454 100644 for fname in gen_candidates(): -- -2.44.0 +2.47.0 diff --git a/0002-Unpin-NumPy-build-requirement.patch b/0002-Unpin-NumPy-build-requirement.patch index 0f536ac..423a435 100644 --- a/0002-Unpin-NumPy-build-requirement.patch +++ b/0002-Unpin-NumPy-build-requirement.patch @@ -1,4 +1,4 @@ -From 6caae8127c121be0ad36e0e7b47518519543dffd Mon Sep 17 00:00:00 2001 +From c82939ce4b67cf3f9b6a77f612c8cc977d405484 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Fri, 11 Aug 2023 02:36:06 -0400 Subject: [PATCH 2/4] Unpin NumPy build requirement @@ -13,12 +13,12 @@ Signed-off-by: Elliott Sales de Andrade 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/pyproject.toml b/pyproject.toml -index fe75b325dc..4c34fa395f 100644 +index c0237c7df5..bdf2119f1b 100644 --- a/pyproject.toml +++ b/pyproject.toml -@@ -75,18 +75,7 @@ requires = [ +@@ -76,18 +76,7 @@ requires = [ "meson-python>=0.13.1", - "pybind11>=2.6", + "pybind11>=2.6,!=2.13.3", "setuptools_scm>=7", - - # Comments on numpy build requirement range: @@ -37,5 +37,5 @@ index fe75b325dc..4c34fa395f 100644 [tool.meson-python.args] -- -2.44.0 +2.47.0 diff --git a/0003-Set-FreeType-version-to-2.13.1-and-update-tolerances.patch b/0003-Set-FreeType-version-to-2.13.1-and-update-tolerances.patch index d8a3a14..04b88da 100644 --- a/0003-Set-FreeType-version-to-2.13.1-and-update-tolerances.patch +++ b/0003-Set-FreeType-version-to-2.13.1-and-update-tolerances.patch @@ -1,4 +1,4 @@ -From d2ce17b7096e9f83f9ba4ac37052fe5d2e07f223 Mon Sep 17 00:00:00 2001 +From e90a1621fb10aaf9ecceba6b1a7bc48e8c81b877 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Fri, 14 Feb 2020 06:05:42 -0500 Subject: [PATCH 3/4] Set FreeType version to 2.13.1 and update tolerances @@ -29,10 +29,10 @@ index 662feb7872..df42b908af 100644 freetype_proj = subproject( f'freetype-@LOCAL_FREETYPE_VERSION@', diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py -index 346e3d3454..ebf5818417 100644 +index b925a4a703..ec68e4932b 100644 --- a/lib/matplotlib/__init__.py +++ b/lib/matplotlib/__init__.py -@@ -1313,7 +1313,7 @@ def _val_or_rc(val, rc_name): +@@ -1316,7 +1316,7 @@ def _val_or_rc(val, rc_name): def _init_tests(): # The version of FreeType to install locally for running the tests. This must match # the value in `meson.build`. @@ -42,10 +42,10 @@ index 346e3d3454..ebf5818417 100644 from matplotlib import ft2font if (ft2font.__freetype_version__ != LOCAL_FREETYPE_VERSION or diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py -index 0ed5a11c13..ee220f1854 100644 +index e99ef129eb..2355c82f62 100644 --- a/lib/matplotlib/tests/test_axes.py +++ b/lib/matplotlib/tests/test_axes.py -@@ -7714,7 +7714,7 @@ def test_normal_axes(): +@@ -7765,7 +7765,7 @@ def test_normal_axes(): ] for nn, b in enumerate(bbaxis): targetbb = mtransforms.Bbox.from_bounds(*target[nn]) @@ -54,7 +54,7 @@ index 0ed5a11c13..ee220f1854 100644 target = [ [150.0, 119.999, 930.0, 11.111], -@@ -7732,7 +7732,7 @@ def test_normal_axes(): +@@ -7783,7 +7783,7 @@ def test_normal_axes(): target = [85.5138, 75.88888, 1021.11, 1017.11] targetbb = mtransforms.Bbox.from_bounds(*target) @@ -115,7 +115,7 @@ index 4dc4d9501e..47a4e80bb5 100644 @pytest.mark.parametrize('arg, state', [ diff --git a/lib/matplotlib/tests/test_legend.py b/lib/matplotlib/tests/test_legend.py -index 0353f1408b..f5b341daaa 100644 +index 3c2af27564..2b8709f934 100644 --- a/lib/matplotlib/tests/test_legend.py +++ b/lib/matplotlib/tests/test_legend.py @@ -520,9 +520,9 @@ def test_figure_legend_outside(): @@ -167,5 +167,5 @@ index 9c654f4d1f..9678e34a80 100644 -- -2.44.0 +2.47.0 diff --git a/0004-Use-old-stride_windows-implementation-on-32-bit-x86.patch b/0004-Use-old-stride_windows-implementation-on-32-bit-x86.patch index 56a4743..0e01f95 100644 --- a/0004-Use-old-stride_windows-implementation-on-32-bit-x86.patch +++ b/0004-Use-old-stride_windows-implementation-on-32-bit-x86.patch @@ -1,4 +1,4 @@ -From 0aecbcfd5fd12c79f1f71998be9f86fc4108d91d Mon Sep 17 00:00:00 2001 +From 7e1a12e82a9872a4356a812daf3478e522fe5c6c Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Mon, 22 Aug 2022 18:43:28 -0400 Subject: [PATCH 4/4] Use old stride_windows implementation on 32-bit x86 @@ -80,5 +80,5 @@ index e1f08c0da5..5c0d56c74d 100644 resultY = resultY * window.reshape((-1, 1)) resultY = np.fft.fft(resultY, n=pad_to, axis=0)[:numFreqs, :] -- -2.44.0 +2.47.0 diff --git a/python-matplotlib.spec b/python-matplotlib.spec index 2d87ae4..73285c9 100644 --- a/python-matplotlib.spec +++ b/python-matplotlib.spec @@ -32,13 +32,13 @@ %global _docdir_fmt %{name} # Updated test images for new FreeType. -%global mpl_images_version 3.9.1 +%global mpl_images_version 3.9.3 # The version of FreeType in this Fedora branch. %global ftver 2.13.1 Name: python-matplotlib -Version: 3.9.1 +Version: 3.9.3 %global Version %{version_no_tilde %{quote:%nil}} Release: %autorelease Summary: Python 2D plotting library @@ -371,6 +371,8 @@ k="${k-}${k+ and }not test_form_widget_get_with_datetime_and_date_fields" k="${k-}${k+ and }not test_cross_Qt_imports" %endif +# This fixes GTK4 which is missing a dependency for its current default renderer. +GSK_RENDERER=cairo \ MPLCONFIGDIR=$PWD \ %ifnarch %{ix86} xvfb-run -a -s "-screen 0 640x480x24" \ diff --git a/sources b/sources index 10eb91a..e17917b 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (matplotlib-3.9.1.tar.gz) = a1d48c42a5f4f04b57e34d25df842917e6380b8d6b6d1018c9b630cbbea4619b1d75729a218a6f52b63d4a61c2204bb26ad8f741566f84e41ca73190e419f672 -SHA512 (matplotlib-3.9.1-with-freetype-2.13.1.tar.gz) = 7d7d04d410265e6f3adc95bc103f12432f5c3c2b3788ab11f2326054f1cd116ff795bd2d2999cdb4da997df597bec00bbba61acea6de5eb9d56c686aa47a7bf7 +SHA512 (matplotlib-3.9.3.tar.gz) = f42a1bc8febf88369b5164879f32bc7967fe0930e42d12395722ac3d2c10a8c59ac9419b68c4bcb499c7df26dfc429dafb672b61f85aee971dd270b0e29742ed +SHA512 (matplotlib-3.9.3-with-freetype-2.13.1.tar.gz) = 53cb50ae711ba5ba38d42b7723bbfbd74d022cad6ab91de6c05fb0e971c0b8212ad33359b2ea7ce5a0365cdb1708cd58773bae2e0bf0d4a37696b28206083eed