diff options
author | spz <spz@pkgsrc.org> | 2020-10-23 11:17:44 +0000 |
---|---|---|
committer | spz <spz@pkgsrc.org> | 2020-10-23 11:17:44 +0000 |
commit | 6d7c58887ca760479a58dd5714038ee63f964c27 (patch) | |
tree | 9529f4f6e1ff6d07b03d1601bcad76086163b6ba | |
parent | 0e4b0eadaa0e98783b65c893f83cccf4e3946d8d (diff) | |
download | pkgsrc-6d7c58887ca760479a58dd5714038ee63f964c27.tar.gz |
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.
-rw-r--r-- | print/ghostscript-agpl/Makefile | 3 | ||||
-rw-r--r-- | print/ghostscript-agpl/distinfo | 3 | ||||
-rw-r--r-- | print/ghostscript-agpl/patches/patch-base_fapi__ft.c | 33 |
3 files changed, 37 insertions, 2 deletions
diff --git a/print/ghostscript-agpl/Makefile b/print/ghostscript-agpl/Makefile index dd7dbfa3bf2..6db43035d04 100644 --- a/print/ghostscript-agpl/Makefile +++ b/print/ghostscript-agpl/Makefile @@ -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 diff --git a/print/ghostscript-agpl/distinfo b/print/ghostscript-agpl/distinfo index a4fd5d5bd0e..e8bdaf436ea 100644 --- a/print/ghostscript-agpl/distinfo +++ b/print/ghostscript-agpl/distinfo @@ -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 diff --git a/print/ghostscript-agpl/patches/patch-base_fapi__ft.c b/print/ghostscript-agpl/patches/patch-base_fapi__ft.c new file mode 100644 index 00000000000..72e5ce242f8 --- /dev/null +++ b/print/ghostscript-agpl/patches/patch-base_fapi__ft.c @@ -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; |