[PR PATCH] leptonica: update to 1.83.1, adopt.

[Eloitor <Eloitor@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 584 bytes --]

There is a new pull request by Eloitor against master on the void-packages repository

https://github.com/Eloitor/void-packages leptonica
https://github.com/void-linux/void-packages/pull/42322

leptonica: update to 1.83.1, adopt.
#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-musl)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - i686


A patch file from https://github.com/void-linux/void-packages/pull/42322.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-leptonica-42322.patch --]
[-- Type: text/x-diff, Size: 5661 bytes --]

From 711749766f34cc1b85c979573761578128c72538 Mon Sep 17 00:00:00 2001
From: Eloi Torrents <eloitor@disroot.org>
Date: Thu, 16 Feb 2023 18:37:44 +0100
Subject: [PATCH] leptonica: update to 1.83.1.

---
 .../patches/fix-flaky-test-on-i686.patch      | 70 -------------------
 srcpkgs/leptonica/template                    | 24 +++++--
 2 files changed, 18 insertions(+), 76 deletions(-)
 delete mode 100644 srcpkgs/leptonica/patches/fix-flaky-test-on-i686.patch

diff --git a/srcpkgs/leptonica/patches/fix-flaky-test-on-i686.patch b/srcpkgs/leptonica/patches/fix-flaky-test-on-i686.patch
deleted file mode 100644
index bec1a2482f41..000000000000
--- a/srcpkgs/leptonica/patches/fix-flaky-test-on-i686.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From ea2bb8c9cf61d3eba2589cfaac05f59a33b4110d Mon Sep 17 00:00:00 2001
-From: danblooomberg <dan.bloomberg@gmail.com>
-Date: Sun, 14 Nov 2021 14:52:24 -0800
-Subject: [PATCH] Fix flaky hash_reg test on i686 * The sets that are generated
- from *SelectRange() functions can depend on   the platform, resulting in
- intersection sizes that differ by 1. * So, loosen the comparison to allow a
- difference of 1.
-
----
- prog/hash_reg.c | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/prog/hash_reg.c b/prog/hash_reg.c
-index 8b408d6d..3414ba90 100644
---- a/prog/hash_reg.c
-+++ b/prog/hash_reg.c
-@@ -100,7 +100,7 @@ L_REGPARAMS  *rp;
-     sarrayIntersectionByAset(sa1, sa2, &sa3);
-     c1 = sarrayGetCount(sa3);
-     sarrayDestroy(&sa3);
--    regTestCompareValues(rp, string_intersection, c1, 0);  /* 2 */
-+    regTestCompareValues(rp, string_intersection, c1, 1);  /* 2 */
-     if (rp->display) lept_stderr("  aset: intersection size = %d\n", c1);
-     sarrayUnionByAset(sa1, sa2, &sa3);
-     c1 = sarrayGetCount(sa3);
-@@ -123,7 +123,7 @@ L_REGPARAMS  *rp;
-     sarrayIntersectionByHmap(sa1, sa2, &sa3);
-     c1 = sarrayGetCount(sa3);
-     sarrayDestroy(&sa3);
--    regTestCompareValues(rp, string_intersection, c1, 0);  /* 6 */
-+    regTestCompareValues(rp, string_intersection, c1, 1);  /* 6 */
-     if (rp->display) lept_stderr("  hmap: intersection size = %d\n", c1);
-     sarrayUnionByHmap(sa1, sa2, &sa3);
-     c1 = sarrayGetCount(sa3);
-@@ -160,7 +160,7 @@ L_REGPARAMS  *rp;
-     ptaIntersectionByAset(pta1, pta2, &pta3);
-     c1 = ptaGetCount(pta3);
-     ptaDestroy(&pta3);
--    regTestCompareValues(rp, pta_intersection, c1, 0);  /* 10 */
-+    regTestCompareValues(rp, pta_intersection, c1, 1);  /* 10 */
-     if (rp->display) lept_stderr("  aset: intersection size = %d\n", c1);
-     ptaUnionByAset(pta1, pta2, &pta3);
-     c1 = ptaGetCount(pta3);
-@@ -182,7 +182,7 @@ L_REGPARAMS  *rp;
-     ptaIntersectionByHmap(pta1, pta2, &pta3);
-     c1 = ptaGetCount(pta3);
-     ptaDestroy(&pta3);
--    regTestCompareValues(rp, pta_intersection, c1, 0);  /* 14 */
-+    regTestCompareValues(rp, pta_intersection, c1, 1);  /* 14 */
-     if (rp->display) lept_stderr("  hmap: intersection size = %d\n", c1);
-     ptaUnionByHmap(pta1, pta2, &pta3);
-     c1 = ptaGetCount(pta3);
-@@ -220,7 +220,7 @@ L_REGPARAMS  *rp;
-     l_dnaIntersectionByAset(da1, da2, &da3);
-     c1 = l_dnaGetCount(da3);
-     l_dnaDestroy(&da3);
--    regTestCompareValues(rp, da_intersection, c1, 0);  /* 18 */
-+    regTestCompareValues(rp, da_intersection, c1, 1);  /* 18 */
-     if (rp->display) lept_stderr("  aset: intersection size = %d\n", c1);
-     l_dnaUnionByAset(da1, da2, &da3);
-     c1 = l_dnaGetCount(da3);
-@@ -242,7 +242,7 @@ L_REGPARAMS  *rp;
-     l_dnaIntersectionByHmap(da1, da2, &da3);
-     c1 = l_dnaGetCount(da3);
-     l_dnaDestroy(&da3);
--    regTestCompareValues(rp, da_intersection, c1, 0);  /* 22 */
-+    regTestCompareValues(rp, da_intersection, c1, 1);  /* 22 */
-     if (rp->display) lept_stderr("  hmap: intersection size = %d\n", c1);
-     l_dnaUnionByHmap(da1, da2, &da3);
-     c1 = l_dnaGetCount(da3);
diff --git a/srcpkgs/leptonica/template b/srcpkgs/leptonica/template
index 53e939a255ff..f143504de677 100644
--- a/srcpkgs/leptonica/template
+++ b/srcpkgs/leptonica/template
@@ -1,18 +1,18 @@
 # Template file for 'leptonica'
 pkgname=leptonica
