diff --git a/graphics/py-cairocffi/Makefile b/graphics/py-cairocffi/Makefile index 24fce253fd85..fb071ff5bd75 100644 --- a/graphics/py-cairocffi/Makefile +++ b/graphics/py-cairocffi/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.28 2024/04/07 07:34:19 wiz Exp $ +# $NetBSD: Makefile,v 1.29 2024/04/30 08:15:20 wiz Exp $ -DISTNAME= cairocffi-0.9.0 +DISTNAME= cairocffi-1.7.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} -PKGREVISION= 12 CATEGORIES= graphics python MASTER_SITES= ${MASTER_SITE_PYPI:=c/cairocffi/} @@ -11,13 +10,17 @@ HOMEPAGE= https://github.com/SimonSapin/cairocffi COMMENT= CFFI-based Cairo bindings for Python LICENSE= modified-bsd -PYTHON_VERSIONED_DEPENDENCIES= cffi +TOOL_DEPENDS+= ${PYPKGPREFIX}-flit_core-[0-9]*:../../devel/py-flit_core +DEPENDS+= ${PYPKGPREFIX}-cffi-[0-9]*:../../devel/py-cffi +TEST_DEPENDS+= ${PYPKGPREFIX}-numpy-[0-9]*:../../math/py-numpy +TEST_DEPENDS+= ${PYPKGPREFIX}-pikepdf-[0-9]*:../../print/py-pikepdf + +PYTHON_VERSIONS_INCOMPATIBLE= 27 USE_LANGUAGES= # none .include "../../devel/glib2/buildlink3.mk" .include "../../graphics/cairo/buildlink3.mk" .include "../../graphics/gdk-pixbuf2/buildlink3.mk" -.include "../../lang/python/versioned_dependencies.mk" -.include "../../lang/python/egg.mk" +.include "../../lang/python/wheel.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/py-cairocffi/PLIST b/graphics/py-cairocffi/PLIST index a6f93e062ad8..c796714ecd52 100644 --- a/graphics/py-cairocffi/PLIST +++ b/graphics/py-cairocffi/PLIST @@ -1,30 +1,20 @@ -@comment $NetBSD: PLIST,v 1.3 2017/07/16 09:29:58 adam Exp $ -${PYSITELIB}/${EGG_INFODIR}/PKG-INFO -${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt -${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt -${PYSITELIB}/${EGG_INFODIR}/requires.txt -${PYSITELIB}/${EGG_INFODIR}/top_level.txt +@comment $NetBSD: PLIST,v 1.4 2024/04/30 08:15:20 wiz Exp $ +${PYSITELIB}/${WHEEL_INFODIR}/LICENSE +${PYSITELIB}/${WHEEL_INFODIR}/METADATA +${PYSITELIB}/${WHEEL_INFODIR}/RECORD +${PYSITELIB}/${WHEEL_INFODIR}/WHEEL ${PYSITELIB}/cairocffi/__init__.py ${PYSITELIB}/cairocffi/__init__.pyc ${PYSITELIB}/cairocffi/__init__.pyo -${PYSITELIB}/cairocffi/_ffi.py -${PYSITELIB}/cairocffi/_ffi.pyc -${PYSITELIB}/cairocffi/_ffi.pyo -${PYSITELIB}/cairocffi/_ffi_pixbuf.py -${PYSITELIB}/cairocffi/_ffi_pixbuf.pyc -${PYSITELIB}/cairocffi/_ffi_pixbuf.pyo -${PYSITELIB}/cairocffi/compat.py -${PYSITELIB}/cairocffi/compat.pyc -${PYSITELIB}/cairocffi/compat.pyo ${PYSITELIB}/cairocffi/constants.py ${PYSITELIB}/cairocffi/constants.pyc ${PYSITELIB}/cairocffi/constants.pyo ${PYSITELIB}/cairocffi/context.py ${PYSITELIB}/cairocffi/context.pyc ${PYSITELIB}/cairocffi/context.pyo -${PYSITELIB}/cairocffi/ffi_build.py -${PYSITELIB}/cairocffi/ffi_build.pyc -${PYSITELIB}/cairocffi/ffi_build.pyo +${PYSITELIB}/cairocffi/ffi.py +${PYSITELIB}/cairocffi/ffi.pyc +${PYSITELIB}/cairocffi/ffi.pyo ${PYSITELIB}/cairocffi/fonts.py ${PYSITELIB}/cairocffi/fonts.pyc ${PYSITELIB}/cairocffi/fonts.pyo @@ -43,6 +33,9 @@ ${PYSITELIB}/cairocffi/surfaces.pyo ${PYSITELIB}/cairocffi/test_cairo.py ${PYSITELIB}/cairocffi/test_cairo.pyc ${PYSITELIB}/cairocffi/test_cairo.pyo +${PYSITELIB}/cairocffi/test_numpy.py +${PYSITELIB}/cairocffi/test_numpy.pyc +${PYSITELIB}/cairocffi/test_numpy.pyo ${PYSITELIB}/cairocffi/test_pixbuf.py ${PYSITELIB}/cairocffi/test_pixbuf.pyc ${PYSITELIB}/cairocffi/test_pixbuf.pyo diff --git a/graphics/py-cairocffi/distinfo b/graphics/py-cairocffi/distinfo index 6e52a4dc4eca..49af9c967415 100644 --- a/graphics/py-cairocffi/distinfo +++ b/graphics/py-cairocffi/distinfo @@ -1,6 +1,5 @@ -$NetBSD: distinfo,v 1.9 2021/10/26 10:46:44 nia Exp $ +$NetBSD: distinfo,v 1.10 2024/04/30 08:15:20 wiz Exp $ -BLAKE2s (cairocffi-0.9.0.tar.gz) = 92eea93008fb68221ef374ed3d8070ffadb9ed42de75b64cfcd8191000c38a81 -SHA512 (cairocffi-0.9.0.tar.gz) = 0d3d54e0d54b3696c8336d8b3a6d745628da51d9d9f8c50f36006c007e1432a95dd9bafd8d865923059d040cc4e9f7989b3670a5318383b357ffc979eeb920d5 -Size (cairocffi-0.9.0.tar.gz) = 84652 bytes -SHA1 (patch-cairocffi_____init____.py) = 25e068711b14523041f07163104fd8fb75d7e9cb +BLAKE2s (cairocffi-1.7.0.tar.gz) = 8455d4a4388f16c9fa0dff6ad062662fc7e285c22694dcae52a40dbeec8198bd +SHA512 (cairocffi-1.7.0.tar.gz) = bfc0f388a6ea1885523d99ad0ccfd59fec89848ef053c240ea9e3e8aab3f3aed5dc343b74de5cc72fb8512d460e55c70ef99a4ae4705fb1dd92d654a4197d7a9 +Size (cairocffi-1.7.0.tar.gz) = 87840 bytes diff --git a/graphics/py-cairocffi/patches/patch-cairocffi_____init____.py b/graphics/py-cairocffi/patches/patch-cairocffi_____init____.py deleted file mode 100644 index 461aff404fdf..000000000000 --- a/graphics/py-cairocffi/patches/patch-cairocffi_____init____.py +++ /dev/null @@ -1,31 +0,0 @@ -$NetBSD: patch-cairocffi_____init____.py,v 1.1 2018/07/18 00:24:30 joerg Exp $ - ---- cairocffi/__init__.py.orig 2017-02-03 11:41:24.000000000 +0000 -+++ cairocffi/__init__.py -@@ -12,6 +12,7 @@ - - import sys - import ctypes.util -+import sysconfig - - from . import constants - from .compat import FileNotFoundError -@@ -25,6 +26,18 @@ version_info = (1, 10, 0) - - def dlopen(ffi, *names): - """Try various names for the same library, for different platforms.""" -+ # First pass: try to dlopen the shared library directly. -+ # This may fail on systems where SHLIB_SUFFIX is broken like OSX. -+ suffix = sysconfig.get_config_var('SHLIB_SUFFIX') or sysconfig.get_config_var('SHLIB_EXT') -+ for name in names: -+ for lib_name in [name, 'lib' + name]: -+ try: -+ lib = ffi.dlopen(lib_name + suffix) -+ if lib: -+ return lib -+ except OSError: -+ pass -+ # Second pass: try to use ctypes as fallback. - for name in names: - for lib_name in [name, 'lib' + name]: - try: