diff options
| author | Treeve Jelbert | 2020-11-18 12:04:14 +0100 |
|---|---|---|
| committer | Treeve Jelbert | 2020-11-18 12:04:14 +0100 |
| commit | a233566574f3856cac06b9e15cf9352ce255c8f5 (patch) | |
| tree | 0d80e10b2cc1ab2cf8d966f6027a96b50d2eff47 | |
| parent | 8fdc69eed22a015ff1fa0ae032955e39be83ff97 (diff) | |
ghostscript: => 9.53.3
| -rwxr-xr-x | printer/ghostscript/DETAILS | 4 | ||||
| -rw-r--r-- | printer/ghostscript/HISTORY | 4 | ||||
| -rw-r--r-- | printer/ghostscript/patches/ft.patch | 49 |
3 files changed, 55 insertions, 2 deletions
diff --git a/printer/ghostscript/DETAILS b/printer/ghostscript/DETAILS index f03e7b1d5e..f909b2b446 100755 --- a/printer/ghostscript/DETAILS +++ b/printer/ghostscript/DETAILS @@ -1,6 +1,6 @@ SPELL=ghostscript - VERSION=9.53.2 - SOURCE_HASH=sha512:fe430e96b67a082b58942d66193a89b8af042574929e8299e1f8b1ef2a7f71565ba5a96b72d26db38f4a05e70119a019c5fe73b842d51afd357d642d39d95320 + VERSION=9.53.3 + SOURCE_HASH=sha512:eb832c27eecd30f15e346408c592d7096fd23ef0a6fa59bd50ca327578915434530a4868e69249c2594def0910c527302e99d54f0877f726a8ca8bea6f0f17b7 SECURITY_PATCH=9 SOURCE=$SPELL-$VERSION.tar.xz SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION" diff --git a/printer/ghostscript/HISTORY b/printer/ghostscript/HISTORY index 4445ffeb14..61a35e2a3b 100644 --- a/printer/ghostscript/HISTORY +++ b/printer/ghostscript/HISTORY @@ -1,3 +1,7 @@ +2020-11-18 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 9.53.3 + * ft.patch: added, for freettype2-2.10.3+ + 2020-09-28 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de> * DETAILS: version 9.53.2 diff --git a/printer/ghostscript/patches/ft.patch b/printer/ghostscript/patches/ft.patch new file mode 100644 index 0000000000..7a9973f320 --- /dev/null +++ b/printer/ghostscript/patches/ft.patch @@ -0,0 +1,49 @@ +From 41ef9a0bc36b9db7115fbe9623f989bfb47bbade Mon Sep 17 00:00:00 2001 +From: Chris Liddell <chris.liddell@artifex.com> +Date: Tue, 20 Oct 2020 09:49:45 +0100 +Subject: [PATCH] Bug 702985: drop use of FT_CALLBACK_DEF() def + +From 2.10.3, Freetype disappeared the FT_CALLBACK_DEF() macro, which is what +we used when defining our callbacks from Freetype. + +No guidance forthcoming from the Freetype developer who made those changes, +so change to explicitly declaring the callbacks file static. + +Should fix the reported build failures. +--- + base/fapi_ft.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/base/fapi_ft.c b/base/fapi_ft.c +index 65fa6dcf4..21aef2f06 100644 +--- 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; +-- +2.17.1 |