Source Mage code commit list

[Treeve Jelbert <scm AT sourcemage.org>]

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

 graphics/leptonica/DETAILS                            |    4 ++--
 graphics/leptonica/HISTORY                            |    3 +++
 graphics/tesseract/DEPENDS                            |    4 +++-
 graphics/tesseract/DETAILS                            |    4 ++--
 graphics/tesseract/HISTORY                            |    6 ++++++
 graphics/tesseract/PRE_BUILD                          |   12 ++++++------
 graphics/tesseract/patches/fix-missing-includes.patch |   14 --------------
 7 files changed, 22 insertions(+), 25 deletions(-)

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

    tesseract: => 5.0.0

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

    leptonica: => 1.82.0

diff --git a/graphics/leptonica/DETAILS b/graphics/leptonica/DETAILS
index 4212625..a0df86c 100755
--- a/graphics/leptonica/DETAILS
+++ b/graphics/leptonica/DETAILS
@@ -1,6 +1,6 @@
            SPELL=leptonica
-         VERSION=1.81.1
-     
SOURCE_HASH=sha512:3c24e30eab21b634094543a722172553e35d928b3a50bfe78e9b0123cd16d710b4be8714acaac87344b22292b460d6ffb06b05a8e7f3df060544a2bbf3f8a7d2
+         VERSION=1.82.0
+     
SOURCE_HASH=sha512:cb0484570bf3921307ab5c805b3f0e08d4aaa811adfb592f3956b563fc145f7a45173e2278fc5d8a9e37f729bb34dbf8068e030e2066d54547f82d26b56aa27d
   SECURITY_PATCH=1
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/graphics/leptonica/HISTORY b/graphics/leptonica/HISTORY
index cb2bad4..0d98ad8 100644
--- a/graphics/leptonica/HISTORY
+++ b/graphics/leptonica/HISTORY
@@ -1,3 +1,6 @@
+2021-12-02 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 1.82.0
+
 2021-06-14 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 1.81.1
 
diff --git a/graphics/tesseract/DEPENDS b/graphics/tesseract/DEPENDS
index 2a45f6b..93bb567 100755
--- a/graphics/tesseract/DEPENDS
+++ b/graphics/tesseract/DEPENDS
@@ -3,7 +3,9 @@ depends -sub CXX gcc    &&
 depends JPEG   &&
 depends leptonica &&
 depends tiff   &&
-depends icu    &&
+depends icu ' -DUSE_SYSTEM_ICU=1'   &&
+depends libarchive &&
+depends curl &&
 optional_depends pango \
       ' -DBUILD_TRAINING_TOOLS=1' \
       ' -DBUILD_TRAINING_TOOLS=0' \
diff --git a/graphics/tesseract/DETAILS b/graphics/tesseract/DETAILS
index f7d6dd4..7d00555 100755
--- a/graphics/tesseract/DETAILS
+++ b/graphics/tesseract/DETAILS
@@ -1,8 +1,8 @@
 source $GRIMOIRE/CMAKE_FUNCTIONS
            SPELL=tesseract
-         VERSION=4.1.1
+         VERSION=5.0.0
          LANGVER=4.00
-     
SOURCE_HASH=sha512:017723a2268be789fe98978eed02fd294968cc8050dde376dee026f56f2b99df42db935049ae5e72c4519a920e263b40af1a6a40d9942e66608145b3131a71a2
+     
SOURCE_HASH=sha512:80e0d6e9076eb8d6b0d99942586acbb43aaec7bee7f7b13a500470aa11bf03f1c128434d764abd67839355e3fb80d41d0bcf10400b33e57fa0ae4659adb42af9
              URI=https://github.com/tesseract-ocr/tesseract/archive
 DAT=https://github.com/tesseract-ocr/tessdata/raw/$LANGVER
           SOURCE=$SPELL-$VERSION.tar.gz
diff --git a/graphics/tesseract/HISTORY b/graphics/tesseract/HISTORY
index d82e161..77078c4 100644
--- a/graphics/tesseract/HISTORY
+++ b/graphics/tesseract/HISTORY
@@ -1,3 +1,9 @@
+2021-12-02 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 5.0.0
+       * PRE_BUILD: fix
+       * patches/fix-missing-includes.patch: delete
+       * DEPENDS: add libarchive, curl
+
 2021-07-07 Ismael Luceno <ismael AT iodev.co.uk>
        * DETAILS: fixed checksum for traineddata files (fra, ita, spa)
        * PRE_BUILD, patches/fix-missing-includes.patch: fixed build against 
musl
diff --git a/graphics/tesseract/PRE_BUILD b/graphics/tesseract/PRE_BUILD
index d5a08d8..060e68e 100755
--- a/graphics/tesseract/PRE_BUILD
+++ b/graphics/tesseract/PRE_BUILD
@@ -1,16 +1,16 @@
 default_pre_build     &&
 cd $SOURCE_DIRECTORY  &&
-apply_patch_dir patches &&
+#apply_patch_dir patches &&
 mkdir -p tess-trained &&
 cd tess-trained &&
 
 for LL in $TESS_LANG; do
  case $LL in
    eng) verify_file 2 && cp $SOURCE_CACHE/$SOURCE2 . ;;
-   fra) verify_file 3 && cp $SOURCE_CACHE/$SOURCE2 . ;;
-   ita) verify_file 4 && cp $SOURCE_CACHE/$SOURCE2 . ;;
-   nld) verify_file 5 && cp $SOURCE_CACHE/$SOURCE2 . ;;
-   spa) verify_file 6 && cp $SOURCE_CACHE/$SOURCE2 . ;;
-   deu) verify_file 7 && cp $SOURCE_CACHE/$SOURCE2 . ;;
+   fra) verify_file 3 && cp $SOURCE_CACHE/$SOURCE3 . ;;
+   ita) verify_file 4 && cp $SOURCE_CACHE/$SOURCE4 . ;;
+   nld) verify_file 5 && cp $SOURCE_CACHE/$SOURCE5 . ;;
+   spa) verify_file 6 && cp $SOURCE_CACHE/$SOURCE6 . ;;
+   deu) verify_file 7 && cp $SOURCE_CACHE/$SOURCE7 . ;;
  esac
 done
diff --git a/graphics/tesseract/patches/fix-missing-includes.patch 
b/graphics/tesseract/patches/fix-missing-includes.patch
deleted file mode 100644
index daa82b6..0000000
--- a/graphics/tesseract/patches/fix-missing-includes.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Explicitly include sys/time.h for timeval on UNIX. Required on non-glibc
-systems.
-
---- a/src/ccutil/ocrclass.h
-+++ b/src/ccutil/ocrclass.h
-@@ -31,6 +31,8 @@
- #ifdef _WIN32
- #include <winsock2.h> // for timeval
-+#else
-+#include <sys/time.h> // for timeval
- #endif
- 
- /**********************************************************************
-  * EANYCODE_CHAR