Source Mage code commit list

[Treeve Jelbert <scm AT sourcemage.org>]

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

 printer/ghostscript/BUILD            |    2 -
 printer/ghostscript/DETAILS          |    4 +-
 printer/ghostscript/HISTORY          |    6 ++++
 printer/ghostscript/PRE_BUILD        |    2 -
 printer/ghostscript/patches/ft.patch |   49 
-----------------------------------
 xorg-lib/libxres/DETAILS             |    2 -
 xorg-lib/libxres/HISTORY             |    3 ++
 7 files changed, 14 insertions(+), 54 deletions(-)

New commits:
commit bf3f1363f8133f4775ab4bf6f2f6107c2fa75ef0
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    ghostscript - tweak

commit 76dacf821521d91539b041ed9a54cdbb25a87c25
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    ghostscript: => 9.54.0

commit 7ecc5e3fa26a26ff0e6637feb6f8bc423d3f740f
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    libxres: => 1.2.1

diff --git a/printer/ghostscript/BUILD b/printer/ghostscript/BUILD
index 61316c0..e194335 100755
--- a/printer/ghostscript/BUILD
+++ b/printer/ghostscript/BUILD
@@ -2,7 +2,7 @@ CFLAGS+=" -Wno-unused-but-set-variable -Wno-unused-variable 
-Wno-maybe-uninitial
 # need a comma separated list
 OPTS="--with-drivers=`echo ${GS_PRINTERS} | \
       sed "s/  */ /g;s/^ *//;s/ *$/ /;s/^NONE //;s/ /,/g"`JAPAN,FILES \
-      --enable-dynamic  --without-luratech  ${OPTS}" &&
+      --enable-dynamic ${OPTS}" &&
 
 # -s causes libgs.so to be fully stripped
 LDFLAGS+=' '
diff --git a/printer/ghostscript/DETAILS b/printer/ghostscript/DETAILS
index f909b2b..1601f1a 100755
--- a/printer/ghostscript/DETAILS
+++ b/printer/ghostscript/DETAILS
@@ -1,6 +1,6 @@
            SPELL=ghostscript
-         VERSION=9.53.3
-     
SOURCE_HASH=sha512:eb832c27eecd30f15e346408c592d7096fd23ef0a6fa59bd50ca327578915434530a4868e69249c2594def0910c527302e99d54f0877f726a8ca8bea6f0f17b7
+         VERSION=9.54.0
+     
SOURCE_HASH=sha512:a3c96925f4dbf5e276fc543b88df185a0435c68166db15ac532094329ba8db314d739a292da18be7954daaafeeb290e641ea03edf888854d7e752998ec6062cc
   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 61a35e2..85ec553 100644
--- a/printer/ghostscript/HISTORY
+++ b/printer/ghostscript/HISTORY
@@ -1,3 +1,9 @@
+2021-04-01 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 9.54.0
+       * ft.patch: deleted
+       * PRE_BUILD: remove leptonica tesseract
+       * BUILD: no more luratech
+
 2020-11-18 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 9.53.3
        * ft.patch: added, for freettype2-2.10.3+
diff --git a/printer/ghostscript/PRE_BUILD b/printer/ghostscript/PRE_BUILD
index c21f123..bd3174a 100755
--- a/printer/ghostscript/PRE_BUILD
+++ b/printer/ghostscript/PRE_BUILD
@@ -4,7 +4,7 @@ cd $SOURCE_DIRECTORY &&
 apply_patch_dir patches &&
 
 # remove most of the embedded libraries. use the system ones instead
-rm -rf freetype jpeg libpng tiff lcms2 ijs openjpeg zlib &&
+rm -rf freetype jpeg libpng tiff lcms2 ijs openjpeg zlib leptonica tesseract 
&&
 
 # remove non-existing openjpeg header inclusion
 sed -i "/opj_malloc.h/d" base/sjpx_openjpeg.c
diff --git a/printer/ghostscript/patches/ft.patch 
b/printer/ghostscript/patches/ft.patch
deleted file mode 100644
index 7a9973f..0000000
--- a/printer/ghostscript/patches/ft.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 41ef9a0bc36b9db7115fbe9623f989bfb47bbade Mon Sep 17 00:00:00 2001
-From: Chris Liddell <chris.liddell AT 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
diff --git a/xorg-lib/libxres/DETAILS b/xorg-lib/libxres/DETAILS
index 123bcb9..362fb8f 100755
--- a/xorg-lib/libxres/DETAILS
+++ b/xorg-lib/libxres/DETAILS
@@ -1,6 +1,6 @@
            SPELL=libxres
              PKG=libXres
-         VERSION=1.2.0
+         VERSION=1.2.1
   SECURITY_PATCH=2
 #      SOURCE_GPG="gurus.gpg:
           SOURCE=${PKG}-${VERSION}.tar.bz2
diff --git a/xorg-lib/libxres/HISTORY b/xorg-lib/libxres/HISTORY
index 8f096c7..c867dd1 100644
--- a/xorg-lib/libxres/HISTORY
+++ b/xorg-lib/libxres/HISTORY
@@ -1,3 +1,6 @@
+2021-04-01 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 1.2.1
+
 2018-02-06 Treeve Jelbert <treeve AT sourcemage.org>
        * DEPENDS: use xorgproto