From mboxrd@z Thu Jan 1 00:00:00 1970 From: Marius Bakke Subject: Re: [PATCH] gnu: leptonica: Update to 1.73. Date: Sat, 24 Dec 2016 15:17:39 +0100 Message-ID: <87lgv5o1h8.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me> References: <87d1giwdvy.fsf@gmail.com> Mime-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:35651) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cKn8t-0003Dj-47 for guix-devel@gnu.org; Sat, 24 Dec 2016 09:17:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cKn8o-00068B-G5 for guix-devel@gnu.org; Sat, 24 Dec 2016 09:17:46 -0500 Received: from out3-smtp.messagingengine.com ([66.111.4.27]:44141) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cKn8o-00067s-7z for guix-devel@gnu.org; Sat, 24 Dec 2016 09:17:42 -0500 In-Reply-To: <87d1giwdvy.fsf@gmail.com> 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: =?utf-8?Q?Taylan_Ulrich_Bay=C4=B1rl=C4=B1=2FKammer=5C=22?= , guix-devel@gnu.org --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable "Taylan Ulrich Bay=C4=B1rl=C4=B1/Kammer\"" writes: > 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 OK! I'm not familiar with this software, are you sure the substitutions are no longer required? The pkg-config file is fine as there is no matching substitution in the current version, but I did not investigate the config.h timestamp trick, or the failing tests. If they are required for tests to pass on current git, I think they should be kept so the next person don't have to reinvent them. I would also keep gnuplot as a native-input, but that can be fixed up before committing if you confirm that the other phases are no longer needed. Thank you! > > =3D=3D=3DFile > /home/taylan/src/guix/0001-gnu-leptonica-Update-to-1.73.patch=3D=3D=3D > From 38ca93d5a6b78b9a3d3fafbec36cf3da7b0c371b Mon Sep 17 00:00:00 2001 > From: =3D?UTF-8?q?Taylan=3D20Ulrich=3D20Bay=3DC4=3DB1rl=3DC4=3DB1/Kammer?= =3D > > 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=3D1436 > - (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 > --=20 > 2.10.2 > > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAlheg4MACgkQoqBt8qM6 VPqLTAgAnKMKq7L22yzNEpy4/ISIAPGUnMLIVgMUM88jYh3chyPvmkIstTvNAZOH flDTyX3O90TRjUqPOLQWOP8umbaVKtoF/OGuPbxCc5KpUcaMqLkS2wLKOTqCKUch ybTFsqNlvT91pC5tEKLxhW8l8jLjIGh40T11PpHobUTtXmKfbP9o3fI8ySSJysJq Spyg0DcNY+QhdIjVnGtsu73S+LYQApN+0OWqRKwxYFoQ9vLzY0uPIAX2F51E3FMK ZPxLUOpHMCIroMXbiNCKJmQDIc3IZwz4HDDt3VJIpSYhNvd7bn1lt16usW9lEH6G 0f3g7BBfNIF8aGp0XzJ633kFTpQlBw== =uoN4 -----END PGP SIGNATURE----- --=-=-=--