Skip to content

Commit

Permalink
leptonica: update to 1.82.0.
Browse files Browse the repository at this point in the history
  • Loading branch information
natrys committed Nov 20, 2021
1 parent 176a178 commit b9b1121
Show file tree
Hide file tree
Showing 2 changed files with 74 additions and 2 deletions.
70 changes: 70 additions & 0 deletions 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);
6 changes: 4 additions & 2 deletions 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
Expand Down

0 comments on commit b9b1121

Please sign in to comment.