print/ghostscript9-agpl-{base,x11}: update to 9.55.0

- pdfocr{8,24,32} for Tesseract OCR engine have been added.

Security:	CVE-2021-3781

4 files changed, 4 insertions, 115 deletions

diff --git a/print/ghostscript9-agpl-base/files/patch-configure b/print/ghostscript9-agpl-base/files/patch-configure
index ac61ae458e08..73d694ba2be5 100644
--- a/print/ghostscript9-agpl-base/files/patch-configure
+++ b/print/ghostscript9-agpl-base/files/patch-configure
@@ -1,17 +1,6 @@
---- configure.orig	2020-03-19 08:22:25 UTC
+--- configure.orig	2021-09-27 07:44:02 UTC
 +++ configure
-@@ -4522,8 +4522,8 @@ case $host in
-         ;;
-         *bsd*)
-         if test $ac_cv_c_compiler_gnu = yes; then
--            CC_OPT_FLAGS_TO_TRY="-O2 -DNDEBUG"
--            CC_DBG_FLAGS_TO_TRY="-gdwarf-2 -g3 -O0"
-+            CC_OPT_FLAGS_TO_TRY=""
-+            CC_DBG_FLAGS_TO_TRY=""
-         fi
-         ;;
-         *-darwin*)
-@@ -5357,7 +5357,7 @@ if test "${enable_threadsafe+set}" = set; then :
+@@ -5539,7 +5539,7 @@ if test "${enable_threadsafe+set}" = set; then :
  fi
  
  if test x$enable_threadsafe = xyes ; then
@@ -20,7 +9,7 @@
  fi
  
  
-@@ -10683,42 +10683,42 @@ if test x$enable_threadsafe = xyes; then
+@@ -11352,42 +11352,42 @@ if test x$enable_threadsafe = xyes; then
  
    for ntsdev in $NTS_DEVS ; do
      NTS_EXCLUDES="$(echo \"$P_DEVS0{@:0}\" | grep -o $ntsdev) $NTS_EXCLUDES"
@@ -71,7 +60,7 @@
    done
  
    NTS_EXCLUDES=`echo "$NTS_EXCLUDES" | tr " " "\n" | sort | uniq | tr "\n" " "`
-@@ -10970,7 +10970,12 @@ if test "${enable_dynamic+set}" = set; then :
+@@ -11686,7 +11686,12 @@ if test "${enable_dynamic+set}" = set; then :
          DBG_CFLAGS="$DYNAMIC_CFLAGS $DBG_CFLAGS"
        ;;
        *bsd*)
diff --git a/print/ghostscript9-agpl-base/files/patch-git_41ef9a0 b/print/ghostscript9-agpl-base/files/patch-git_41ef9a0
deleted file mode 100644
index 9c26e436ca82..000000000000
--- a/print/ghostscript9-agpl-base/files/patch-git_41ef9a0
+++ /dev/null
@@ -1,51 +0,0 @@
-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
---- base/fapi_ft.c
-+++ 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/print/ghostscript9-agpl-base/files/patch-lcms2mt b/print/ghostscript9-agpl-base/files/patch-lcms2mt
deleted file mode 100644
index fc0b9a697231..000000000000
--- a/print/ghostscript9-agpl-base/files/patch-lcms2mt
+++ /dev/null
@@ -1,22 +0,0 @@
---- Makefile.in.orig	2020-03-19 08:21:42 UTC
-+++ Makefile.in
-@@ -462,6 +462,8 @@ DBUS_LIBS=@DBUS_LIBS@
- # defines from autoconf; note that we don't use all of these at present.
- ACDEFS=@DEFS@
- 
-+CFLAGS_VISIBILITY="-fvisibility=hidden"
-+
- CFLAGS=$(CFLAGS_STANDARD) $(GCFLAGS) $(AC_CFLAGS) $(XCFLAGS) @CLUSTER_CFLAGS@
- CFLAGSAUX=$(CFLAGSAUX_STANDARD) $(GCFLAGSAUX) $(XCFLAGSAUX)
- 
---- base/lcms2mt.mak.orig	2020-03-19 08:21:42 UTC
-+++ base/lcms2mt.mak
-@@ -80,7 +80,7 @@ lcms2.config-clean :
- 
- # NB: we can't use the normal $(CC_) here because msvccmd.mak
- # adds /Za which conflicts with the lcms source.
--LCMS2_CC=$(CC) $(D_)SHARE_LCMS=$(SHARE_LCMS)$(_D) $(GENOPT) $(CAPOPT) $(CFLAGS) $(LCMS2_CFLAGS) $(I_)$(LCMS2MTSRCDIR)$(D)include $(LCMS2CF_)
-+LCMS2_CC=$(CC) $(CFLAGS_VISIBILITY) $(D_)SHARE_LCMS=$(SHARE_LCMS)$(_D) $(GENOPT) $(CAPOPT) $(CFLAGS) $(LCMS2_CFLAGS) $(I_)$(LCMS2MTSRCDIR)$(D)include $(LCMS2CF_)
- LCMS2O_=$(O_)$(LCMS2OBJ)
- 
- # switch in the version of lcms2mt.dev we're actually using
diff --git a/print/ghostscript9-agpl-base/files/patch-psi-zstring.c b/print/ghostscript9-agpl-base/files/patch-psi-zstring.c
deleted file mode 100644
index 77b1b8fc2178..000000000000
--- a/print/ghostscript9-agpl-base/files/patch-psi-zstring.c
+++ /dev/null
@@ -1,27 +0,0 @@
---- psi/zstring.c.orig	2020-03-19 08:21:42 UTC
-+++ psi/zstring.c
-@@ -142,13 +142,18 @@ search_impl(i_ctx_t *i_ctx_p, bool forward)
-     return 0;
- found:
-     op->tas.type_attrs = op1->tas.type_attrs;
--    op->value.bytes = ptr;
--    r_set_size(op, size);
-+    op->value.bytes = ptr;                             /* match */
-+    op->tas.rsize = size;                              /* match */
-     push(2);
--    op[-1] = *op1;
--    r_set_size(op - 1, ptr - op[-1].value.bytes);
--    op1->value.bytes = ptr + size;
--    r_set_size(op1, count + (!forward ? (size - 1) : 0));
-+    op[-1] = *op1;                                     /* pre */
-+    op[-3].value.bytes = ptr + size;                   /* post */
-+    if (forward) {
-+        op[-1].tas.rsize = ptr - op[-1].value.bytes;   /* pre */
-+        op[-3].tas.rsize = count;                      /* post */
-+    } else {
-+        op[-1].tas.rsize = count;                      /* pre */
-+        op[-3].tas.rsize -= count + size;              /* post */
-+    }
-     make_true(op);
-     return 0;
- }