From 17351343ffe47834d624538c1846e11b7e0d97d0 Mon Sep 17 00:00:00 2001 From: sthen Date: Thu, 22 Jul 2021 09:33:24 +0000 Subject: [PATCH] update to py-pikepdf-1.15.1, based on an earlier diff from wen heping that was stalled pending setuptools update --- print/py-pikepdf/Makefile | 9 ++++---- print/py-pikepdf/distinfo | 4 ++-- .../patches/patch-src_qpdf_page_cpp | 22 ------------------- .../py-pikepdf/patches/patch-tests_test_io_py | 14 ++++++++++++ print/py-pikepdf/pkg/PLIST | 6 ++++- 5 files changed, 26 insertions(+), 29 deletions(-) delete mode 100644 print/py-pikepdf/patches/patch-src_qpdf_page_cpp create mode 100644 print/py-pikepdf/patches/patch-tests_test_io_py diff --git a/print/py-pikepdf/Makefile b/print/py-pikepdf/Makefile index 2237c84e6d3..0d508d3ca16 100644 --- a/print/py-pikepdf/Makefile +++ b/print/py-pikepdf/Makefile @@ -1,11 +1,10 @@ -# $OpenBSD: Makefile,v 1.5 2021/01/10 08:35:13 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.6 2021/07/22 09:33:24 sthen Exp $ COMMENT = Python library for reading and writing PDF files -MODPY_EGG_VERSION = 1.19.3 +MODPY_EGG_VERSION = 2.15.1 DISTNAME = pikepdf-${MODPY_EGG_VERSION} PKGNAME = py-${DISTNAME} -REVISION = 1 CATEGORIES = print @@ -36,6 +35,8 @@ LIB_DEPENDS = print/qpdf TEST_DEPENDS = devel/py-hypothesis${MODPY_FLAVOR} \ sysutils/py-psutil${MODPY_FLAVOR} -TEST_ENV = PYTHONPATH=${WRKSRC}/src/pikepdf: +do-test: + cd ${WRKSRC} && \ + ${MAKE_ENV} ${MODPY_BIN} -m pytest -rs -v -o addopts= .include diff --git a/print/py-pikepdf/distinfo b/print/py-pikepdf/distinfo index 994df037596..d27077d6561 100644 --- a/print/py-pikepdf/distinfo +++ b/print/py-pikepdf/distinfo @@ -1,2 +1,2 @@ -SHA256 (pikepdf-1.19.3.tar.gz) = eN15kLBJ2oQRNLV4U38ZDwC0KoBXWQP4yfWb1o3Y6rs= -SIZE (pikepdf-1.19.3.tar.gz) = 2360826 +SHA256 (pikepdf-2.15.1.tar.gz) = sfUKKe/cp0sxUKQuoFvU16tN5HIUWFtMMZ6OQpBblKA= +SIZE (pikepdf-2.15.1.tar.gz) = 2321559 diff --git a/print/py-pikepdf/patches/patch-src_qpdf_page_cpp b/print/py-pikepdf/patches/patch-src_qpdf_page_cpp deleted file mode 100644 index 5611c00d4ac..00000000000 --- a/print/py-pikepdf/patches/patch-src_qpdf_page_cpp +++ /dev/null @@ -1,22 +0,0 @@ -$OpenBSD: patch-src_qpdf_page_cpp,v 1.1 2021/01/10 08:35:13 ajacoutot Exp $ - -From 7ac9b058104219b26747f3fc9761ac6b3c037402 Mon Sep 17 00:00:00 2001 -From: "James R. Barlow" -Date: Mon, 4 Jan 2021 20:21:51 -0800 -Subject: [PATCH] Fix externalize_inline_images for qpdf 10.1.0 - -Index: src/qpdf/page.cpp ---- src/qpdf/page.cpp.orig -+++ src/qpdf/page.cpp -@@ -79,7 +79,10 @@ void init_page(py::module& m) - .def("_get_mediabox", &QPDFPageObjectHelper::getMediaBox) - .def("_get_cropbox", &QPDFPageObjectHelper::getCropBox) - .def("_get_trimbox", &QPDFPageObjectHelper::getTrimBox) -- .def("externalize_inline_images", &QPDFPageObjectHelper::externalizeInlineImages, -+ .def("externalize_inline_images", -+ [](QPDFPageObjectHelper &poh, size_t min_size = 0) { -+ return poh.externalizeInlineImages(min_size); -+ }, - py::arg("min_size") = 0, - R"~~~( - Convert inlines image to normal (external) images. diff --git a/print/py-pikepdf/patches/patch-tests_test_io_py b/print/py-pikepdf/patches/patch-tests_test_io_py new file mode 100644 index 00000000000..1970b893d89 --- /dev/null +++ b/print/py-pikepdf/patches/patch-tests_test_io_py @@ -0,0 +1,14 @@ +$OpenBSD: patch-tests_test_io_py,v 1.1 2021/07/22 09:33:24 sthen Exp $ + +Index: tests/test_io.py +--- tests/test_io.py.orig ++++ tests/test_io.py +@@ -96,7 +96,7 @@ def test_invalid_output_stream(sandwich, bio_class, ex + + @pytest.fixture + def file_descriptor_is_open_for(): +- if sys.platform == 'win32' or sys.platform.startswith('freebsd'): ++ if sys.platform == 'win32' or sys.platform.startswith('freebsd') or sys.platform.startswith('openbsd'): + pytest.skip( + "psutil documentation warns that .open_files() has problems on these" + ) diff --git a/print/py-pikepdf/pkg/PLIST b/print/py-pikepdf/pkg/PLIST index cbb8498a95f..99370805d7a 100644 --- a/print/py-pikepdf/pkg/PLIST +++ b/print/py-pikepdf/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.2 2021/01/04 14:06:37 sthen Exp $ +@comment $OpenBSD: PLIST,v 1.3 2021/07/22 09:33:24 sthen Exp $ lib/python${MODPY_VERSION}/site-packages/pikepdf/ lib/python${MODPY_VERSION}/site-packages/pikepdf-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/ lib/python${MODPY_VERSION}/site-packages/pikepdf-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO @@ -13,13 +13,16 @@ lib/python${MODPY_VERSION}/site-packages/pikepdf/${MODPY_PYCACHE}__init__.${MODP lib/python${MODPY_VERSION}/site-packages/pikepdf/${MODPY_PYCACHE}_cpphelpers.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/pikepdf/${MODPY_PYCACHE}_methods.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/pikepdf/${MODPY_PYCACHE}_version.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/pikepdf/${MODPY_PYCACHE}_xml.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/pikepdf/${MODPY_PYCACHE}codec.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/pikepdf/${MODPY_PYCACHE}jbig2.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/pikepdf/${MODPY_PYCACHE}objects.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/pikepdf/_cpphelpers.py lib/python${MODPY_VERSION}/site-packages/pikepdf/_methods.py @so lib/python${MODPY_VERSION}/site-packages/pikepdf/_qpdf.${MODPY_PYC_MAGIC_TAG}so +lib/python${MODPY_VERSION}/site-packages/pikepdf/_qpdf.pyi lib/python${MODPY_VERSION}/site-packages/pikepdf/_version.py +lib/python${MODPY_VERSION}/site-packages/pikepdf/_xml.py lib/python${MODPY_VERSION}/site-packages/pikepdf/codec.py lib/python${MODPY_VERSION}/site-packages/pikepdf/jbig2.py lib/python${MODPY_VERSION}/site-packages/pikepdf/models/ @@ -37,3 +40,4 @@ lib/python${MODPY_VERSION}/site-packages/pikepdf/models/matrix.py lib/python${MODPY_VERSION}/site-packages/pikepdf/models/metadata.py lib/python${MODPY_VERSION}/site-packages/pikepdf/models/outlines.py lib/python${MODPY_VERSION}/site-packages/pikepdf/objects.py +lib/python${MODPY_VERSION}/site-packages/pikepdf/py.typed