diff --git a/cad/gdstk/Makefile b/cad/gdstk/Makefile index ce5d56467f72..12f83e6efe47 100644 --- a/cad/gdstk/Makefile +++ b/cad/gdstk/Makefile @@ -1,24 +1,24 @@ PORTNAME= gdstk DISTVERSIONPREFIX= v -DISTVERSION= 0.9.52 +DISTVERSION= 0.9.53 CATEGORIES= cad MAINTAINER= yuri@FreeBSD.org COMMENT= C++ library for creation and manipulation of GDSII and OASIS files WWW= https://heitzmann.github.io/gdstk/ LICENSE= BSL LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libqhull_r.so:math/qhull USES= cmake compiler:c++11-lang USE_GITHUB= yes GH_ACCOUNT= heitzmann CMAKE_ON= BUILD_SHARED_LIBS CONFLICTS_INSTALL= misc/vxl # both install lib/libclipper.so .include diff --git a/cad/gdstk/distinfo b/cad/gdstk/distinfo index 8f8b8a64624e..40306c73a88f 100644 --- a/cad/gdstk/distinfo +++ b/cad/gdstk/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1716736841 -SHA256 (heitzmann-gdstk-v0.9.52_GH0.tar.gz) = 1369ab198b946018e3fdae1267296fc47c047b4fc9ffd059a59955406c1b1394 -SIZE (heitzmann-gdstk-v0.9.52_GH0.tar.gz) = 361499 +TIMESTAMP = 1720985146 +SHA256 (heitzmann-gdstk-v0.9.53_GH0.tar.gz) = 8fdf85e9e90838720ff1d3555e5b880868cbc18a919261f317772b0327457be0 +SIZE (heitzmann-gdstk-v0.9.53_GH0.tar.gz) = 365722 diff --git a/cad/gdstk/pkg-plist b/cad/gdstk/pkg-plist index ac959a099016..a99dcceab893 100644 --- a/cad/gdstk/pkg-plist +++ b/cad/gdstk/pkg-plist @@ -1,29 +1,30 @@ include/gdstk/allocator.hpp include/gdstk/array.hpp include/gdstk/cell.hpp include/gdstk/clipper_tools.hpp include/gdstk/curve.hpp include/gdstk/flexpath.hpp include/gdstk/font.hpp include/gdstk/gdsii.hpp include/gdstk/gdstk.hpp include/gdstk/gdswriter.hpp include/gdstk/label.hpp include/gdstk/library.hpp include/gdstk/map.hpp include/gdstk/oasis.hpp include/gdstk/pathcommon.hpp include/gdstk/polygon.hpp include/gdstk/property.hpp +include/gdstk/raithdata.hpp include/gdstk/rawcell.hpp include/gdstk/reference.hpp include/gdstk/repetition.hpp include/gdstk/robustpath.hpp include/gdstk/set.hpp include/gdstk/sort.hpp include/gdstk/style.hpp include/gdstk/tagmap.hpp include/gdstk/utils.hpp include/gdstk/vec.hpp lib/libclipper.so lib/libgdstk.so diff --git a/cad/py-gdstk/Makefile b/cad/py-gdstk/Makefile index 9a66c79afa92..5713a2143acf 100644 --- a/cad/py-gdstk/Makefile +++ b/cad/py-gdstk/Makefile @@ -1,28 +1,29 @@ PORTNAME= gdstk -DISTVERSION= 0.9.52 +DISTVERSION= 0.9.53 CATEGORIES= cad MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= yuri@FreeBSD.org COMMENT= Library for creation and manipulation of GDSII and OASIS files WWW= https://heitzmann.github.io/gdstk/ LICENSE= BSL LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= cmake:devel/cmake-core \ ${PYTHON_PKGNAMEPREFIX}pyproject-metadata>0:devel/py-pyproject-metadata@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scikit-build-core>0:devel/py-scikit-build-core@${PY_FLAVOR} \ ${PY_SETUPTOOLS} \ ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} \ ${PYNUMPY} LIB_DEPENDS= libqhull_r.so:math/qhull RUN_DEPENDS= ${PYNUMPY} USES= compiler:c++11-lang python -USE_PYTHON= pep517 autoplist pytest # tests fail to run, see https://github.com/heitzmann/gdstk/issues/244 +USE_PYTHON= pep517 autoplist pytest # tests crash, see https://github.com/heitzmann/gdstk/issues/263 TEST_ENV= ${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} +TEST_WRKSRC= ${WRKSRC}/tests .include diff --git a/cad/py-gdstk/distinfo b/cad/py-gdstk/distinfo index f9e945b42269..8bff318c279e 100644 --- a/cad/py-gdstk/distinfo +++ b/cad/py-gdstk/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1716737479 -SHA256 (gdstk-0.9.52.tar.gz) = 42267292d272f4a4c8229091dc83a496d0a15f969cf36693b5597d3fe8efb92f -SIZE (gdstk-0.9.52.tar.gz) = 311291 +TIMESTAMP = 1720985236 +SHA256 (gdstk-0.9.53.tar.gz) = 73c87e2e3d43911b09f2a10c90359426bd15dcdeb799606bbc1e93e49acacd90 +SIZE (gdstk-0.9.53.tar.gz) = 315746 diff --git a/cad/py-gdstk/files/patch-pyproject.toml b/cad/py-gdstk/files/patch-pyproject.toml index 9c5fa81d18bb..58a748ace137 100644 --- a/cad/py-gdstk/files/patch-pyproject.toml +++ b/cad/py-gdstk/files/patch-pyproject.toml @@ -1,9 +1,20 @@ ---- pyproject.toml.orig 2023-08-28 16:28:32 UTC +--- pyproject.toml.orig 2024-07-04 23:14:49 UTC +++ pyproject.toml -@@ -38,5 +38,5 @@ requires = [ - "setuptools>=42", - "wheel", +@@ -1,7 +1,7 @@ requires = [ + [build-system] + requires = [ + "scikit_build_core", +- "numpy >= 2.0" ++ "numpy" + ] + build-backend = "scikit_build_core.build" + +@@ -29,7 +29,7 @@ dependencies = [ + license = {file = "LICENSE"} + dependencies = [ "numpy; platform_system=='Darwin'", - "oldest-supported-numpy; platform_system!='Darwin'", + "numpy; platform_system!='Darwin'", + "typing_extensions; python_version < '3.11'" ] + requires-python = ">=3.9"