diff --git a/print/py-weasyprint/Makefile b/print/py-weasyprint/Makefile index 737fddc5851e..7b0d8a60d5a9 100644 --- a/print/py-weasyprint/Makefile +++ b/print/py-weasyprint/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.15 2018/04/03 09:31:56 adam Exp $ +# $NetBSD: Makefile,v 1.16 2018/11/14 18:17:26 kleink Exp $ -DISTNAME= WeasyPrint-0.42.3 +DISTNAME= WeasyPrint-43 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:tl} CATEGORIES= print python MASTER_SITES= ${MASTER_SITE_PYPI:=W/WeasyPrint/} @@ -12,17 +12,12 @@ LICENSE= modified-bsd .include "../../lang/python/egg.mk" -DEPENDS+= pango-[0-9]*:../../devel/pango -.if ${_PYTHON_VERSION} > 30 +DEPENDS+= pango>=1.29.3:../../devel/pango DEPENDS+= ${PYPKGPREFIX}-cairosvg>=1.0.20:../../converters/py-cairosvg -.else -DEPENDS+= ${PYPKGPREFIX}-cairosvg>=1.0.20<2:../../converters/py27-cairosvg -.endif -DEPENDS+= ${PYPKGPREFIX}-cairocffi>=0.5:../../graphics/py-cairocffi +DEPENDS+= ${PYPKGPREFIX}-cairocffi>=0.9.0:../../graphics/py-cairocffi DEPENDS+= ${PYPKGPREFIX}-cffi>=0.6:../../devel/py-cffi DEPENDS+= ${PYPKGPREFIX}-cssselect2>=0.1:../../textproc/py-cssselect2 DEPENDS+= ${PYPKGPREFIX}-html5lib>=0.999999999:../../textproc/py-html5lib -DEPENDS+= ${PYPKGPREFIX}-pdfrw>=0.4:../../textproc/py-pdfrw DEPENDS+= ${PYPKGPREFIX}-pyphen>=0.8:../../textproc/py-pyphen DEPENDS+= ${PYPKGPREFIX}-tinycss2>=0.5:../../textproc/py-tinycss2 TEST_DEPENDS+= ${PYPKGPREFIX}-test-cov-[0-9]*:../../devel/py-test-cov @@ -30,6 +25,13 @@ TEST_DEPENDS+= ${PYPKGPREFIX}-test-flake8-[0-9]*:../../devel/py-test-flake8 TEST_DEPENDS+= ${PYPKGPREFIX}-test-isort-[0-9]*:../../devel/py-test-isort TEST_DEPENDS+= ${PYPKGPREFIX}-test-runner-[0-9]*:../../devel/py-test-runner +PYTHON_VERSIONS_INCOMPATIBLE= 27 + USE_LANGUAGES= # none +SUBST_CLASSES+= pyversfx +SUBST_STAGE.pyversfx= pre-configure +SUBST_FILES.pyversfx= setup.cfg +SUBST_SED.pyversfx= -e "s|@PYVERSSUFFIX@|${PYVERSSUFFIX}|g" + .include "../../mk/bsd.pkg.mk" diff --git a/print/py-weasyprint/PLIST b/print/py-weasyprint/PLIST index c896f416a40b..04c0c598d4ea 100644 --- a/print/py-weasyprint/PLIST +++ b/print/py-weasyprint/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 2018/01/05 11:35:06 adam Exp $ +@comment $NetBSD: PLIST,v 1.4 2018/11/14 18:17:26 kleink Exp $ bin/weasyprint${PYVERSSUFFIX} ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt @@ -7,33 +7,43 @@ ${PYSITELIB}/${EGG_INFODIR}/entry_points.txt ${PYSITELIB}/${EGG_INFODIR}/not-zip-safe ${PYSITELIB}/${EGG_INFODIR}/requires.txt ${PYSITELIB}/${EGG_INFODIR}/top_level.txt +${PYSITELIB}/weasyprint/VERSION ${PYSITELIB}/weasyprint/__init__.py ${PYSITELIB}/weasyprint/__init__.pyc ${PYSITELIB}/weasyprint/__init__.pyo ${PYSITELIB}/weasyprint/__main__.py ${PYSITELIB}/weasyprint/__main__.pyc ${PYSITELIB}/weasyprint/__main__.pyo -${PYSITELIB}/weasyprint/compat.py -${PYSITELIB}/weasyprint/compat.pyc -${PYSITELIB}/weasyprint/compat.pyo ${PYSITELIB}/weasyprint/css/__init__.py ${PYSITELIB}/weasyprint/css/__init__.pyc ${PYSITELIB}/weasyprint/css/__init__.pyo ${PYSITELIB}/weasyprint/css/computed_values.py ${PYSITELIB}/weasyprint/css/computed_values.pyc ${PYSITELIB}/weasyprint/css/computed_values.pyo -${PYSITELIB}/weasyprint/css/descriptors.py -${PYSITELIB}/weasyprint/css/descriptors.pyc -${PYSITELIB}/weasyprint/css/descriptors.pyo ${PYSITELIB}/weasyprint/css/html5_ph.css ${PYSITELIB}/weasyprint/css/html5_ua.css ${PYSITELIB}/weasyprint/css/properties.py ${PYSITELIB}/weasyprint/css/properties.pyc ${PYSITELIB}/weasyprint/css/properties.pyo +${PYSITELIB}/weasyprint/css/targets.py +${PYSITELIB}/weasyprint/css/targets.pyc +${PYSITELIB}/weasyprint/css/targets.pyo ${PYSITELIB}/weasyprint/css/tests_ua.css -${PYSITELIB}/weasyprint/css/validation.py -${PYSITELIB}/weasyprint/css/validation.pyc -${PYSITELIB}/weasyprint/css/validation.pyo +${PYSITELIB}/weasyprint/css/utils.py +${PYSITELIB}/weasyprint/css/utils.pyc +${PYSITELIB}/weasyprint/css/utils.pyo +${PYSITELIB}/weasyprint/css/validation/__init__.py +${PYSITELIB}/weasyprint/css/validation/__init__.pyc +${PYSITELIB}/weasyprint/css/validation/__init__.pyo +${PYSITELIB}/weasyprint/css/validation/descriptors.py +${PYSITELIB}/weasyprint/css/validation/descriptors.pyc +${PYSITELIB}/weasyprint/css/validation/descriptors.pyo +${PYSITELIB}/weasyprint/css/validation/expanders.py +${PYSITELIB}/weasyprint/css/validation/expanders.pyc +${PYSITELIB}/weasyprint/css/validation/expanders.pyo +${PYSITELIB}/weasyprint/css/validation/properties.py +${PYSITELIB}/weasyprint/css/validation/properties.pyc +${PYSITELIB}/weasyprint/css/validation/properties.pyo ${PYSITELIB}/weasyprint/document.py ${PYSITELIB}/weasyprint/document.pyc ${PYSITELIB}/weasyprint/document.pyo @@ -73,6 +83,12 @@ ${PYSITELIB}/weasyprint/layout/backgrounds.pyo ${PYSITELIB}/weasyprint/layout/blocks.py ${PYSITELIB}/weasyprint/layout/blocks.pyc ${PYSITELIB}/weasyprint/layout/blocks.pyo +${PYSITELIB}/weasyprint/layout/columns.py +${PYSITELIB}/weasyprint/layout/columns.pyc +${PYSITELIB}/weasyprint/layout/columns.pyo +${PYSITELIB}/weasyprint/layout/flex.py +${PYSITELIB}/weasyprint/layout/flex.pyc +${PYSITELIB}/weasyprint/layout/flex.pyo ${PYSITELIB}/weasyprint/layout/float.py ${PYSITELIB}/weasyprint/layout/float.pyc ${PYSITELIB}/weasyprint/layout/float.pyo @@ -103,9 +119,6 @@ ${PYSITELIB}/weasyprint/layout/tables.pyo ${PYSITELIB}/weasyprint/logger.py ${PYSITELIB}/weasyprint/logger.pyc ${PYSITELIB}/weasyprint/logger.pyo -${PYSITELIB}/weasyprint/navigator.py -${PYSITELIB}/weasyprint/navigator.pyc -${PYSITELIB}/weasyprint/navigator.pyo ${PYSITELIB}/weasyprint/pdf.py ${PYSITELIB}/weasyprint/pdf.pyc ${PYSITELIB}/weasyprint/pdf.pyo @@ -115,6 +128,7 @@ ${PYSITELIB}/weasyprint/stacking.pyo ${PYSITELIB}/weasyprint/tests/__init__.py ${PYSITELIB}/weasyprint/tests/__init__.pyc ${PYSITELIB}/weasyprint/tests/__init__.pyo +${PYSITELIB}/weasyprint/tests/resources/AHEM____.TTF ${PYSITELIB}/weasyprint/tests/resources/acid2-reference.html ${PYSITELIB}/weasyprint/tests/resources/acid2-test.html ${PYSITELIB}/weasyprint/tests/resources/blue.jpg @@ -135,15 +149,15 @@ ${PYSITELIB}/weasyprint/tests/resources/sub_directory/sheet1.css ${PYSITELIB}/weasyprint/tests/resources/user.css ${PYSITELIB}/weasyprint/tests/resources/utf8-test.css ${PYSITELIB}/weasyprint/tests/resources/weasyprint.otf +${PYSITELIB}/weasyprint/tests/test_acid2.py +${PYSITELIB}/weasyprint/tests/test_acid2.pyc +${PYSITELIB}/weasyprint/tests/test_acid2.pyo ${PYSITELIB}/weasyprint/tests/test_api.py ${PYSITELIB}/weasyprint/tests/test_api.pyc ${PYSITELIB}/weasyprint/tests/test_api.pyo ${PYSITELIB}/weasyprint/tests/test_boxes.py ${PYSITELIB}/weasyprint/tests/test_boxes.pyc ${PYSITELIB}/weasyprint/tests/test_boxes.pyo -${PYSITELIB}/weasyprint/tests/test_columns.py -${PYSITELIB}/weasyprint/tests/test_columns.pyc -${PYSITELIB}/weasyprint/tests/test_columns.pyo ${PYSITELIB}/weasyprint/tests/test_css.py ${PYSITELIB}/weasyprint/tests/test_css.pyc ${PYSITELIB}/weasyprint/tests/test_css.pyo @@ -153,18 +167,90 @@ ${PYSITELIB}/weasyprint/tests/test_css_descriptors.pyo ${PYSITELIB}/weasyprint/tests/test_css_validation.py ${PYSITELIB}/weasyprint/tests/test_css_validation.pyc ${PYSITELIB}/weasyprint/tests/test_css_validation.pyo -${PYSITELIB}/weasyprint/tests/test_draw.py -${PYSITELIB}/weasyprint/tests/test_draw.pyc -${PYSITELIB}/weasyprint/tests/test_draw.pyo +${PYSITELIB}/weasyprint/tests/test_draw/__init__.py +${PYSITELIB}/weasyprint/tests/test_draw/__init__.pyc +${PYSITELIB}/weasyprint/tests/test_draw/__init__.pyo +${PYSITELIB}/weasyprint/tests/test_draw/test_background.py +${PYSITELIB}/weasyprint/tests/test_draw/test_background.pyc +${PYSITELIB}/weasyprint/tests/test_draw/test_background.pyo +${PYSITELIB}/weasyprint/tests/test_draw/test_before_after.py +${PYSITELIB}/weasyprint/tests/test_draw/test_before_after.pyc +${PYSITELIB}/weasyprint/tests/test_draw/test_before_after.pyo +${PYSITELIB}/weasyprint/tests/test_draw/test_box.py +${PYSITELIB}/weasyprint/tests/test_draw/test_box.pyc +${PYSITELIB}/weasyprint/tests/test_draw/test_box.pyo +${PYSITELIB}/weasyprint/tests/test_draw/test_column.py +${PYSITELIB}/weasyprint/tests/test_draw/test_column.pyc +${PYSITELIB}/weasyprint/tests/test_draw/test_column.pyo +${PYSITELIB}/weasyprint/tests/test_draw/test_current_color.py +${PYSITELIB}/weasyprint/tests/test_draw/test_current_color.pyc +${PYSITELIB}/weasyprint/tests/test_draw/test_current_color.pyo +${PYSITELIB}/weasyprint/tests/test_draw/test_gradient.py +${PYSITELIB}/weasyprint/tests/test_draw/test_gradient.pyc +${PYSITELIB}/weasyprint/tests/test_draw/test_gradient.pyo +${PYSITELIB}/weasyprint/tests/test_draw/test_image.py +${PYSITELIB}/weasyprint/tests/test_draw/test_image.pyc +${PYSITELIB}/weasyprint/tests/test_draw/test_image.pyo +${PYSITELIB}/weasyprint/tests/test_draw/test_list.py +${PYSITELIB}/weasyprint/tests/test_draw/test_list.pyc +${PYSITELIB}/weasyprint/tests/test_draw/test_list.pyo +${PYSITELIB}/weasyprint/tests/test_draw/test_opacity.py +${PYSITELIB}/weasyprint/tests/test_draw/test_opacity.pyc +${PYSITELIB}/weasyprint/tests/test_draw/test_opacity.pyo +${PYSITELIB}/weasyprint/tests/test_draw/test_overflow.py +${PYSITELIB}/weasyprint/tests/test_draw/test_overflow.pyc +${PYSITELIB}/weasyprint/tests/test_draw/test_overflow.pyo +${PYSITELIB}/weasyprint/tests/test_draw/test_table.py +${PYSITELIB}/weasyprint/tests/test_draw/test_table.pyc +${PYSITELIB}/weasyprint/tests/test_draw/test_table.pyo +${PYSITELIB}/weasyprint/tests/test_draw/test_transform.py +${PYSITELIB}/weasyprint/tests/test_draw/test_transform.pyc +${PYSITELIB}/weasyprint/tests/test_draw/test_transform.pyo +${PYSITELIB}/weasyprint/tests/test_draw/test_visibility.py +${PYSITELIB}/weasyprint/tests/test_draw/test_visibility.pyc +${PYSITELIB}/weasyprint/tests/test_draw/test_visibility.pyo ${PYSITELIB}/weasyprint/tests/test_float.py ${PYSITELIB}/weasyprint/tests/test_float.pyc ${PYSITELIB}/weasyprint/tests/test_float.pyo ${PYSITELIB}/weasyprint/tests/test_fonts.py ${PYSITELIB}/weasyprint/tests/test_fonts.pyc ${PYSITELIB}/weasyprint/tests/test_fonts.pyo -${PYSITELIB}/weasyprint/tests/test_layout.py -${PYSITELIB}/weasyprint/tests/test_layout.pyc -${PYSITELIB}/weasyprint/tests/test_layout.pyo +${PYSITELIB}/weasyprint/tests/test_layout/__init__.py +${PYSITELIB}/weasyprint/tests/test_layout/__init__.pyc +${PYSITELIB}/weasyprint/tests/test_layout/__init__.pyo +${PYSITELIB}/weasyprint/tests/test_layout/test_block.py +${PYSITELIB}/weasyprint/tests/test_layout/test_block.pyc +${PYSITELIB}/weasyprint/tests/test_layout/test_block.pyo +${PYSITELIB}/weasyprint/tests/test_layout/test_column.py +${PYSITELIB}/weasyprint/tests/test_layout/test_column.pyc +${PYSITELIB}/weasyprint/tests/test_layout/test_column.pyo +${PYSITELIB}/weasyprint/tests/test_layout/test_flex.py +${PYSITELIB}/weasyprint/tests/test_layout/test_flex.pyc +${PYSITELIB}/weasyprint/tests/test_layout/test_flex.pyo +${PYSITELIB}/weasyprint/tests/test_layout/test_image.py +${PYSITELIB}/weasyprint/tests/test_layout/test_image.pyc +${PYSITELIB}/weasyprint/tests/test_layout/test_image.pyo +${PYSITELIB}/weasyprint/tests/test_layout/test_inline.py +${PYSITELIB}/weasyprint/tests/test_layout/test_inline.pyc +${PYSITELIB}/weasyprint/tests/test_layout/test_inline.pyo +${PYSITELIB}/weasyprint/tests/test_layout/test_inline_block.py +${PYSITELIB}/weasyprint/tests/test_layout/test_inline_block.pyc +${PYSITELIB}/weasyprint/tests/test_layout/test_inline_block.pyo +${PYSITELIB}/weasyprint/tests/test_layout/test_list.py +${PYSITELIB}/weasyprint/tests/test_layout/test_list.pyc +${PYSITELIB}/weasyprint/tests/test_layout/test_list.pyo +${PYSITELIB}/weasyprint/tests/test_layout/test_page.py +${PYSITELIB}/weasyprint/tests/test_layout/test_page.pyc +${PYSITELIB}/weasyprint/tests/test_layout/test_page.pyo +${PYSITELIB}/weasyprint/tests/test_layout/test_position.py +${PYSITELIB}/weasyprint/tests/test_layout/test_position.pyc +${PYSITELIB}/weasyprint/tests/test_layout/test_position.pyo +${PYSITELIB}/weasyprint/tests/test_layout/test_shrink_to_fit.py +${PYSITELIB}/weasyprint/tests/test_layout/test_shrink_to_fit.pyc +${PYSITELIB}/weasyprint/tests/test_layout/test_shrink_to_fit.pyo +${PYSITELIB}/weasyprint/tests/test_layout/test_table.py +${PYSITELIB}/weasyprint/tests/test_layout/test_table.pyc +${PYSITELIB}/weasyprint/tests/test_layout/test_table.pyo ${PYSITELIB}/weasyprint/tests/test_pdf.py ${PYSITELIB}/weasyprint/tests/test_pdf.pyc ${PYSITELIB}/weasyprint/tests/test_pdf.pyo @@ -174,24 +260,33 @@ ${PYSITELIB}/weasyprint/tests/test_presentational_hints.pyo ${PYSITELIB}/weasyprint/tests/test_stacking.py ${PYSITELIB}/weasyprint/tests/test_stacking.pyc ${PYSITELIB}/weasyprint/tests/test_stacking.pyo -${PYSITELIB}/weasyprint/tests/test_tables.py -${PYSITELIB}/weasyprint/tests/test_tables.pyc -${PYSITELIB}/weasyprint/tests/test_tables.pyo +${PYSITELIB}/weasyprint/tests/test_target.py +${PYSITELIB}/weasyprint/tests/test_target.pyc +${PYSITELIB}/weasyprint/tests/test_target.pyo ${PYSITELIB}/weasyprint/tests/test_text.py ${PYSITELIB}/weasyprint/tests/test_text.pyc ${PYSITELIB}/weasyprint/tests/test_text.pyo -${PYSITELIB}/weasyprint/tests/test_web/__init__.py -${PYSITELIB}/weasyprint/tests/test_web/__init__.pyc -${PYSITELIB}/weasyprint/tests/test_web/__init__.pyo -${PYSITELIB}/weasyprint/tests/test_web/run.py -${PYSITELIB}/weasyprint/tests/test_web/run.pyc -${PYSITELIB}/weasyprint/tests/test_web/run.pyo +${PYSITELIB}/weasyprint/tests/test_tools.py +${PYSITELIB}/weasyprint/tests/test_tools.pyc +${PYSITELIB}/weasyprint/tests/test_tools.pyo +${PYSITELIB}/weasyprint/tests/test_unicode.py +${PYSITELIB}/weasyprint/tests/test_unicode.pyc +${PYSITELIB}/weasyprint/tests/test_unicode.pyo ${PYSITELIB}/weasyprint/tests/testing_utils.py ${PYSITELIB}/weasyprint/tests/testing_utils.pyc ${PYSITELIB}/weasyprint/tests/testing_utils.pyo ${PYSITELIB}/weasyprint/text.py ${PYSITELIB}/weasyprint/text.pyc ${PYSITELIB}/weasyprint/text.pyo +${PYSITELIB}/weasyprint/tools/__init__.py +${PYSITELIB}/weasyprint/tools/__init__.pyc +${PYSITELIB}/weasyprint/tools/__init__.pyo +${PYSITELIB}/weasyprint/tools/navigator.py +${PYSITELIB}/weasyprint/tools/navigator.pyc +${PYSITELIB}/weasyprint/tools/navigator.pyo +${PYSITELIB}/weasyprint/tools/renderer.py +${PYSITELIB}/weasyprint/tools/renderer.pyc +${PYSITELIB}/weasyprint/tools/renderer.pyo ${PYSITELIB}/weasyprint/urls.py ${PYSITELIB}/weasyprint/urls.pyc ${PYSITELIB}/weasyprint/urls.pyo diff --git a/print/py-weasyprint/distinfo b/print/py-weasyprint/distinfo index 078d9aecfc9b..9930f2bfb16b 100644 --- a/print/py-weasyprint/distinfo +++ b/print/py-weasyprint/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.13 2018/04/03 09:31:56 adam Exp $ +$NetBSD: distinfo,v 1.14 2018/11/14 18:17:26 kleink Exp $ -SHA1 (WeasyPrint-0.42.3.tar.gz) = afef25da0610fb8031609798d8b25be44506bef4 -RMD160 (WeasyPrint-0.42.3.tar.gz) = 4ea815172a3bd32420e3919272c2f037a6b76c85 -SHA512 (WeasyPrint-0.42.3.tar.gz) = d6007934c301904308bd4821626d6a7bb504268c5c71a31f7486faebb3dd649fad18774737cab39eb13a0916635bb58eba2c8432c72cc5a461cea2a5d874b1ee -Size (WeasyPrint-0.42.3.tar.gz) = 399972 bytes -SHA1 (patch-setup.py) = a7657e79ac611f3122a81d7f2c6c195e52ba9399 +SHA1 (WeasyPrint-43.tar.gz) = 57e56dccb77242bcf7ad9df7430a6adba558da70 +RMD160 (WeasyPrint-43.tar.gz) = da6169804425b2b58d5c0d0946ab9ec695be0d0e +SHA512 (WeasyPrint-43.tar.gz) = fc4c4decb298d4f9caf244433566c9b675b23db2508093d8c43c6e361119c5fe8298213075f550bebc72fe4156cfc516f04c8d7a2c6215fcd5add14360821f40 +Size (WeasyPrint-43.tar.gz) = 315365 bytes +SHA1 (patch-setup.cfg) = b12afa67aeac4a7cdf19e1a61e25cd91b354ddbf diff --git a/print/py-weasyprint/patches/patch-setup.cfg b/print/py-weasyprint/patches/patch-setup.cfg new file mode 100644 index 000000000000..37170dafe4eb --- /dev/null +++ b/print/py-weasyprint/patches/patch-setup.cfg @@ -0,0 +1,15 @@ +$NetBSD: patch-setup.cfg,v 1.1 2018/11/14 18:17:26 kleink Exp $ + +Adjust script path to allow multiple Python version installs. + +--- setup.cfg.orig 2018-11-09 09:09:34.000000000 +0000 ++++ setup.cfg +@@ -50,7 +50,7 @@ tests_require = + pytest-isort + + [options.entry_points] +-console-scripts = weasyprint = weasyprint.__main__:main ++console-scripts = weasyprint@PYVERSSUFFIX@ = weasyprint.__main__:main + + [options.package_data] + weasyprint = VERSION diff --git a/print/py-weasyprint/patches/patch-setup.py b/print/py-weasyprint/patches/patch-setup.py deleted file mode 100644 index b7ce268af0e8..000000000000 --- a/print/py-weasyprint/patches/patch-setup.py +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-setup.py,v 1.3 2018/01/05 11:35:06 adam Exp $ - -Adjust script path to allow multiple Python version installs. - ---- setup.py.orig 2017-12-22 23:26:45.000000000 +0000 -+++ setup.py -@@ -83,7 +83,7 @@ setup( - ':python_version >= "3.0"': ['CairoSVG >= 1.0.20']}, - entry_points={ - 'console_scripts': [ -- 'weasyprint = weasyprint.__main__:main', -+ 'weasyprint%s = weasyprint.__main__:main' % sys.version[0:3], - ], - }, - )