9337c16cb6
This fixes a build failure from 79b31767d0.
* gnu/packages/patches/ghostscript-freetype-compat.patch: New file.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
* gnu/packages/ghostscript.scm (ghostscript)[source](patches): Add it.
36 lines
1,021 B
Diff
36 lines
1,021 B
Diff
Fix build with FreeType 2.10.3 and newer.
|
|
|
|
Taken from upstream:
|
|
https://git.ghostscript.com/?p=ghostpdl.git;a=commitdiff;h=41ef9a0bc36b9db7115fbe9623f989bfb47bbade
|
|
|
|
diff --git a/base/fapi_ft.c b/base/fapi_ft.c
|
|
--- a/base/fapi_ft.c
|
|
+++ b/base/fapi_ft.c
|
|
@@ -125,7 +125,7 @@ static void
|
|
delete_inc_int_info(gs_fapi_server * a_server,
|
|
FT_IncrementalRec * a_inc_int_info);
|
|
|
|
-FT_CALLBACK_DEF(void *)
|
|
+static void *
|
|
FF_alloc(FT_Memory memory, long size)
|
|
{
|
|
gs_memory_t *mem = (gs_memory_t *) memory->user;
|
|
@@ -133,7 +133,7 @@ FF_alloc(FT_Memory memory, long size)
|
|
return (gs_malloc(mem, size, 1, "FF_alloc"));
|
|
}
|
|
|
|
-FT_CALLBACK_DEF(void *)
|
|
+static void *
|
|
FF_realloc(FT_Memory memory, long cur_size, long new_size, void *block)
|
|
{
|
|
gs_memory_t *mem = (gs_memory_t *) memory->user;
|
|
@@ -153,7 +153,7 @@ FT_CALLBACK_DEF(void *)
|
|
return (tmp);
|
|
}
|
|
|
|
-FT_CALLBACK_DEF(void)
|
|
+static void
|
|
FF_free(FT_Memory memory, void *block)
|
|
{
|
|
gs_memory_t *mem = (gs_memory_t *) memory->user;
|