ghostscript: fix build w/ freetype 2.10.3

Fixes: https://trac.macports.org/ticket/61306
macports · Oct 12, 2020 · 90e5289 · 90e5289
1 parent 7661cbb
commit 90e5289
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 0 deletions.
diff --git a/print/ghostscript/Portfile b/print/ghostscript/Portfile
@@ -38,6 +38,11 @@ patchfiles          patch-base_unix-dll.mak.diff \
 #  https://bugs.ghostscript.com/show_bug.cgi?id=702474
 patchfiles-append    patch-6756b355c238.diff
 
+# Provide FT_CALLBACK_DEF macro removed from
+# <freetype/config/ftconfig.h> in freetype 2.10.3
+# https://trac.macports.org/ticket/61306
+patchfiles-append    patch-base_fapi_ft.c.diff
+
 checksums           ghostpdl-9.52.tar.gz \
                     rmd160  1e719f907c8dc6dd0000bf2c547eee54fd583b9f \
                     sha256  8f6e48325c106ae033bbae3e55e6c0b9ee5c6b57e54f7cd24fb80a716a93b06a \

diff --git a/print/ghostscript/files/patch-base_fapi_ft.c.diff b/print/ghostscript/files/patch-base_fapi_ft.c.diff
@@ -0,0 +1,21 @@
+Provide FT_CALLBACK_DEF macro removed from
+<freetype/config/ftconfig.h> in freetype 2.10.3
+https://trac.macports.org/ticket/61306
+
+--- base/fapi_ft.c.orig
++++ base/fapi_ft.c
+@@ -124,6 +124,14 @@
+ static void
+ delete_inc_int_info(gs_fapi_server * a_server,
+                     FT_IncrementalRec * a_inc_int_info);
++
++#ifndef FT_CALLBACK_DEF
++#ifdef __cplusplus
++#define FT_CALLBACK_DEF( x )  extern "C"  x
++#else
++#define FT_CALLBACK_DEF( x )  static  x
++#endif
++#endif
+
+ FT_CALLBACK_DEF(void *)
+ FF_alloc(FT_Memory memory, long size)