diff --git a/.gitignore b/.gitignore index f8d4aa8..16f8d72 100644 --- a/.gitignore +++ b/.gitignore @@ -114,3 +114,4 @@ matplotlib-1.0.0-without-gpc.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 +/matplotlib-3.9.4.tar.gz diff --git a/0001-matplotlibrc-path-search-fix.patch b/0001-matplotlibrc-path-search-fix.patch index 41c9932..a189044 100644 --- a/0001-matplotlibrc-path-search-fix.patch +++ b/0001-matplotlibrc-path-search-fix.patch @@ -1,7 +1,7 @@ -From b85e909efee16d840db527a849111eedde9acb89 Mon Sep 17 00:00:00 2001 +From fde31cca645d54c6f019d4882b6fe4e71a6dc946 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 +Subject: [PATCH 1/5] matplotlibrc path search fix Signed-off-by: Elliott Sales de Andrade --- diff --git a/0002-Unpin-NumPy-build-requirement.patch b/0002-Unpin-NumPy-build-requirement.patch index 423a435..d87498a 100644 --- a/0002-Unpin-NumPy-build-requirement.patch +++ b/0002-Unpin-NumPy-build-requirement.patch @@ -1,7 +1,7 @@ -From c82939ce4b67cf3f9b6a77f612c8cc977d405484 Mon Sep 17 00:00:00 2001 +From 9421754530479435e21a98d2f549330899ed8d85 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 +Subject: [PATCH 2/5] Unpin NumPy build requirement This is so high simply to take advantage of the new backwards-compatibility guarantee in NumPy 1.25, but Fedora will never @@ -13,11 +13,11 @@ Signed-off-by: Elliott Sales de Andrade 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/pyproject.toml b/pyproject.toml -index c0237c7df5..bdf2119f1b 100644 +index aa6aa23506..1894bbf3cd 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -76,18 +76,7 @@ requires = [ - "meson-python>=0.13.1", + "meson-python>=0.13.1,<0.17.0", "pybind11>=2.6,!=2.13.3", "setuptools_scm>=7", - 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 04b88da..21d78dc 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,7 +1,7 @@ -From e90a1621fb10aaf9ecceba6b1a7bc48e8c81b877 Mon Sep 17 00:00:00 2001 +From 283c5005dbbbea1147e539075032d6ec43c88166 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 +Subject: [PATCH 3/5] Set FreeType version to 2.13.1 and update tolerances Signed-off-by: Elliott Sales de Andrade --- diff --git a/0004-Unpin-meson-python-build-requirement.patch b/0004-Unpin-meson-python-build-requirement.patch new file mode 100644 index 0000000..b7135a0 --- /dev/null +++ b/0004-Unpin-meson-python-build-requirement.patch @@ -0,0 +1,38 @@ +From b671c4141dc9692ce8745a4ddb9f6b0b14e5e70f Mon Sep 17 00:00:00 2001 +From: Elliott Sales de Andrade +Date: Fri, 13 Dec 2024 02:03:33 -0500 +Subject: [PATCH 4/5] Unpin meson-python build requirement + +This is pinned to fix sdists, but we already have one and are building a +wheel, which should be fine. + +Signed-off-by: Elliott Sales de Andrade +--- + pyproject.toml | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/pyproject.toml b/pyproject.toml +index 1894bbf3cd..bdf2119f1b 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -48,7 +48,7 @@ requires-python = ">=3.9" + [project.optional-dependencies] + # Should be a copy of the build dependencies below. + dev = [ +- "meson-python>=0.13.1,<0.17.0", ++ "meson-python>=0.13.1", + "numpy>=1.25", + "pybind11>=2.6,!=2.13.3", + "setuptools_scm>=7", +@@ -73,7 +73,7 @@ dev = [ + build-backend = "mesonpy" + # Also keep in sync with optional dependencies above. + requires = [ +- "meson-python>=0.13.1,<0.17.0", ++ "meson-python>=0.13.1", + "pybind11>=2.6,!=2.13.3", + "setuptools_scm>=7", + "numpy", +-- +2.47.0 + diff --git a/0004-Use-old-stride_windows-implementation-on-32-bit-x86.patch b/0005-Use-old-stride_windows-implementation-on-32-bit-x86.patch similarity index 96% rename from 0004-Use-old-stride_windows-implementation-on-32-bit-x86.patch rename to 0005-Use-old-stride_windows-implementation-on-32-bit-x86.patch index 0e01f95..1c729f1 100644 --- a/0004-Use-old-stride_windows-implementation-on-32-bit-x86.patch +++ b/0005-Use-old-stride_windows-implementation-on-32-bit-x86.patch @@ -1,7 +1,7 @@ -From 7e1a12e82a9872a4356a812daf3478e522fe5c6c Mon Sep 17 00:00:00 2001 +From f6ecac5a3c02b32d66acd0fff41e1732d0939f60 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 +Subject: [PATCH 5/5] Use old stride_windows implementation on 32-bit x86 Signed-off-by: Elliott Sales de Andrade --- diff --git a/python-matplotlib.spec b/python-matplotlib.spec index 73285c9..11ff468 100644 --- a/python-matplotlib.spec +++ b/python-matplotlib.spec @@ -38,7 +38,7 @@ %global ftver 2.13.1 Name: python-matplotlib -Version: 3.9.3 +Version: 3.9.4 %global Version %{version_no_tilde %{quote:%nil}} Release: %autorelease Summary: Python 2D plotting library @@ -58,9 +58,11 @@ Patch1001: 0001-matplotlibrc-path-search-fix.patch Patch1002: 0002-Unpin-NumPy-build-requirement.patch # Increase tolerances for new FreeType everywhere: Patch1003: 0003-Set-FreeType-version-to-%{ftver}-and-update-tolerances.patch +# We don't need to use older meson-python. +Patch1004: 0004-Unpin-meson-python-build-requirement.patch # https://github.com/matplotlib/matplotlib/pull/21190#issuecomment-1223271888 -Patch0001: 0004-Use-old-stride_windows-implementation-on-32-bit-x86.patch +Patch0001: 0005-Use-old-stride_windows-implementation-on-32-bit-x86.patch BuildRequires: gcc BuildRequires: gcc-c++ @@ -158,7 +160,7 @@ Obsoletes: python-matplotlib-data < 3 Summary: Fonts used by python-matplotlib # Carlogo, STIX and Computer Modern is OFL # DejaVu is Bitstream Vera and Public Domain -License: OFL-1.1 and Bitstream-Vera and LicenseRef-Fedora-Public-Domain +License: OFL-1.1 AND Bitstream-Vera AND LicenseRef-Fedora-Public-Domain BuildArch: noarch Requires: python3-matplotlib-data = %{version}-%{release} Obsoletes: python-matplotlib-data-fonts < 3 diff --git a/sources b/sources index e17917b..f6538f1 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (matplotlib-3.9.3.tar.gz) = f42a1bc8febf88369b5164879f32bc7967fe0930e42d12395722ac3d2c10a8c59ac9419b68c4bcb499c7df26dfc429dafb672b61f85aee971dd270b0e29742ed +SHA512 (matplotlib-3.9.4.tar.gz) = adfa875cba0b030ee0efaf11ed1be881858dc13391c966a2d9485ae2358fccf0b5356e16966a0c9da9f682e4a9d2f3960551756aca30ddc048632346548b1447 SHA512 (matplotlib-3.9.3-with-freetype-2.13.1.tar.gz) = 53cb50ae711ba5ba38d42b7723bbfbd74d022cad6ab91de6c05fb0e971c0b8212ad33359b2ea7ce5a0365cdb1708cd58773bae2e0bf0d4a37696b28206083eed