search

CTSRD-CHERI / cheribsd-ports

FreeBSD ports tree adapted for CheriBSD.
https://CheriBSD.org
Other
5 stars 11 forks source link

x11-fonts/fontconfig: Update cheribsd.patch #98

Closed jrtc27 closed 9 months ago

jrtc27 commented 11 months ago

This reverts the extremely bogus "fix" in FcCharSetMerge and actually fixes the real problem (a copy/paste error in FcCharSetNumbers). It also includes a couple of misc patches from upstream that are already in the 2.14.0-cheriabi branch but never made it into our cheribsd.patch.

Generated from [1] with:

git diff 911b19f19f1334d51c452756f9ce222c1101097b --no-prefix fc-lang src

[1] https://github.com/CTSRD-CHERI/fontconfig/tree/a1d54a107edf80e85dd4ef77eb1c8c555bc6d3a5

kwitaszczyk commented 9 months ago

The fontconfig version in ports changed with the latest merge. Commits that were previously cherry-picked into https://github.com/CTSRD-CHERI/fontconfig/tree/2.14.0-cheriabi are included in 2.14.2. I rebased other commits onto 2.14.2 in https://github.com/CTSRD-CHERI/fontconfig/tree/2.14.2-cheriabi.

https://github.com/CTSRD-CHERI/cheribsd-ports/commit/446dcb674edd4911f0bea457de99040857a760fc updates the patch using the 2.14.2-cheriabi branch.