CVS commit: [pkgsrc-2020Q3] pkgsrc/print/ghostscript-agpl

["S.P.Zeidler" <spz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   spz
Date:           Fri Oct 23 11:17:44 UTC 2020

Modified Files:
        pkgsrc/print/ghostscript-agpl [pkgsrc-2020Q3]: Makefile distinfo
Added Files:
        pkgsrc/print/ghostscript-agpl/patches [pkgsrc-2020Q3]:
            patch-base_fapi__ft.c

Log Message:
Pullup ticket #6354 - requested by maya
print/ghostscript-agpl: dependecy update triggered build fix

Revisions pulled up:
-       print/ghostscript-agpl/Makefile                         patch
-       print/ghostscript-agpl/distinfo                         patch
-       print/ghostscript-agpl/patches/patch-base_fapi__ft.c    1.1

Make the package build with FreeType 2.10.3.


To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.59.2.1 pkgsrc/print/ghostscript-agpl/Makefile
cvs rdiff -u -r1.32 -r1.32.2.1 pkgsrc/print/ghostscript-agpl/distinfo
cvs rdiff -u -r0 -r1.1.2.2 \
    pkgsrc/print/ghostscript-agpl/patches/patch-base_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-agpl/Makefile
diff -u pkgsrc/print/ghostscript-agpl/Makefile:1.59 pkgsrc/print/ghostscript-agpl/Makefile:1.59.2.1
--- pkgsrc/print/ghostscript-agpl/Makefile:1.59 Sun Sep 13 14:16:30 2020
+++ pkgsrc/print/ghostscript-agpl/Makefile      Fri Oct 23 11:17:44 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.59 2020/09/13 14:16:30 leot Exp $
+# $NetBSD: Makefile,v 1.59.2.1 2020/10/23 11:17:44 spz Exp $
 
 DISTNAME=      ghostscript-${GS_VERSION}
 PKGNAME=       ${DISTNAME:S/ghostscript/ghostscript-agpl/}
@@ -18,6 +18,7 @@ COMMENT=      Postscript interpreter
 LICENSE=       gnu-agpl-v3
 
 .include       "Makefile.common"
+PKGREVISION=   1
 
 DEPENDS+=              ghostscript-fonts>=6.0:../../fonts/ghostscript-fonts
 

Index: pkgsrc/print/ghostscript-agpl/distinfo
diff -u pkgsrc/print/ghostscript-agpl/distinfo:1.32 pkgsrc/print/ghostscript-agpl/distinfo:1.32.2.1
--- pkgsrc/print/ghostscript-agpl/distinfo:1.32 Sun Sep 20 08:28:24 2020
+++ pkgsrc/print/ghostscript-agpl/distinfo      Fri Oct 23 11:17:44 2020
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.32 2020/09/20 08:28:24 wiz Exp $
+$NetBSD: distinfo,v 1.32.2.1 2020/10/23 11:17:44 spz Exp $
 
 SHA1 (ghostscript-9.53.1.tar.xz) = bc62c33d1dde52bcc46397a0b1996539b7cf85f7
 RMD160 (ghostscript-9.53.1.tar.xz) = 3154a35f3b891408c7e12f954f98147e60026fd4
 SHA512 (ghostscript-9.53.1.tar.xz) = 5c78ed0a03983cbf9d55885c5ee8fbfc987db367b020ad0148b8861de42923e38c688447cfc6efcea5521121545ecfbea9690058fd3c4438629a43b5990800c5
 Size (ghostscript-9.53.1.tar.xz) = 41362600 bytes
+SHA1 (patch-base_fapi__ft.c) = f074e2e8c2c6ea582a94001fabd970eaca1a8257
 SHA1 (patch-base_gserrors_h) = ce75cfb7528871842a3bd35e18a6d91c89823909
 SHA1 (patch-base_lib.mak) = 723926f167b49568376ef0c0da6aa4ec01fe1516
 SHA1 (patch-base_mkromfs.c) = 9d9afbd0fbb8c70c8f4f7de3cadc5b54541f0db0

Added files:

Index: pkgsrc/print/ghostscript-agpl/patches/patch-base_fapi__ft.c
diff -u /dev/null pkgsrc/print/ghostscript-agpl/patches/patch-base_fapi__ft.c:1.1.2.2
--- /dev/null   Fri Oct 23 11:17:44 2020
+++ pkgsrc/print/ghostscript-agpl/patches/patch-base_fapi__ft.c Fri Oct 23 11:17:44 2020
@@ -0,0 +1,33 @@
+$NetBSD: patch-base_fapi__ft.c,v 1.1.2.2 2020/10/23 11:17:44 spz Exp $
+
+Build with FreeType 2.10.3.
+
+--- base/fapi_ft.c.orig        2020-09-14 13:40:08.000000000 +0000
++++ 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;