Re: [PR PATCH] [Updated] leptonica: update to 1.82.0.

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

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

There is an updated pull request by natrys against master on the void-packages repository

https://github.com/natrys/void-packages leptonica-1.82.0
https://github.com/void-linux/void-packages/pull/34096

leptonica: update to 1.82.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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

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

From 18d44466c71a20b2af5175ef6047a6a3576c0b85 Mon Sep 17 00:00:00 2001
From: Imran Khan <imrankhan@teknik.io>
Date: Sat, 13 Nov 2021 23:08:25 +0600
Subject: [PATCH] leptonica: update to 1.82.0.

---
 .../patches/fix-flaky-test-on-i686.patch      | 70 +++++++++++++++++++
 srcpkgs/leptonica/template                    |  6 +-
 2 files changed, 74 insertions(+), 2 deletions(-)
 create 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
new file mode 100644
index 000000000000..bec1a2482f41
--- /dev/null
+++ b/srcpkgs/leptonica/patches/fix-flaky-test-on-i686.patch
@@ -0,0 +1,70 @@
+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 cc24df74e47d..53e939a255ff 100644
--- a/srcpkgs/leptonica/template
+++ b/srcpkgs/leptonica/template
@@ -1,16 +1,18 @@
 # Template file for 'leptonica'
 pkgname=leptonica
-version=1.80.0
+version=1.82.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libopenjpeg2-devel libwebp-devel"
+checkdepends="which gnuplot"
 short_desc="Image processing and analysis library"
 maintainer="Orphaned <orphan@voidlinux.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=ec9c46c2aefbb960fb6a6b7f800fe39de48343437b6ce08e30a8d9688ed14ba4
+checksum=155302ee914668c27b6fe3ca9ff2da63b245f6d62f3061c8f27563774b8ae2d6
 
 post_install() {
 	vdoc moller52.jpg