git: 65fbcf224ecf - main - print/py-fontbakery: Allow build with py-shaperglot 0.6.0+

From: Po-Chuan Hsieh <sunpoet_at_FreeBSD.org>
Date: Sun, 08 Sep 2024 18:45:33 UTC
The branch main has been updated by sunpoet:

URL: https://cgit.FreeBSD.org/ports/commit/?id=65fbcf224ecf48e80d2b2b7986a4f8f1d1b42281

commit 65fbcf224ecf48e80d2b2b7986a4f8f1d1b42281
Author:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2024-09-08 18:20:59 +0000
Commit:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
CommitDate: 2024-09-08 18:37:45 +0000

    print/py-fontbakery: Allow build with py-shaperglot 0.6.0+
    
    - Bump PORTREVISION for package change
---
 print/py-fontbakery/Makefile                   |  5 +++--
 print/py-fontbakery/files/patch-pyproject.toml | 18 ++++++++++++++++++
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/print/py-fontbakery/Makefile b/print/py-fontbakery/Makefile
index e340571597a5..0bdcada11851 100644
--- a/print/py-fontbakery/Makefile
+++ b/print/py-fontbakery/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	fontbakery
 PORTVERSION=	0.12.10
+PORTREVISION=	1
 CATEGORIES=	print python
 MASTER_SITES=	PYPI \
 		https://github.com/fonttools/fontbakery/releases/download/v${PORTVERSION}/
@@ -62,11 +63,11 @@ GOOGLEFONTS_RUN_DEPENDS=${PYTHON_PKGNAMEPREFIX}axisregistry>=0.4.10<0.5:x11-font
 			${PYTHON_PKGNAMEPREFIX}gfsubsets>=2024.5.9:x11-fonts/py-gfsubsets@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}glyphsets>=1.0.0<2:print/py-glyphsets@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}protobuf>=3.7.0,1:devel/py-protobuf@${PY_FLAVOR} \
-			${PYTHON_PKGNAMEPREFIX}shaperglot>=0.5.0<0.6:x11-fonts/py-shaperglot@${PY_FLAVOR} \
+			${PYTHON_PKGNAMEPREFIX}shaperglot>=0.5.0<0.7.0:x11-fonts/py-shaperglot@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}stringbrewer>=0:devel/py-stringbrewer@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}unicodedata2>=0:devel/py-unicodedata2@${PY_FLAVOR}
 TYPENETWORK_RUN_DEPENDS=${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.7.1:www/py-beautifulsoup@${PY_FLAVOR} \
-			${PYTHON_PKGNAMEPREFIX}shaperglot>=0.3.0<0.6.0:x11-fonts/py-shaperglot@${PY_FLAVOR} \
+			${PYTHON_PKGNAMEPREFIX}shaperglot>=0.5.0<0.7.0:x11-fonts/py-shaperglot@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}unicodedata2>=0:devel/py-unicodedata2@${PY_FLAVOR}
 
 .include <bsd.port.pre.mk>
diff --git a/print/py-fontbakery/files/patch-pyproject.toml b/print/py-fontbakery/files/patch-pyproject.toml
index b1f83d8d63a2..75142e06e0da 100644
--- a/print/py-fontbakery/files/patch-pyproject.toml
+++ b/print/py-fontbakery/files/patch-pyproject.toml
@@ -9,6 +9,24 @@
      "Jinja2 >= 3.0.0",  # issue #4717
      "munkres",
      "opentypespec",
+@@ -66,7 +66,7 @@ shaperglot = [
+ ]
+ 
+ shaperglot = [
+-    "shaperglot >= 0.3.0, < 0.6.0",
++    "shaperglot >= 0.3.0, < 0.7.0",
+     # versions prior to v0.3.0 had too stric dependency rules
+     # for other deps such as protobuf, making it harder satisfy all dependencies.
+ ]
+@@ -79,7 +79,7 @@ googlefontsalwayslatest = [
+     "gflanguages >= 0.6.2, == 0.6.*",
+     "gfsubsets >= 2024.5.9",
+     "glyphsets >= 1.0.0, == 1.*",
+-    "shaperglot >= 0.5.0, == 0.5.*",
++    "shaperglot >= 0.3.0, < 0.7.0",
+ ]
+ 
+ 
 @@ -112,7 +112,7 @@ googlefonts = [
      "fonttools[lxml,unicode]",
      # (see https://github.com/googlefonts/gflanguages/pull/7)