2 files changed, 42 insertions, 0 deletions
diff --git a/source/ap/ghostscript/ghostscript-9.53.3-freetype_fix-1.patch b/source/ap/ghostscript/ghostscript-9.53.3-freetype_fix-1.patch
new file mode 100644
index 00000000..66b5f655
--- /dev/null
+++ b/source/ap/ghostscript/ghostscript-9.53.3-freetype_fix-1.patch
@@ -0,0 +1,39 @@
+Submitted By: Ken Moffat <ken at linuxfromscratch dot org>
+Date: 2020-10-20
+Initial Package Version: 9.53.3
+Upstream Status: Applied
+Origin: https://git.ghostscript.com/?p=ghostpdl.git;a=commitdiff;h=41ef9a0bc36b#patch1
+Description: Fixes build failure with freetype-2.10.3 and later.
+
+diff --git a/base/fapi_ft.c b/base/fapi_ft.c
+index 65fa6dc..21aef2f 100644 (file)
+--- 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;
+
diff --git a/source/ap/ghostscript/ghostscript.SlackBuild b/source/ap/ghostscript/ghostscript.SlackBuild
index 614896e0..8179ac61 100755
--- a/source/ap/ghostscript/ghostscript.SlackBuild
+++ b/source/ap/ghostscript/ghostscript.SlackBuild
@@ -76,6 +76,9 @@ cd ${SRCPREFIX}${PKGNAM}-$VERSION || exit 1
 # Remove unmaintained garbage:
 rm -rf freetype jpeg lcms2 libpng libtiff png tiff zlib
 
+# Fix build against freetype-2.10.3+:
+zcat $CWD/ghostscript-9.53.3-freetype_fix-1.patch.gz | patch -p1 --verbose || exit 1
+
 # Regenerate ./configure.  Needed if patched, or to prevent libtool mismatch.
 autoreconf --force --install
 ( cd jbig2dec ; autoreconf --force --install )