diff options
Diffstat (limited to 'package/ghostscript')
5 files changed, 59 insertions, 80 deletions
diff --git a/package/ghostscript/0001-Fix-cross-compilation-issue.patch b/package/ghostscript/0001-Fix-cross-compilation-issue.patch deleted file mode 100644 index a13c7f8381..0000000000 --- a/package/ghostscript/0001-Fix-cross-compilation-issue.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 5fed765abb8ff07c381cc3ebb9367e9560f7a658 Mon Sep 17 00:00:00 2001 -From: Bernd Kuhls <bernd.kuhls@t-online.de> -Date: Mon, 20 Mar 2017 23:43:03 +0100 -Subject: [PATCH] Fix cross compilation issue - -Without this patch unsafe paths are used: -x86_64-linux-gcc: ERROR: unsafe header/library path used in cross-compilation: '/libtiff' - -Downloaded from -http://bugs.ghostscript.com/show_bug.cgi?id=696508#c3 - -Slightly updated to work with 9.23 - -Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> -Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index d0f62d7..0d49344 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1173,7 +1173,7 @@ XPSWRITEDEVICE='' - - - LIBTIFFDIR='src' --LIBTIFFCONFDIR='' -+LIBTIFFCONFDIR='src' - TIFFCFLAGS='' - - TIFFDEVS_ALL='tiffs tiff12nc tiff24nc tiff48nc tiff32nc tiff64nc tiffcrle tifflzw tiffpack tiffgray tiffsep tiffsep1 tiffscaled tiffscaled4 tiffscaled8 tiffscaled24 tiffscaled32' - FAX_DEVS_ALL='cfax dfaxlow dfaxhigh fax faxg3 faxg32d faxg4 tiffg3 tiffg32d tiffg4 tfax' --- -2.7.4 - diff --git a/package/ghostscript/0001-bug-702985-drop-use-of-FT_CALLBACK_DEF.patch b/package/ghostscript/0001-bug-702985-drop-use-of-FT_CALLBACK_DEF.patch new file mode 100644 index 0000000000..044dcc72f1 --- /dev/null +++ b/package/ghostscript/0001-bug-702985-drop-use-of-FT_CALLBACK_DEF.patch @@ -0,0 +1,55 @@ +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. + +Downloaded from upstream commit: +https://git.ghostscript.com/?p=ghostpdl.git;a=commitdiff;h=41ef9a0bc36b + +Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> +--- + 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 + diff --git a/package/ghostscript/0002-configure.ac-fix-cross-compilation.patch b/package/ghostscript/0002-configure.ac-fix-cross-compilation.patch deleted file mode 100644 index 2bbff431ec..0000000000 --- a/package/ghostscript/0002-configure.ac-fix-cross-compilation.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 579f2e089b9502e48222ab85d342128857bf20c3 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine <fontaine.fabrice@gmail.com> -Date: Sat, 12 Sep 2020 11:38:01 +0200 -Subject: [PATCH] configure.ac: fix cross-compilation - -Cross-compilation fails since version 9.53.0 and -https://git.ghostscript.com/?p=ghostpdl.git;a=commit;h=3ff82b33f24ed54c2d3bb88ec31da7d2f9fd2765 - -Indeed, when x"$host" != x"$build", a recursive call to configure script -(for auxiliary tools) is being made. In this call, ---enable-auxtools_only and --without-libtiff are passed which will -result in the following build failure because SHARE_LIBTIFF is not set -and SHARE_LIBJPEG is set to 0: - -checking for local lcms2mt library source... configure: error: Mixing local libtiff with shared libjpeg not supported -configure: error: Recursive call to configure script failed - -Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> -[Upstream status: https://bugs.ghostscript.com/show_bug.cgi?id=702897] ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index d4f56fdea..6ae3c2cc1 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1618,7 +1618,7 @@ case "x$with_system_libtiff" in - esac - - --if test x"$SHARE_LIBTIFF" != x"$SHARE_LIBJPEG" ; then -+if test x"$SHARE_LIBTIFF" != x"" && test x"$SHARE_LIBTIFF" != x"$SHARE_LIBJPEG" ; then - AC_MSG_ERROR([Mixing local libtiff with shared libjpeg not supported]) - fi - --- -2.28.0 - diff --git a/package/ghostscript/ghostscript.hash b/package/ghostscript/ghostscript.hash index 102e5355a5..f6cedc6198 100644 --- a/package/ghostscript/ghostscript.hash +++ b/package/ghostscript/ghostscript.hash @@ -1,5 +1,5 @@ -# From https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs9530/SHA512SUMS -sha512 fe73842339bee7aa6d0f177be7733b97b9394dafe69b122645c9c80de763214ffb6735b961ff5bf97146b29c2d0e9b4b9cfaee60baf77a1c280bcf651d789982 ghostscript-9.53.0.tar.gz +# From https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs9533/SHA512SUMS +sha512 c142ef9d83896aa8fd18c8e412220fe8f4950614be00d327d27ab051fe85e16524bf2ee00f46c2aca7a352ce47bc3acf2c4de0f7bbea7e4c55474b8af6cdc0a6 ghostscript-9.53.3.tar.gz # Hash for license file: sha256 6f852249f975287b3efd43a5883875e47fa9f3125e2f1b18b5c09517ac30ecf2 LICENSE diff --git a/package/ghostscript/ghostscript.mk b/package/ghostscript/ghostscript.mk index e8ebc366e4..5b50c94405 100644 --- a/package/ghostscript/ghostscript.mk +++ b/package/ghostscript/ghostscript.mk @@ -4,12 +4,11 @@ # ################################################################################ -GHOSTSCRIPT_VERSION = 9.53.0 +GHOSTSCRIPT_VERSION = 9.53.3 GHOSTSCRIPT_SITE = https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs$(subst .,,$(GHOSTSCRIPT_VERSION)) GHOSTSCRIPT_LICENSE = AGPL-3.0 GHOSTSCRIPT_LICENSE_FILES = LICENSE -# 0001-Fix-cross-compilation-issue.patch -GHOSTSCRIPT_AUTORECONF = YES +GHOSTSCRIPT_CPE_ID_VENDOR = artifex GHOSTSCRIPT_DEPENDENCIES = \ host-lcms2 \ host-libjpeg \ |