From 7eb596bf2c2e8e3439daa8cb4c6cca888b094d05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Sun, 25 Oct 2020 07:09:46 +0100
Subject: [PATCH] ghostscript: fix build w/ freetype-2.10.4

Closes: #25866
---
 .../ghostscript-9.53.3-freetype_fix-1.patch   | 39 +++++++++++++++++++
 srcpkgs/ghostscript/template                  | 12 +++---
 2 files changed, 45 insertions(+), 6 deletions(-)
 create mode 100644 srcpkgs/ghostscript/patches/ghostscript-9.53.3-freetype_fix-1.patch

diff --git a/srcpkgs/ghostscript/patches/ghostscript-9.53.3-freetype_fix-1.patch b/srcpkgs/ghostscript/patches/ghostscript-9.53.3-freetype_fix-1.patch
new file mode 100644
index 00000000000..66b5f6556f4
--- /dev/null
+++ b/srcpkgs/ghostscript/patches/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/srcpkgs/ghostscript/template b/srcpkgs/ghostscript/template
index 77d337cc3a2..22927d66027 100644
--- a/srcpkgs/ghostscript/template
+++ b/srcpkgs/ghostscript/template
@@ -1,18 +1,18 @@
 # Template file for 'ghostscript'
 pkgname=ghostscript
 version=9.53.3
-revision=1
+revision=2
+hostmakedepends="automake libtool pkg-config"
+makedepends="$(vopt_if cups cups-devel) dbus-devel fontconfig-devel jasper-devel jbig2dec-devel
+ lcms2-devel libXext-devel libXt-devel libopenjpeg2-devel libpaper-devel"
+depends="gsfonts"
 short_desc="Interpreter for the PostScript language"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="AGPL-3.0-or-later, CPL-1.0"
 homepage="https://www.ghostscript.com/"
 distfiles="https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${version//./}/ghostscript-${version}.tar.xz"
 checksum=9c9f5bc85b6c7eb08368c05b1e3339f7aaf9677ddca710c6283f872d55e2a234
-
-hostmakedepends="automake libtool pkg-config"
-makedepends="$(vopt_if cups cups-devel) dbus-devel fontconfig-devel jasper-devel jbig2dec-devel
- lcms2-devel libXext-devel libXt-devel libopenjpeg2-devel libpaper-devel"
-depends="gsfonts"
+patch_args="-Np1"
 
 build_options="cups"
 build_options_default="cups"