Date: Sat, 13 Apr 2024 11:59:01 GMT From: Po-Chuan Hsieh <sunpoet@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 2fac9e8c20d6 - main - print/py-fontbakery: Update to 0.12.0 Message-ID: <202404131159.43DBx1SY076492@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=2fac9e8c20d62cb5dd24c6ff9b30e978329c6127 commit 2fac9e8c20d62cb5dd24c6ff9b30e978329c6127 Author: Po-Chuan Hsieh <sunpoet@FreeBSD.org> AuthorDate: 2024-04-13 11:57:29 +0000 Commit: Po-Chuan Hsieh <sunpoet@FreeBSD.org> CommitDate: 2024-04-13 11:57:29 +0000 print/py-fontbakery: Update to 0.12.0 - Convert to USE_PYTHON=pep517 Changes: https://github.com/fonttools/fontbakery/releases https://github.com/fonttools/fontbakery/blob/main/CHANGELOG.md --- print/py-fontbakery/Makefile | 55 +++++++++++++++----------- print/py-fontbakery/distinfo | 6 +-- print/py-fontbakery/files/patch-pyproject.toml | 29 ++++++++++++++ print/py-fontbakery/files/patch-setup.py | 20 ---------- 4 files changed, 64 insertions(+), 46 deletions(-) diff --git a/print/py-fontbakery/Makefile b/print/py-fontbakery/Makefile index 6556a8d7e7cf..84784097ac3b 100644 --- a/print/py-fontbakery/Makefile +++ b/print/py-fontbakery/Makefile @@ -1,5 +1,5 @@ PORTNAME= fontbakery -PORTVERSION= 0.11.2 +PORTVERSION= 0.12.0 CATEGORIES= print python MASTER_SITES= PYPI \ https://github.com/fonttools/fontbakery/releases/download/v${PORTVERSION}/ @@ -13,16 +13,16 @@ WWW= https://font-bakery.readthedocs.io/en/latest/ \ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools-scm>=6.2:devel/py-setuptools-scm@${PY_FLAVOR} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>=61.0:devel/py-setuptools@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}setuptools-scm>=6.2:devel/py-setuptools-scm@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}babelfont>=3.0.1:x11-fonts/py-babelfont@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}beziers>=0.5.0:graphics/py-beziers@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}beziers>=0.5.0<0.6:graphics/py-beziers@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}cmarkgfm>=0.4:textproc/py-cmarkgfm@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}fonttools>=4.39.0:print/py-fonttools@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}fonttools>=4.46.0:print/py-fonttools@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}freetype-py>=0:print/py-freetype-py@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}Jinja2>=0:devel/py-Jinja2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}munkres>=0:math/py-munkres@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}opentype-sanitizer>=7.1.9:x11-fonts/py-opentype-sanitizer@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}opentype-sanitizer>=9.1.0<10:x11-fonts/py-opentype-sanitizer@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}opentypespec>=0:x11-fonts/py-opentypespec@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}packaging>=0:devel/py-packaging@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pip-api>=0:devel/py-pip-api@${PY_FLAVOR} \ @@ -34,44 +34,53 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}babelfont>=3.0.1:x11-fonts/py-babelfont@${PY ${PYTHON_PKGNAMEPREFIX}vharfbuzz>=0.2.0:print/py-vharfbuzz@${PY_FLAVOR} USES= python -USE_PYTHON= autoplist concurrent distutils +USE_PYTHON= autoplist concurrent pep517 NO_ARCH= yes -OPTIONS_DEFINE= FONTVAL FONTWERK GOOGLEFONTS NOTOFONTS SHAPING TYPENETWORK UFO_SOURCES -OPTIONS_DEFAULT=FONTVAL FONTWERK GOOGLEFONTS NOTOFONTS SHAPING TYPENETWORK UFO_SOURCES +# fontbakery[adobefonts] and fontbakery[iso15008] are empty +OPTIONS_DEFINE= FONTVAL FONTWERK GOOGLEFONTS NOTOFONTS SHAPING TYPENETWORK UFO +OPTIONS_DEFAULT=FONTVAL FONTWERK GOOGLEFONTS NOTOFONTS SHAPING TYPENETWORK UFO FONTVAL_DESC= Checks for Font Validator FONTWERK_DESC= Checks for Fontwerk.com FONTWERK_IMPLIES= GOOGLEFONTS GOOGLEFONTS_DESC= Checks for Google Fonts -GOOGLEFONTS_IMPLIES= SHAPING UFO_SOURCES +GOOGLEFONTS_IMPLIES= SHAPING UFO NOTOFONTS_DESC= Checks for Noto fonts NOTOFONTS_IMPLIES= GOOGLEFONTS SHAPING_DESC= Checks for shaping TYPENETWORK_DESC= Checks for Type Network -UFO_SOURCES_DESC= Checks for UFO sources +TYPENETWORK_IMPLIES= FONTVAL +UFO_DESC= Checks for UFO sources FONTVAL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${PY_FLAVOR} -GOOGLEFONTS_RUN_DEPENDS=${PYTHON_PKGNAMEPREFIX}axisregistry>=0.4.9:x11-fonts/py-axisregistry@${PY_FLAVOR} \ +GOOGLEFONTS_RUN_DEPENDS=${PYTHON_PKGNAMEPREFIX}axisregistry>=0.4.9<0.5:x11-fonts/py-axisregistry@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.7.1:www/py-beautifulsoup@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dehinter>=3.1.0:print/py-dehinter@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}font-v>=0.6.0:print/py-font-v@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}fonttools>=4.39.0:print/py-fonttools@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}gflanguages>=0.5.17:x11-fonts/py-gflanguages@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}fonttools>=0:print/py-fonttools@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}gflanguages>=0.5.17<0.6:x11-fonts/py-gflanguages@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}gfsubsets>=2024.2.5:x11-fonts/py-gfsubsets@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}glyphsets>=0.6.14:print/py-glyphsets@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}glyphsets>=0.6.17<0.7:print/py-glyphsets@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}protobuf>=3.7.0,1:devel/py-protobuf@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}shaperglot>=0.4.2:x11-fonts/py-shaperglot@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}shaperglot>=0.5.0<0.6:x11-fonts/py-shaperglot@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}unicodedata2>=0:devel/py-unicodedata2@${PY_FLAVOR} SHAPING_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}collidoscope>=0.5.2:print/py-collidoscope@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}shaperglot>=0.3.0:x11-fonts/py-shaperglot@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}shaperglot>=0.3.0<0.6.0:x11-fonts/py-shaperglot@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}stringbrewer>=0:devel/py-stringbrewer@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}ufo2ft>=2.25.2:x11-fonts/py-ufo2ft@${PY_FLAVOR} TYPENETWORK_RUN_DEPENDS=${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.7.1:www/py-beautifulsoup@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}shaperglot>=0.4.2:x11-fonts/py-shaperglot@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}ufo2ft>=2.25.2:x11-fonts/py-ufo2ft@${PY_FLAVOR} -UFO_SOURCES_RUN_DEPENDS=${PYTHON_PKGNAMEPREFIX}defcon>=0:x11-fonts/py-defcon@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}fonttools>=4.39.0:print/py-fonttools@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}shaperglot>=0.3.0<0.6.0:x11-fonts/py-shaperglot@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}ufo2ft>=2.25.2:x11-fonts/py-ufo2ft@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}unicodedata2>=0:devel/py-unicodedata2@${PY_FLAVOR} +UFO_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}defcon>=0:x11-fonts/py-defcon@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}fonttools>=0:print/py-fonttools@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}ufo2ft>=2.25.2:x11-fonts/py-ufo2ft@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}ufolint>=0:x11-fonts/py-ufolint@${PY_FLAVOR} -.include <bsd.port.mk> +.include <bsd.port.pre.mk> + +.if ${PYTHON_REL} < 31100 +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}typing-extensions>=0:devel/py-typing-extensions@${PY_FLAVOR} +.endif + +.include <bsd.port.post.mk> diff --git a/print/py-fontbakery/distinfo b/print/py-fontbakery/distinfo index 6858a627297d..80cf0c2fd00e 100644 --- a/print/py-fontbakery/distinfo +++ b/print/py-fontbakery/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1709390706 -SHA256 (fontbakery-0.11.2.tar.gz) = eb511795ff9de6425e505e353849c634b68e712bc55940c581aad5bc7419626c -SIZE (fontbakery-0.11.2.tar.gz) = 48259679 +TIMESTAMP = 1713001142 +SHA256 (fontbakery-0.12.0.tar.gz) = 75fa796728148adc54221da026a2bb834e57ddf804f65c9155468dd2e9b5f070 +SIZE (fontbakery-0.12.0.tar.gz) = 48823132 diff --git a/print/py-fontbakery/files/patch-pyproject.toml b/print/py-fontbakery/files/patch-pyproject.toml new file mode 100644 index 000000000000..f58e0d2fb81c --- /dev/null +++ b/print/py-fontbakery/files/patch-pyproject.toml @@ -0,0 +1,29 @@ +--- pyproject.toml.orig 2024-04-12 12:50:32 UTC ++++ pyproject.toml +@@ -29,7 +29,7 @@ dependencies = [ + + dependencies = [ + "fontTools >= 4.46.0", +- "freetype-py < 2.4.0", ++ "freetype-py", + "opentypespec", + "opentype-sanitizer >= 9.1.0, == 9.*", + "munkres", +@@ -43,7 +43,7 @@ dependencies = [ + "requests", + "beziers >= 0.5.0, == 0.5.*", + "uharfbuzz", +- "vharfbuzz >= 0.2.0, == 0.2.*", ++ "vharfbuzz >= 0.2.0", + "typing_extensions ; python_version < '3.11'", + ] + +@@ -110,7 +110,7 @@ googlefonts = [ + "fonttools[lxml,unicode]", + # (see https://github.com/googlefonts/gflanguages/pull/7) + +- "protobuf >= 3.7.0, < 4", ++ "protobuf >= 3.7.0", + # 3.7.0 fixed a bug on parsing some METADATA.pb files. + # We cannot use v4 because our protobuf files have been compiled with v3. + # (see https://github.com/fonttools/fontbakery/issues/2200) diff --git a/print/py-fontbakery/files/patch-setup.py b/print/py-fontbakery/files/patch-setup.py deleted file mode 100644 index 70c3b09d1998..000000000000 --- a/print/py-fontbakery/files/patch-setup.py +++ /dev/null @@ -1,20 +0,0 @@ ---- setup.py.orig 2024-02-06 04:58:53 UTC -+++ setup.py -@@ -71,7 +71,7 @@ googlefonts_extras = ( - # FontVersion.get_name_id5_version_string which was added in version 0.6.0 - f"fontTools[lxml,unicode]{FONTTOOLS_VERSION}", - # (see https://github.com/googlefonts/gflanguages/pull/7) -- "protobuf>=3.7.0, <4", # 3.7.0 fixed a bug on parsing some METADATA.pb files. -+ "protobuf>=3.7.0", # 3.7.0 fixed a bug on parsing some METADATA.pb files. - # We cannot use v4 because our protobuf files have been compiled with v3. - # (see https://github.com/fonttools/fontbakery/issues/2200) - ] -@@ -179,7 +179,7 @@ setup( - # --- - # core dependencies - f"fontTools{FONTTOOLS_VERSION}", -- "freetype-py!=2.4.0", # Avoiding 2.4.0 due to seg-fault described at -+ "freetype-py", # Avoiding 2.4.0 due to seg-fault described at - # https://github.com/fonttools/fontbakery/issues/4143 - "opentypespec", - "opentype-sanitizer>=7.1.9", # 7.1.9 fixes caret value format = 3 bug
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202404131159.43DBx1SY076492>