diff options
| author | Po-Chuan Hsieh <sunpoet@FreeBSD.org> | 2023-05-02 16:19:47 +0000 |
|---|---|---|
| committer | Po-Chuan Hsieh <sunpoet@FreeBSD.org> | 2023-05-02 16:19:47 +0000 |
| commit | 11c6a4616164755520ea5b3a93679b28bd10cfdf (patch) | |
| tree | bda8afe1de8212bd39675af1b4a8f53c3dcf9e1f | |
| parent | 2e4a668e3952500b1ebc1473e49e94376292e2c5 (diff) | |
| download | ports-11c6a4616164755520ea5b3a93679b28bd10cfdf.tar.gz ports-11c6a4616164755520ea5b3a93679b28bd10cfdf.zip | |
x11-fonts/afdko: Fix build on 14-CURRENT
/wrkdirs/usr/ports/x11-fonts/afdko/work/afdko-3.9.5/c/shared/source/uforead/uforead.c:1246:20: error: incompatible integer to pointer conversion passing 'int' to parameter of type 'char *' [-Wint-conversion]
message(h, ufoErrParse, "Encountered glyph reference %s in alternate layer's contents.plist with an empty file path. ", glyphName);
^~~~~~~~~~~
/wrkdirs/usr/ports/x11-fonts/afdko/work/afdko-3.9.5/c/shared/source/uforead/uforead.c:396:47: note: passing argument to parameter 'fmt' here
static void CTL_CDECL message(ufoCtx h, char* fmt, ...) {
^
/wrkdirs/usr/ports/x11-fonts/afdko/work/afdko-3.9.5/c/shared/source/uforead/uforead.c:2012:16: error: incompatible pointer to integer conversion returning 'void *' from a function with result type 'long' [-Wint-conversion]
return NULL;
^~~~
/usr/include/sys/_null.h:34:14: note: expanded from macro 'NULL'
#define NULL ((void *)0)
^~~~~~~~~~~
/wrkdirs/usr/ports/x11-fonts/afdko/work/afdko-3.9.5/c/shared/source/uforead/uforead.c:2027:16: error: incompatible pointer to integer conversion returning 'void *' from a function with result type 'unsigned long' [-Wint-conversion]
return NULL;
^~~~
/usr/include/sys/_null.h:34:14: note: expanded from macro 'NULL'
#define NULL ((void *)0)
^~~~~~~~~~~
3 errors generated.
Reference: https://pkg-status.freebsd.org/beefy18/data/main-amd64-default/pdf5b273c8e36_s83d5725005/logs/afdko-3.9.5.log
| -rw-r--r-- | x11-fonts/afdko/files/patch-c-shared-source-uforead-uforead.c | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/x11-fonts/afdko/files/patch-c-shared-source-uforead-uforead.c b/x11-fonts/afdko/files/patch-c-shared-source-uforead-uforead.c new file mode 100644 index 000000000000..0d5adae31404 --- /dev/null +++ b/x11-fonts/afdko/files/patch-c-shared-source-uforead-uforead.c @@ -0,0 +1,29 @@ +--- c/shared/source/uforead/uforead.c.orig 2023-04-24 14:46:56 UTC ++++ c/shared/source/uforead/uforead.c +@@ -1243,7 +1243,7 @@ static void updateGLIFRec(ufoCtx h, char* glyphName, x + if (fileName == NULL) { + /* this is basically muted for now, as the previous check will return and skip if not parseable. + We'll add this back once we add verbosity flag */ +- message(h, ufoErrParse, "Encountered glyph reference %s in alternate layer's contents.plist with an empty file path. ", glyphName); ++ message(h, "Encountered glyph reference %s in alternate layer's contents.plist with an empty file path. ", glyphName); + return; + } + +@@ -2009,7 +2009,7 @@ static long strtolCheck(ufoCtx h, char* keyValue, bool + fatal(h, ufoErrParse, msg); + else if (msg) + message(h, msg); +- return NULL; ++ return 0; + } + } + +@@ -2024,7 +2024,7 @@ static unsigned long strtoulCheck(ufoCtx h, char* keyV + fatal(h, ufoErrParse, msg); + else if (msg) + message(h, msg); +- return NULL; ++ return 0; + } + } + |