Skip to content

Commit

Permalink
x11-fonts/afdko: Fix build with Clang 16 and remove the workaround
Browse files Browse the repository at this point in the history
/wrkdirs/usr/ports/x11-fonts/afdko/work/afdko-3.9.6/c/shared/source/tx_shared/tx_shared.c:526:20: error: incompatible function pointer types assigning to 'size_t (*)(ctlStreamCallbacks *, void *, char **)' (aka 'unsigned long (*)(struct ctlStreamCallbacks_ *, void *, char **)') from 'size_t (ctlStreamCallbacks *, Stream *, char **)' (aka 'unsigned long (struct ctlStreamCallbacks_ *, Stream *, char **)') [-Wincompatible-function-pointer-types]
    h->cb.stm.read = stm_read;
                   ^ ~~~~~~~~
/wrkdirs/usr/ports/x11-fonts/afdko/work/afdko-3.9.6/c/shared/source/tx_shared/tx_shared.c:527:24: error: incompatible function pointer types assigning to 'size_t (*)(ctlStreamCallbacks *, void *, xmlDocPtr *)' (aka 'unsigned long (*)(struct ctlStreamCallbacks_ *, void *, struct _xmlDoc **)') from 'size_t (ctlStreamCallbacks *, Stream *, xmlDocPtr *)' (aka 'unsigned long (struct ctlStreamCallbacks_ *, Stream *, struct _xmlDoc **)') [-Wincompatible-function-pointer-types]
    h->cb.stm.xml_read = stm_xml_read;
                       ^ ~~~~~~~~~~~~
2 errors generated.
  • Loading branch information
sunpoet committed Jul 9, 2023
1 parent 9015727 commit 7e59982
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 6 deletions.
6 changes: 0 additions & 6 deletions x11-fonts/afdko/Makefile
Expand Up @@ -14,10 +14,4 @@ USE_GNOME= libxml2

CMAKE_OFF= SKBUILD

.include <bsd.port.options.mk>

.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
CFLAGS+= -Wno-error=incompatible-function-pointer-types
.endif

.include <bsd.port.mk>
13 changes: 13 additions & 0 deletions x11-fonts/afdko/files/patch-clang16
@@ -0,0 +1,13 @@
--- c/shared/source/tx_shared/tx_shared.c.orig 2023-06-13 21:30:33 UTC
+++ c/shared/source/tx_shared/tx_shared.c
@@ -523,8 +523,8 @@ void stmInit(txCtx h) {
h->cb.stm.open = stm_open;
h->cb.stm.seek = stm_seek;
h->cb.stm.tell = stm_tell;
- h->cb.stm.read = stm_read;
- h->cb.stm.xml_read = stm_xml_read;
+ h->cb.stm.read = (size_t (*)(ctlStreamCallbacks *, void *, char **)) stm_read;
+ h->cb.stm.xml_read = (size_t (*)(ctlStreamCallbacks *, void *, xmlDocPtr *)) stm_xml_read;
h->cb.stm.write = stm_write;
h->cb.stm.status = stm_status;
h->cb.stm.close = stm_close;

0 comments on commit 7e59982

Please sign in to comment.