Re: git: fd6c5cba78ff - main - print/py-fonttools: move from devel/py-lxml5 to devel/py-lxml
- Reply: Hiroki Tagato : "Re: git: fd6c5cba78ff - main - print/py-fonttools: move from devel/py-lxml5 to devel/py-lxml"
- In reply to: Dan Langille: "Re: git: fd6c5cba78ff - main - print/py-fonttools: move from devel/py-lxml5 to devel/py-lxml"
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 11 Sep 2025 22:23:50 UTC
On 9/12/25 01:39, Dan Langille wrote:
> At first I thought those were my three commits, but they are not.
>
> I have added tagattie (those commits) and sunpoet (for my commits on
> print/py-fonttools).
>
> On Thu, Sep 11, 2025, at 11:14 AM, Dima Panov wrote:
>> Holy moly, this left the whole portstree in conflict eith py-lxml5
>>
>> Seems like we need a complex revert of commits alongside with this
>> change.
>>
>>
>> 677f8ffcc79c
>>
>> 230fb2661c78
>>
>> 0b0f7cda9d34
One of my ports depended (directly or indirectly) on both py-lxml and
py-lxml5, which leaded to a dependency conflict.
At that time, py-lxml was at version 4.x and none of the ports depending
on py-lxml limited its upper version to 4. So I made those three commits
to switch dependencies of all the ports depending on py-lxml to py-lxml5.
Now, py-lxml is at version 6.x and dependency conflicts occurred again.
I will do some check to see if the conflicts can be resolved as follows:
- Check the upper versions of dependency of all the ports depending on
py-lxml and py-lxml5
- If a port's dependency upper version is not limited to 5, switch it
from py-lxml5 to py-lxml
- If a port's dependency limited its upper version to 5, keep it as it is
- After that, if there are no ports depending on py-lxml5, remove py-lxml5
Let me see if the steps above work.
Cheers,
Hiroki
>> --
>> Dima. (desktop, kde, x11, office, ports-secteam)@FreeBSD team
>> (fluffy@FreeBSD.org, https://t.me/FluffyBSD)
>>
>>
>> On среда, сент. 10, 2025 at 9:52 PM, Dan Langille <dvl@FreeBSD.org
>> <mailto:dvl@FreeBSD.org>> wrote:
>> The branch main has been updated by dvl:
>>
>> URL: https://cgit.FreeBSD.org/ports/commit/?
>> id=fd6c5cba78ff97a1e0512fa9d84fee18ed858f39
>>
>> commit fd6c5cba78ff97a1e0512fa9d84fee18ed858f39
>> Author: Dan Langille <dvl@FreeBSD.org>
>> AuthorDate: 2025-09-10 18:50:25 +0000
>> Commit: Dan Langille <dvl@FreeBSD.org>
>> CommitDate: 2025-09-10 18:51:34 +0000
>>
>> print/py-fonttools: move from devel/py-lxml5 to devel/py-lxml
>>
>> PR: 289406
>> ---
>> print/py-fonttools/Makefile | 3 ++-
>> 1 file changed, 2 insertions(+), 1 deletion(-)
>>
>> diff --git a/print/py-fonttools/Makefile b/print/py-fonttools/
>> Makefile
>> index 7daf22fb9f0f..bc1801c58ea3 100644
>> --- a/print/py-fonttools/Makefile
>> +++ b/print/py-fonttools/Makefile
>> @@ -1,5 +1,6 @@
>> PORTNAME= fonttools
>> PORTVERSION= 4.59.2
>> +PORTREVISION= 1
>> CATEGORIES= print python
>> MASTER_SITES= PYPI
>> PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
>> @@ -32,7 +33,7 @@ WOFF_DESC= Compress/uncompress WOFF webfonts
>> GRAPHITE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}
>> lz4>=1.7.4.2:archivers/py-lz4@${PY_FLAVOR}
>> INTERPOLATABLE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}
>> cairo>=0:graphics/py-cairo@${PY_FLAVOR} \
>> ${PYTHON_PKGNAMEPREFIX}scipy>=0:science/py-scipy@${PY_FLAVOR}
>> -LXML_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml5>=4.0:devel/py-
>> lxml5@${PY_FLAVOR}
>> +LXML_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>=4.0:devel/py-
>> lxml${PY_FLAVOR}
>> PLOT_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}matplotlib>=0:math/py-
>> matplotlib@${PY_FLAVOR}
>> REPACKER_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}
>> uharfbuzz>=0.23.0:print/py-uharfbuzz@${PY_FLAVOR}
>> SYMFONT_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sympy>=0:math/py-
>> sympy@${PY_FLAVOR}
>
> --
> Dan Langille
> dan@langille.org