-version=1.82.0
+version=1.83.1
 revision=1
-build_style=gnu-configure
+build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="libopenjpeg2-devel libwebp-devel"
 checkdepends="which gnuplot"
 short_desc="Image processing and analysis library"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Eloi Torrents <eloitor@disroot.org>"
 license="BSD-2-Clause"
 homepage="http://leptonica.org/"
 changelog="http://leptonica.org/source/version-notes.html"
-distfiles="http://leptonica.org/source/${pkgname}-${version}.tar.gz"
-checksum=155302ee914668c27b6fe3ca9ff2da63b245f6d62f3061c8f27563774b8ae2d6
+distfiles="https://github.com/DanBloomberg/leptonica/archive/refs/tags/${version}.tar.gz"
+checksum=4289d0a4224b614010072253531c0455a33a4d7c7a0017fe7825ed382290c0da
 
 post_install() {
 	vdoc moller52.jpg
@@ -27,7 +27,6 @@ leptonica-devel_package() {
 		vmove usr/include/leptonica
 		vmove usr/lib/cmake
 		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.so"
 		vdoc style-guide.txt
 	}
 }
@@ -39,5 +38,18 @@ leptonica-examples_package() {
 		rm -f -r prog/*.{l,}o prog/.deps prog/.libs
 		# binaries, example source, images and data
 		vcopy prog usr/share/leptonica
+		vbin prog/ps2png
+		vbin prog/pdf2mtiff
+		vbin prog/ps2jpeg
+		vbin prog/ps2png-color
+		vbin prog/ps2png-binary
+		vbin prog/pdf2tiff
+		vbin prog/pdf2jpeg
+		vbin prog/pdf2png-gray
+		vbin prog/pdf2png
+		vbin prog/ps2tiff
+		vbin prog/pdf2png-color
+		vbin prog/ps2png-gray
+		vbin prog/pdf2png-binary
 	}
 }