Index: head/textproc/py-pikepdf/Makefile =================================================================== --- head/textproc/py-pikepdf/Makefile (revision 563570) +++ head/textproc/py-pikepdf/Makefile (revision 563571) @@ -1,48 +1,52 @@ # $FreeBSD$ PORTNAME= pikepdf -DISTVERSION= 1.19.3 -PORTREVISION= 1 +DISTVERSION= 2.5.0 CATEGORIES= textproc python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= kai@FreeBSD.org COMMENT= Read and write PDFs with Python, powered by qpdf LICENSE= MPL20 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pybind11>=2.4.3<3:devel/py-pybind11@${PY_FLAVOR} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pybind11>=2.6.0<3:devel/py-pybind11@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}setuptools_scm_git_archive>0:devel/py-setuptools_scm_git_archive@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}setuptools_scm_git_archive>0:devel/py-setuptools_scm_git_archive@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} LIB_DEPENDS= libqpdf.so:print/qpdf RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>=4.0:devel/py-lxml@${PY_FLAVOR} \ ${PY_PILLOW} -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}attrs>=19.1.0:devel/py-attrs@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}hypothesis>=4.24<6:devel/py-hypothesis@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}psutil>=5:sysutils/py-psutil@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pytest>=4.4.0<5.3.5:devel/py-pytest@${PY_FLAVOR} \ +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}attrs>=20.2.0:devel/py-attrs@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dateutil>=2.8.0:devel/py-dateutil@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}hypothesis>=5<6:devel/py-hypothesis@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}psutil>=5<6:sysutils/py-psutil@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pybind11>=2.6.0:devel/py-pybind11@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest>=4.4.0<7.3.5:devel/py-pytest@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest-helpers-namespace>=2019.1.8:devel/py-pytest-helpers-namespace@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest-timeout>=1.3.3:devel/py-pytest-timeout@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pytest-xdist>=1.28,<2:devel/py-pytest-xdist@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest-xdist>=1.28<3:devel/py-pytest-xdist@${PY_FLAVOR} \ ${PY_PILLOW} \ ${PYTHON_PKGNAMEPREFIX}python-xmp-toolkit>=2.0.1:textproc/py-python-xmp-toolkit@${PY_FLAVOR} -USES= compiler:c++14-lang python:3.5+ +USES= compiler:c++14-lang python:3.6+ USE_PYTHON= distutils autoplist +TEST_ENV= LC_ALL=en_US.UTF-8 + OPTIONS_DEFINE= JBIG2 OPTIONS_DEFAULT= JBIG2 JBIG2_DESC= Support for extracting JBIG2 images JBIG2_RUN_DEPENDS= jbig2dec:graphics/jbig2dec post-install: ${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/pikepdf/_qpdf*.so do-test: - @(cd ${WRKSRC} && ${SETENV} LC_ALL=en_US.UTF-8 ${PYTHON_CMD} -m pytest -rs -v ) + @cd ${WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} -m pytest -rs -v -o addopts= .include Index: head/textproc/py-pikepdf/distinfo =================================================================== --- head/textproc/py-pikepdf/distinfo (revision 563570) +++ head/textproc/py-pikepdf/distinfo (revision 563571) @@ -1,3 +1,3 @@ -TIMESTAMP = 1603778882 -SHA256 (pikepdf-1.19.3.tar.gz) = 78dd7990b049da841134b578537f190f00b42a80575903f8c9f59bd68dd8eabb -SIZE (pikepdf-1.19.3.tar.gz) = 2360826 +TIMESTAMP = 1611827061 +SHA256 (pikepdf-2.5.0.tar.gz) = 84b6c0315a34cbe34d74f64cdb96634cfa8bf02a17bc56bd20e0efbaa4460b73 +SIZE (pikepdf-2.5.0.tar.gz) = 2377232 Property changes on: head/textproc/py-pikepdf/distinfo ___________________________________________________________________ Modified: fbsd:nokeywords ## -1 +1 ## -on \ No newline at end of property +yes \ No newline at end of property Index: head/textproc/py-pikepdf/files/patch-tests_test__filters.py =================================================================== --- head/textproc/py-pikepdf/files/patch-tests_test__filters.py (revision 563570) +++ head/textproc/py-pikepdf/files/patch-tests_test__filters.py (nonexistent) @@ -1,43 +0,0 @@ -From: "James R. Barlow" -Date: Wed, 6 Jan 2021 00:22:16 -0800 -Subject: [PATCH] libqpdf 10.1.0 raises different exception [1] - -The different errors are acceptable to us; actually they are more -correct than the original behavior. - -From: "James R. Barlow" -Date: Wed, 6 Jan 2021 03:39:50 -0800 -Subject: [PATCH] Fix test_tokenfilter_is_abstract [2] - -Obtained from: - -[1] https://github.com/pikepdf/pikepdf/commit/fe4b568ac88ba551458578613b013ac17edf5c4e.patch -[2] https://github.com/pikepdf/pikepdf/commit/7ca375cb6ff82011d716da1614ef5721a97f91b0.patch - ---- tests/test_filters.py.orig 2020-09-09 22:57:09 UTC -+++ tests/test_filters.py -@@ -74,19 +74,17 @@ class FilterInvalid(pikepdf.TokenFilter): - - def test_invalid_handle_token(pal): - page = pikepdf.Page(pal.pages[0]) -- with pytest.raises(pikepdf.PdfError): -- result = page.get_filtered_contents(FilterInvalid()) -+ with pytest.raises((TypeError, pikepdf.PdfError)): -+ page.get_filtered_contents(FilterInvalid()) - - - def test_invalid_tokenfilter(pal): - page = pikepdf.Page(pal.pages[0]) - with pytest.raises(TypeError): -- result = page.get_filtered_contents(list()) -+ page.get_filtered_contents(list()) - - - def test_tokenfilter_is_abstract(pal): - page = pikepdf.Page(pal.pages[0]) -- try: -- result = page.get_filtered_contents(pikepdf.TokenFilter()) -- except pikepdf.PdfError: -- assert 'Tried to call pure virtual' in pal.get_warnings()[0] -+ with pytest.raises((RuntimeError, pikepdf.PdfError)): -+ page.get_filtered_contents(pikepdf.TokenFilter()) Property changes on: head/textproc/py-pikepdf/files/patch-tests_test__filters.py ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/textproc/py-pikepdf/files/patch-src_qpdf_page.cpp =================================================================== --- head/textproc/py-pikepdf/files/patch-src_qpdf_page.cpp (revision 563570) +++ head/textproc/py-pikepdf/files/patch-src_qpdf_page.cpp (nonexistent) @@ -1,22 +0,0 @@ -From: "James R. Barlow" -Date: Mon, 4 Jan 2021 20:21:51 -0800 -Subject: [PATCH] Fix externalize_inline_images for qpdf 10.1.0 - -Obtained from: - -https://github.com/pikepdf/pikepdf/commit/7ac9b058104219b26747f3fc9761ac6b3c037402.patch - ---- src/qpdf/page.cpp.orig 2020-09-09 22:57:09 UTC -+++ 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. Property changes on: head/textproc/py-pikepdf/files/patch-src_qpdf_page.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/textproc/py-pikepdf/files/patch-setup.py =================================================================== --- head/textproc/py-pikepdf/files/patch-setup.py (nonexistent) +++ head/textproc/py-pikepdf/files/patch-setup.py (revision 563571) @@ -0,0 +1,16 @@ +Relax build requirements as devel/py-setuptools in the Ports tree is still +at release 44.0 due Python 2.7. + +--- setup.py.orig 2021-01-27 00:16:08 UTC ++++ setup.py +@@ -88,8 +88,8 @@ if __name__ == '__main__': + 'Pillow >= 6', # only needed for manipulating images + ], + setup_requires=[ +- 'setuptools >= 50', +- 'wheel >= 0.35', ++ 'setuptools', ++ 'wheel', + 'setuptools_scm[toml] >= 4.1', + 'setuptools_scm_git_archive', + 'pybind11 >= 2.6.0, <3', Property changes on: head/textproc/py-pikepdf/files/patch-setup.py ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property