CVS commit: pkgsrc/print/ghostscript-gpl

["David A. Holland" <dholland%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   dholland
Date:           Sun Nov 29 22:07:25 UTC 2020

Modified Files:
        pkgsrc/print/ghostscript-gpl: distinfo
Added Files:
        pkgsrc/print/ghostscript-gpl/patches: patch-psi_fapi__ft.c

Log Message:
Fix build of ghostscript-gpl against recent freetype.

Build fix only; no version bump.


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 pkgsrc/print/ghostscript-gpl/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/print/ghostscript-gpl/patches/patch-psi_fapi__ft.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/print/ghostscript-gpl/distinfo
diff -u pkgsrc/print/ghostscript-gpl/distinfo:1.22 pkgsrc/print/ghostscript-gpl/distinfo:1.23
--- pkgsrc/print/ghostscript-gpl/distinfo:1.22  Mon Nov 13 16:52:51 2017
+++ pkgsrc/print/ghostscript-gpl/distinfo       Sun Nov 29 22:07:24 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.22 2017/11/13 16:52:51 he Exp $
+$NetBSD: distinfo,v 1.23 2020/11/29 22:07:24 dholland Exp $
 
 SHA1 (ghostscript-9.06.tar.bz2) = 4c1c2b4cddd16d86b21f36ad4fc15f6100162238
 RMD160 (ghostscript-9.06.tar.bz2) = 11ef74cf783ec5f7cde0ceaaf2823a1f62fb4d1d
@@ -31,3 +31,4 @@ SHA1 (patch-base_memento.c) = d30cfb9285
 SHA1 (patch-cups_colord.h) = ab5c4bfa7184d2c1756697b87e7046645bdc2bc2
 SHA1 (patch-openjpeg_libopenjpeg_opj_malloc_h) = 24f15c55cd7961afc1254f6c4bccd6d0c2a5e737
 SHA1 (patch-psi_zfile.c) = 24626fed9b161a77d9ab43233bad4c8391120b16
+SHA1 (patch-psi_fapi__ft.c) = ff9ee32a7332177d9b178452e071dd6f8805af8e

Added files:

Index: pkgsrc/print/ghostscript-gpl/patches/patch-psi_fapi__ft.c
diff -u /dev/null pkgsrc/print/ghostscript-gpl/patches/patch-psi_fapi__ft.c:1.1
--- /dev/null   Sun Nov 29 22:07:25 2020
+++ pkgsrc/print/ghostscript-gpl/patches/patch-psi_fapi__ft.c   Sun Nov 29 22:07:25 2020
@@ -0,0 +1,18 @@
+$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