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?=) Subject: Re: [PATCHES] Various Date: Thu, 26 Mar 2015 22:04:07 +0100 Message-ID: <87r3sbh3nc.fsf@taylan.uni.cx> References: <87sicx2qqz.fsf@taylan.uni.cx> <87384t2v40.fsf@taylan.uni.cx> <87k2y5t465.fsf@gnu.org> <87lhik27kt.fsf@taylan.uni.cx> <87twx8iz8i.fsf@gnu.org> <878uek22o5.fsf@taylan.uni.cx> <87r3scdjcz.fsf@gnu.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:35518) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YbEwo-0006Yb-78 for guix-devel@gnu.org; Thu, 26 Mar 2015 17:04:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YbEwl-0006gs-Pe for guix-devel@gnu.org; Thu, 26 Mar 2015 17:04:14 -0400 In-Reply-To: <87r3scdjcz.fsf@gnu.org> ("Ludovic \=\?utf-8\?Q\?Court\=C3\=A8s\=22'\?\= \=\?utf-8\?Q\?s\?\= message of "Thu, 26 Mar 2015 13:38:20 +0100") 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-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: Ludovic =?utf-8?Q?Court=C3=A8s?= Cc: guix-devel@gnu.org --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable ludo@gnu.org (Ludovic Court=C3=A8s) writes: >>> However, this package recipe explicitly adds Autoconf, Automake, and >>> Libtool as inputs, plus it runs =E2=80=98autoreconf=E2=80=99. So I sus= pect this is >>> because upstream=E2=80=99s tarball isn=E2=80=99t self-contained, right? >>> >>> Ludo=E2=80=99. >> >> Oh, I did that because otherwise I get the following at start of the >> build phase: >> >> (CDPATH=3D"${ZSH_VERSION+.}:" && cd . && /gnu/store/nq6idcqwqc9x6z7g9jxq= 11a58jqx6w8x-bash-4.3.33/bin/bash /tmp/nix-build-leptonica-1.71.drv-1/lepto= nica-1.71/config/missing --run autoheader) >> aclocal.m4:17: warning: this file was generated for autoconf 2.68. > > This may be because a .ac, .am, or .m4 file is newer than =E2=80=98config= ure=E2=80=99, > for instance. Does any of these get patched, which would explain the > newer mtime? Can it be worked around by changing that file=E2=80=99s mti= me > using =E2=80=98set-file-time=E2=80=99 or similar? I get the warning even if I just run "./configure && make", outside of Guix. The reason seems to be config/config.h.in being old; touching it suppresses the warning, and the build still succeeds. Is it fine this way? Updated patch: --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0004-gnu-Add-leptonica.patch >From 5d6d90da79d5eac8568d3c868979866965912154 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Taylan=20Ulrich=20Bay=C4=B1rl=C4=B1/Kammer?= Date: Sat, 21 Mar 2015 19:41:54 +0100 Subject: [PATCH 4/8] gnu: Add leptonica. * gnu/packages/image.scm (leptonica): New variable. --- gnu/packages/image.scm | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 9c7e504..15f4339 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -24,6 +24,7 @@ (define-module (gnu packages image) #:use-module (gnu packages) #:use-module (gnu packages algebra) + #:use-module (gnu packages autotools) #:use-module (gnu packages boost) #:use-module (gnu packages compression) #:use-module (gnu packages doxygen) @@ -164,6 +165,65 @@ the W3C's XML-based Scaleable Vector Graphic (SVG) format.") ;; 'COPYING' is the GPLv2, but file headers say LGPLv2.0+. (license license:lgpl2.0+))) +(define-public leptonica + (package + (name "leptonica") + (version "1.71") + (source + (origin + (method url-fetch) + (uri (string-append "http://www.leptonica.com/source/leptonica-" + version ".tar.gz")) + (sha256 + (base32 "0j5qgrff6im5n9waflbi7w643q1p6mahyf2z35gb4vj9h5p76pfc")) + (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@")))))) + (build-system gnu-build-system) + (native-inputs + `(("gnuplot" ,gnuplot))) ;needed for test suite + (inputs + `(("giflib" ,giflib) + ("libjpeg" ,libjpeg) + ("libpng" ,libpng) + ("libtiff" ,libtiff) + ("libwebp" ,libwebp))) + (propagated-inputs + `(("openjpeg" ,openjpeg) + ("zlib" ,zlib))) + (arguments + '(#:phases + (modify-phases %standard-phases + ;; Prevent make from trying to regenerate config.h.in. + (add-after + unpack touch-config-h-in + (lambda _ + (zero? (system* "touch" "config/config.h.in")))) + (add-after + unpack patch-reg-wrapper + (lambda _ + (substitute* "prog/reg_wrapper.sh" + ((" /bin/sh ") + (string-append " " (which "sh") " ")))))))) + (home-page "http://www.leptonica.com/") + (synopsis "Library and tools for image processing and analysis") + (description + "Leptonica is a C library and set of command-line tools for efficient +image processing and image analysis operations. It supports rasterop, affine +transformations, binary and grayscale morphology, rank order, and convolution, +seedfill and connected components, image transformations combining changes in +scale and pixel depth, and pixelwise masking, blending, enhancement, and +arithmetic ops.") + (license license:bsd-2))) + (define-public jbig2dec (package (name "jbig2dec") -- 2.2.1 --=-=-=--