From 1065f4cd70645a0f19c088978a251aac13c6d2e2 Mon Sep 17 00:00:00 2001 From: wiz Date: Tue, 30 Apr 2024 08:15:20 +0000 Subject: [PATCH] py-cairocffi: update to 1.7.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Version 1.7.0 ............. Released on 2024-04-27 * Drop Python 3.7 support, add Python 3.12 support * `#221 `_: Add environment variable to set folder where DLLs are installed on Windows * `#225 `_: Use Ruff instead of Flake8 and isort Version 1.6.1 ............. Released on 2023-07-24 * `#217 `_: Repair installation with PyInstaller Version 1.6.0 ............. Released on 2023-06-12 **This version uses a new CFFI mode that may break your program.** CairoCFFI now uses Flit for packaging and is also distributed as a Python wheel. Please test carefully and don’t hesitate to report issues before using it in production. * `#216 `_: Use ABI-level in-line CFFI mode Version 1.5.1 ............. Released on 2023-04-15 * `#212 `_: Bring back XCB support during wheel generation Version 1.5.0 ............. Released on 2023-03-17 * `#106 `_, `#200 `_: Fallback to manual PNG file creation on hardened systems * `#210 `_: Use pyproject.toml for packaging and remove other useless files Version 1.4.0 ............. Released on 2022-09-23 * `#205 `_: Use pikepdf to parse generated PDF * `#171 `_: Don’t use deprecated pytest-runner anymore Version 1.3.0 ............. Released on 2021-10-04 * `2cd512d `_: Drop Python 3.6 support * `#196 `_: Fix import `constants.py` import * `#169 `_: Add extra library name "cairo-2.dll" * `#178 `_: Workaround for testing date string with cairo 1.17.4 * `#186 `_: Fix link in documentation * `#195 `_: Fix typo in documentation * `#184 `_, `a4fc2a7 `_: Clean .gitignore Version 1.2.0 ............. Released on 2020-10-29 * `#152 `_: Add NumPy support * `#143 `_: Make write_to_png function work on hardened systems * `#156 `_: Use major version name to open shared libraries * `#165 `_: Don’t list setuptools as required for installation Version 1.1.0 ............. Released on 2019-09-05 * `#135 `_, `#127 `_, `#119 `_: Clean the way external libraries are found * `#126 `_: Remove const char* elements from cdef * Support Cairo features up to 1.17.2 * Fix documentation generation Version 1.0.2 ............. Released on 2019-02-15 * `#123 `_: Rely on a recent version of setuptools to handle VERSION Version 1.0.1 ............. Released on 2019-02-12 * `#120 `_: Don't delete _generated modules on ffi_build import Version 1.0.0 ............. Released on 2019-02-08 6 years after its first release, cairocffi can now be considered as stable. * Drop Python 2.6, 2.7 and 3.4 support * Test with Python 3.7 * Clean code, tests and packaging --- graphics/py-cairocffi/Makefile | 15 +++++---- graphics/py-cairocffi/PLIST | 29 +++++++---------- graphics/py-cairocffi/distinfo | 9 +++--- .../patches/patch-cairocffi_____init____.py | 31 ------------------- 4 files changed, 24 insertions(+), 60 deletions(-) delete mode 100644 graphics/py-cairocffi/patches/patch-cairocffi_____init____.py 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: