Sun Nov 29 22:07:25 2020 UTC ()
Fix build of ghostscript-gpl against recent freetype.

Build fix only; no version bump.


(dholland)
diff -r1.22 -r1.23 pkgsrc/print/ghostscript-gpl/distinfo
diff -r0 -r1.1 pkgsrc/print/ghostscript-gpl/patches/patch-psi_fapi__ft.c
cvs diff -r1.22 -r1.23 pkgsrc/print/ghostscript-gpl/distinfo (expand / switch to unified diff)

--- pkgsrc/print/ghostscript-gpl/distinfo 2017/11/13 16:52:51 1.22
+++ pkgsrc/print/ghostscript-gpl/distinfo 2020/11/29 22:07:24 1.23
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.22 2017/11/13 16:52:51 he Exp $ 1$NetBSD: distinfo,v 1.23 2020/11/29 22:07:24 dholland Exp $
2 2
3SHA1 (ghostscript-9.06.tar.bz2) = 4c1c2b4cddd16d86b21f36ad4fc15f6100162238 3SHA1 (ghostscript-9.06.tar.bz2) = 4c1c2b4cddd16d86b21f36ad4fc15f6100162238
4RMD160 (ghostscript-9.06.tar.bz2) = 11ef74cf783ec5f7cde0ceaaf2823a1f62fb4d1d 4RMD160 (ghostscript-9.06.tar.bz2) = 11ef74cf783ec5f7cde0ceaaf2823a1f62fb4d1d
5SHA512 (ghostscript-9.06.tar.bz2) = 99f7a56316bf96d55c0cd7b07c0791ad4e6ee0d3a8f3bfa04ea28890ea9ed822ebcd7084cc8118cc38dc5def27c91c24eebc08a20a630463a9bf9d0193d0923b 5SHA512 (ghostscript-9.06.tar.bz2) = 99f7a56316bf96d55c0cd7b07c0791ad4e6ee0d3a8f3bfa04ea28890ea9ed822ebcd7084cc8118cc38dc5def27c91c24eebc08a20a630463a9bf9d0193d0923b
6Size (ghostscript-9.06.tar.bz2) = 29246039 bytes 6Size (ghostscript-9.06.tar.bz2) = 29246039 bytes
7SHA1 (patch-CVE-2012-4405) = 1dcb4cfeceb366c144e0a1337c6ccc2d8e13e4ca 7SHA1 (patch-CVE-2012-4405) = 1dcb4cfeceb366c144e0a1337c6ccc2d8e13e4ca
8SHA1 (patch-CVE-2014-8137) = 5375f56f3d7cdfed0c9f900d291d75bbc3182b96 8SHA1 (patch-CVE-2014-8137) = 5375f56f3d7cdfed0c9f900d291d75bbc3182b96
9SHA1 (patch-CVE-2014-8138) = be161051680e3c6c9246f31237019470a447ee49 9SHA1 (patch-CVE-2014-8138) = be161051680e3c6c9246f31237019470a447ee49
10SHA1 (patch-CVE-2014-8157) = 18822069b9791fc3553e812878cfca483d881cd4 10SHA1 (patch-CVE-2014-8157) = 18822069b9791fc3553e812878cfca483d881cd4
11SHA1 (patch-CVE-2014-8158) = 71387f152a205caaef0fcc518dbb0fbb7b78e531 11SHA1 (patch-CVE-2014-8158) = 71387f152a205caaef0fcc518dbb0fbb7b78e531
12SHA1 (patch-CVE-2014-9029) = 9636c7d6909fc0dec7ad2102b59fb14d599bac6a 12SHA1 (patch-CVE-2014-9029) = 9636c7d6909fc0dec7ad2102b59fb14d599bac6a
13SHA1 (patch-CVE-2016-10217) = 85f2cb708bb38a88215573e63821be8a54bc019e 13SHA1 (patch-CVE-2016-10217) = 85f2cb708bb38a88215573e63821be8a54bc019e
14SHA1 (patch-CVE-2016-10219) = 24ef41da0579840360110cc5c1f79622210f8e6b 14SHA1 (patch-CVE-2016-10219) = 24ef41da0579840360110cc5c1f79622210f8e6b
@@ -21,13 +21,14 @@ SHA1 (patch-ah) = 7548f6f78b8029febec044 @@ -21,13 +21,14 @@ SHA1 (patch-ah) = 7548f6f78b8029febec044
21SHA1 (patch-ai) = 3962a3acac1d4537dbbe3fc3b205aba87387d485 21SHA1 (patch-ai) = 3962a3acac1d4537dbbe3fc3b205aba87387d485
22SHA1 (patch-aj) = 620d921210b5c0efec0a84e33bc416e4ab4bd11c 22SHA1 (patch-aj) = 620d921210b5c0efec0a84e33bc416e4ab4bd11c
23SHA1 (patch-al) = e5a5be44f997a450afef15e172acc771b4818ac9 23SHA1 (patch-al) = e5a5be44f997a450afef15e172acc771b4818ac9
24SHA1 (patch-an) = 22ed9965aec5d540adb31334d8dd9e05eab8e0c2 24SHA1 (patch-an) = 22ed9965aec5d540adb31334d8dd9e05eab8e0c2
25SHA1 (patch-base_configure_ac) = c0f5ee586df05d1d136b7c89b4776c0bf480cc57 25SHA1 (patch-base_configure_ac) = c0f5ee586df05d1d136b7c89b4776c0bf480cc57
26SHA1 (patch-base_gdevpng.c) = 24120e26bd2a846f6d4c8ab9753dfe91f151343f 26SHA1 (patch-base_gdevpng.c) = 24120e26bd2a846f6d4c8ab9753dfe91f151343f
27SHA1 (patch-base_gsdevice.c) = fc9a17b3e8a7ac517b1faecdc1b1df31491ff36f 27SHA1 (patch-base_gsdevice.c) = fc9a17b3e8a7ac517b1faecdc1b1df31491ff36f
28SHA1 (patch-base_gserrors_h) = fde64bd096a6e6f94005c8352a6295df06c19bae 28SHA1 (patch-base_gserrors_h) = fde64bd096a6e6f94005c8352a6295df06c19bae
29SHA1 (patch-base_gsmalloc.c) = 891bdcef49e0f2c435744eaf7bbcd31f5dbcbaba 29SHA1 (patch-base_gsmalloc.c) = 891bdcef49e0f2c435744eaf7bbcd31f5dbcbaba
30SHA1 (patch-base_memento.c) = d30cfb9285a0268e743c90cdf831674eaa24789b 30SHA1 (patch-base_memento.c) = d30cfb9285a0268e743c90cdf831674eaa24789b
31SHA1 (patch-cups_colord.h) = ab5c4bfa7184d2c1756697b87e7046645bdc2bc2 31SHA1 (patch-cups_colord.h) = ab5c4bfa7184d2c1756697b87e7046645bdc2bc2
32SHA1 (patch-openjpeg_libopenjpeg_opj_malloc_h) = 24f15c55cd7961afc1254f6c4bccd6d0c2a5e737 32SHA1 (patch-openjpeg_libopenjpeg_opj_malloc_h) = 24f15c55cd7961afc1254f6c4bccd6d0c2a5e737
33SHA1 (patch-psi_zfile.c) = 24626fed9b161a77d9ab43233bad4c8391120b16 33SHA1 (patch-psi_zfile.c) = 24626fed9b161a77d9ab43233bad4c8391120b16
 34SHA1 (patch-psi_fapi__ft.c) = ff9ee32a7332177d9b178452e071dd6f8805af8e
File Added: pkgsrc/print/ghostscript-gpl/patches/patch-psi_fapi__ft.c
$NetBSD: patch-psi_fapi__ft.c,v 1.1 2020/11/29 22:07:25 dholland Exp $

Fix build with freetype2 2.10.3+

--- psi/fapi_ft.c~	2012-08-08 08:01:36.000000000 +0000
+++ psi/fapi_ft.c
@@ -53,6 +53,11 @@
 #include FT_IMAGE_H
 #include FT_BITMAP_H
 
+/* internal now-removed freetype2 object gs shouldn't have been using */
+#ifndef FT_CALLBACK_DEF
+#define FT_CALLBACK_DEF(decl) static decl
+#endif
+
 /* Note: structure definitions here start with FF_, which stands for 'FAPI FreeType". */
 
 typedef struct FF_server_s