From mboxrd@z Thu Jan 1 00:00:00 1970 From: taylanbayirli@gmail.com ("Taylan Ulrich =?utf-8?Q?Bay=C4=B1rl=C4=B1?= =?utf-8?Q?=2FKammer=22?=) Subject: [PATCH] gnu: leptonica: Update to 1.73. Date: Fri, 23 Dec 2016 22:10:09 +0100 Message-ID: <87d1giwdvy.fsf@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:40405) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cKX6U-0007wP-8i for guix-devel@gnu.org; Fri, 23 Dec 2016 16:10:16 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cKX6S-0001b4-M2 for guix-devel@gnu.org; Fri, 23 Dec 2016 16:10:14 -0500 Received: from mail-wm0-x233.google.com ([2a00:1450:400c:c09::233]:37881) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cKX6S-0001b0-Fa for guix-devel@gnu.org; Fri, 23 Dec 2016 16:10:12 -0500 Received: by mail-wm0-x233.google.com with SMTP id t79so221893053wmt.0 for ; Fri, 23 Dec 2016 13:10:12 -0800 (PST) Received: from T420 ([2a02:908:c30:3540:221:ccff:fe66:68f0]) by smtp.gmail.com with ESMTPSA id f126sm38693343wme.22.2016.12.23.13.10.10 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 23 Dec 2016 13:10:10 -0800 (PST) List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: guix-devel@gnu.org 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?= 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 ============================================================