ghostscript: fix for freetype update

1 files changed, 49 insertions, 1 deletions

diff --git a/src/ghostscript-1-fixes.patch b/src/ghostscript-1-fixes.patch
index 605b0b4..496841a 100644
--- a/src/ghostscript-1-fixes.patch
+++ b/src/ghostscript-1-fixes.patch
@@ -5,7 +5,7 @@ Contains ad hoc patches for cross building.
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: darealshinji <djcj@gmx.de>
 Date: Mon, 3 Dec 2018 21:05:41 +0100
-Subject: [PATCH 1/1] cross-build fixes, hide libgs symbols
+Subject: [PATCH 1/2] cross-build fixes, hide libgs symbols
 
 
 diff --git a/Makefile.in b/Makefile.in
@@ -705,3 +705,51 @@ index 1111111..2222222 100644
  # ifndef GSDLLAPI
  #  define GSDLLAPI __stdcall
  # endif
+
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Chris Liddell <chris.liddell@artifex.com>
+Date: Tue, 20 Oct 2020 08:49:45 +0100
+Subject: [PATCH 2/2] Bug 702985: drop use of FT_CALLBACK_DEF() def
+
+Taken from:
+https://git.ghostscript.com/?p=ghostpdl.git;a=commitdiff;h=41ef9a0bc36b#patch1
+
+From 2.10.3, Freetype disappeared the FT_CALLBACK_DEF() macro, which is what
+we used when defining our callbacks from Freetype.
+
+No guidance forthcoming from the Freetype developer who made those changes,
+so change to explicitly declaring the callbacks file static.
+
+Should fix the reported build failures.
+
+diff --git a/base/fapi_ft.c b/base/fapi_ft.c
+index 1111111..2222222 100644
+--- 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;