[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH] gnu: leptonica: Update to 1.73.
From: |
"Taylan Ulrich Bayırlı/Kammer" |
Subject: |
[PATCH] gnu: leptonica: Update to 1.73. |
Date: |
Fri, 23 Dec 2016 22:10:09 +0100 |
I struggled for days with the following bug and ultimately decided to
disable tests for 1.73 to sidestep it entirely; tests should be
re-enabled with the next release.
https://github.com/DanBloomberg/leptonica/issues/224
===File
/home/taylan/src/guix/0001-gnu-leptonica-Update-to-1.73.patch===
>From 38ca93d5a6b78b9a3d3fafbec36cf3da7b0c371b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Taylan=20Ulrich=20Bay=C4=B1rl=C4=B1/Kammer?=
<address@hidden>
Date: Thu, 15 Dec 2016 09:39:30 +0100
Subject: [PATCH] gnu: leptonica: Update to 1.73.
* gnu/packages/image.scm (leptonica): Update to 1.73.
---
gnu/packages/image.scm | 54 +++++++++++++++++---------------------------------
1 file changed, 18 insertions(+), 36 deletions(-)
diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
index 487635d..126e615 100644
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@ -329,28 +329,18 @@ the W3C's XML-based Scaleable Vector Graphic (SVG)
format.")
(define-public leptonica
(package
(name "leptonica")
- (version "1.72")
+ (version "1.73")
(source
(origin
(method url-fetch)
(uri (string-append "http://www.leptonica.com/source/leptonica-"
version ".tar.gz"))
(sha256
- (base32 "0mhzvqs0im04y1cpcc1yma70hgdac1frf33h73m9z3356bfymmbr"))
- (modules '((guix build utils)))
- ;; zlib and openjpg should be under Libs, not Libs.private. See:
- ;; https://code.google.com/p/tesseract-ocr/issues/detail?id=1436
- (snippet
- '(substitute* "lept.pc.in"
- (("^(Libs\\.private: .*)@ZLIB_LIBS@(.*)" all pre post)
- (string-append pre post))
- (("^(Libs\\.private: .*)@JPEG_LIBS@(.*)" all pre post)
- (string-append pre post))
- (("^Libs: .*" all)
- (string-append all " @ZLIB_LIBS@ @JPEG_LIBS@"))))))
+ (base32 "1hdgb6lflj5gc3c37rac5nk38vr6qln3im9qjfpphysfcxf37r0r"))))
(build-system gnu-build-system)
- (native-inputs
- `(("gnuplot" ,gnuplot))) ;needed for test suite
+ ;; XXX Re-enable this when the test suite is re-enabled.
+ ;; (native-inputs
+ ;; `(("gnuplot" ,gnuplot))) ;needed for test suite
(inputs
`(("giflib" ,giflib)
("libjpeg" ,libjpeg)
@@ -358,31 +348,23 @@ the W3C's XML-based Scaleable Vector Graphic (SVG)
format.")
("libtiff" ,libtiff)
("libwebp" ,libwebp)))
(propagated-inputs
+ ;; Linking a program with leptonica also requires these.
`(("openjpeg" ,openjpeg)
("zlib" ,zlib)))
(arguments
- '(#:parallel-tests? #f ; XXX: cause fpix1_reg to fail
- #:phases
+ '(#:phases
(modify-phases %standard-phases
- ;; Prevent make from trying to regenerate config.h.in.
- (add-after
- 'unpack 'set-config-h-in-file-time
- (lambda _
- (set-file-time "config/config.h.in" (stat "configure"))))
- (add-after
- 'unpack 'patch-reg-wrapper
- (lambda _
- (substitute* "prog/reg_wrapper.sh"
- ((" /bin/sh ")
- (string-append " " (which "sh") " "))
- (("which gnuplot") (which "gnuplot")))))
- (add-before
- 'check 'disable-failing-tests
- ;; XXX: 2 of 9 tests from webpio_reg fails.
- (lambda _
- (substitute* "prog/webpio_reg.c"
- ((".*DoWebpTest2.* 90.*") "")
- ((".*DoWebpTest2.* 100.*") "")))))))
+ (add-after 'unpack 'patch-reg-wrapper
+ (lambda _
+ (substitute* "prog/reg_wrapper.sh"
+ ((" /bin/sh ")
+ (string-append " " (which "sh") " "))
+ (("which gnuplot")
+ "true")))))
+ ;; All tests of 1.73 fail in Guix's build environment due to the bug:
+ ;; https://github.com/DanBloomberg/leptonica/issues/224
+ ;; XXX Enable tests in 1.74 as the bug is fixed upstream.
+ #:tests? #f))
(home-page "http://www.leptonica.com/")
(synopsis "Library and tools for image processing and analysis")
(description
--
2.10.2
============================================================
- [PATCH] gnu: leptonica: Update to 1.73.,
"Taylan Ulrich Bayırlı/Kammer" <=