From b84fcf91c2343b90c951ee8caec5b1bae7d6cb79 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Fri, 24 Mar 2023 11:24:57 +0100 Subject: [PATCH] fonttools: bump version, switch to python 3.10 --- ...s-4.0.2.recipe => fonttools-4.39.2.recipe} | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) rename dev-python/fonttools/{fonttools-4.0.2.recipe => fonttools-4.39.2.recipe} (76%) diff --git a/dev-python/fonttools/fonttools-4.0.2.recipe b/dev-python/fonttools/fonttools-4.39.2.recipe similarity index 76% rename from dev-python/fonttools/fonttools-4.0.2.recipe rename to dev-python/fonttools/fonttools-4.39.2.recipe index 63425622b..4a803e01d 100644 --- a/dev-python/fonttools/fonttools-4.0.2.recipe +++ b/dev-python/fonttools/fonttools-4.39.2.recipe @@ -8,7 +8,7 @@ LICENSE="FONTTOOLS" REVISION="1" SOURCE_URI="https://github.com/fonttools/fonttools/archive/$portVersion.tar.gz" SOURCE_FILENAME="fonttools-$portVersion.tar.gz" -CHECKSUM_SHA256="0c92b058ccbcd44f71fe094c06bba105c989ae552852486411cd19a3763eed2c" +CHECKSUM_SHA256="f49a6d3cf67c44a2e8da4435f42e736cbc96591c7033f86ab9f778b11b266b17" ARCHITECTURES="any" @@ -23,8 +23,8 @@ BUILD_REQUIRES=" haiku_devel " -PYTHON_PACKAGES=(python3) -PYTHON_VERSIONS=(3.7) +PYTHON_PACKAGES=(python310) +PYTHON_VERSIONS=(3.10) for i in "${!PYTHON_PACKAGES[@]}"; do pythonPackage=${PYTHON_PACKAGES[i]} pythonVersion=${PYTHON_VERSIONS[$i]} @@ -37,20 +37,23 @@ REQUIRES_$pythonPackage=\"\ setuptools_$pythonPackage\n\ \"" BUILD_REQUIRES="$BUILD_REQUIRES - setuptools_$pythonPackage" + setuptools_$pythonPackage + wheel_$pythonPackage" BUILD_PREREQUIRES="$BUILD_PREREQUIRES + build_$pythonPackage + installer_$pythonPackage cmd:python$pythonVersion" done -PROVIDES_python3="$PROVIDES_python3 +PROVIDES_python310="$PROVIDES_python310 cmd:fonttools cmd:pyftinspect cmd:pyftmerge cmd:pyftsubset cmd:ttx " -REPLACES_python3=" - python3_fonttools +REPLACES_python310=" + fonttools_python3 " INSTALL() @@ -60,12 +63,9 @@ INSTALL() pythonVersion=${PYTHON_VERSIONS[$i]} python=python$pythonVersion - installLocation=$prefix/lib/$python/vendor-packages/ - export PYTHONPATH=$installLocation:$PYTHONPATH - mkdir -p $installLocation rm -rf build - $python setup.py build install \ - --root=/ --prefix=$prefix + $python -m build -wn + $python -m installer -p $prefix dist/*.whl packageEntries $pythonPackage \ $prefix/lib/python* \