matplotlib, bump version (#8882)

* matplotlib, bump version * Update dev-python/matplotlib/matplotlib-3.7.1.recipe Co-authored-by: OscarL <[email protected]> --------- Co-authored-by: OscarL <[email protected]>
haikuports · Aug 15, 2023 · 68e4912 · 68e4912
1 parent 141270b
commit 68e4912
Showing 1 changed file with 30 additions and 22 deletions.
diff --git a/...python/matplotlib/matplotlib-3.3.4.recipe → ...python/matplotlib/matplotlib-3.7.1.recipe b/...python/matplotlib/matplotlib-3.3.4.recipe → ...python/matplotlib/matplotlib-3.7.1.recipe
@@ -23,11 +23,10 @@ LICENSE="Matplotlib
 	Qhull
 	STIX
 	yorick"
-REVISION="3"
+REVISION="1"
 SOURCE_URI="https://github.com/matplotlib/matplotlib/archive/v$portVersion.tar.gz"
-CHECKSUM_SHA256="ce7cebd3df11a032fff9b3a32029f49f0fc7c322f556f26ea9ef812d6e43cb21"
+CHECKSUM_SHA256="3bea99442a7ef038bed34acb6d5adedfb787abce8b43f4817586089ff8887098"
 SOURCE_FILENAME="matplotlib-$portVersion.tar.gz"
-SOURCE_DIR="matplotlib-$portVersion"
 
 ARCHITECTURES="all !x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"
@@ -37,50 +36,59 @@ PROVIDES="
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
-	pyqt5$secondaryArchSuffix
-	lib:libpng16$secondaryArchSuffix
-	lib:libfreetype$secondaryArchSuffix
 	"
 
-pythonPackage="python39"
-pythonVersion="3.9"
+pythonPackage="python310"
+pythonVersion="3.10"
 
-PROVIDES_python39="
+PROVIDES_python310="
 	${portName}_$pythonPackage = $portVersion
 	"
-REQUIRES_python39="
+REQUIRES_python310="
 	cmd:python$pythonVersion
-	matplotlib$secondaryArchSuffix
+	lib:libfreetype$secondaryArchSuffix
+	lib:libqhull_r$secondaryArchSuffix
 	dateutil_$pythonPackage
-	numpy${secondaryArchSuffix}_$pythonPackage
-	pillow${secondaryArchSuffix}_$pythonPackage
-	kiwisolver${secondaryArchSuffix}_$pythonPackage
-	pytz_$pythonPackage
-	six_$pythonPackage
+	fonttools_$pythonPackage
+	contourpy_$pythonPackage
+	cycler_$pythonPackage
+	numpy_$pythonPackage
+	kiwisolver_$pythonPackage
+	pyparsing_$pythonPackage
 	"
 
+if [ "$targetArchitecture" = x86_gcc2 ]; then
+	eval "PROVIDES_python310+=\"
+		matplotlib_python310 = $portVersion
+		\""
+fi
+
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	devel:libpng16$secondaryArchSuffix
 	devel:libfreetype$secondaryArchSuffix
-	numpy${secondaryArchSuffix}_$pythonPackage
+	devel:libqhull_r$secondaryArchSuffix
+	numpy_$pythonPackage
+	packaging_$pythonPackage
+	pybind11_$pythonPackage
+	setuptools_scm_$pythonPackage
+	tomli_$pythonPackage
 	"
 BUILD_PREREQUIRES="
+	cmd:awk
+	cmd:cmp
 	cmd:gcc$secondaryArchSuffix
 	cmd:make
 	cmd:pkg_config$secondaryArchSuffix
 	cmd:python$pythonVersion
-	pip_$pythonPackage
-	setuptools_$pythonPackage
 	"
 
 INSTALL()
 {
-cat > setup.cfg << EOF
+cat > mplsetup.cfg << EOF
 [libs]
 enable_lto = True
 system_freetype = True
-system_qhull = False
+system_qhull = True
 
 [packages]
 sample_data = True