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] Add recode, enca. Date: Mon, 09 Mar 2015 14:47:34 +0100 Message-ID: <87twxu8eq1.fsf@taylan.uni.cx> References: <87bnk8e8cq.fsf@taylan.uni.cx> <20150306220358.GB32498@debian> <87oao3qjae.fsf@gnu.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:37587) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YUy24-00010w-Nl for guix-devel@gnu.org; Mon, 09 Mar 2015 09:47:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YUy20-00039J-Ar for guix-devel@gnu.org; Mon, 09 Mar 2015 09:47:44 -0400 In-Reply-To: <87oao3qjae.fsf@gnu.org> ("Ludovic \=\?utf-8\?Q\?Court\=C3\=A8s\=22'\?\= \=\?utf-8\?Q\?s\?\= message of "Sun, 08 Mar 2015 22:19:21 +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: >> You could set LD_LIBRARY_PATH to "." (or the subdirectory where the >> library can be found) before running the tests. > > This should be =E2=80=98LIBRARY_PATH=E2=80=99, not =E2=80=98LD_LIBRARY_PA= TH=E2=80=99, but yes, good > idea. I found out that I can patch the setup.py file to include the necessary library dir in its instructions. Updated patch is below. Tell me if this should go to a 'snippet' (or patch) in the 'source' instead (where it would patch setup.py.in). I'm not sure if the need to specify the ".libs" subdirectory is Guix-specific or not. --=-=-= Content-Type: text/x-diff; charset=utf-8 Content-Disposition: inline; filename=0022-gnu-Add-recode.patch Content-Transfer-Encoding: quoted-printable Content-Description: patch >From 8bd6b2b327820a15292097c9deeabcedfb9346ac Mon Sep 17 00:00:00 2001 From: =3D?UTF-8?q?Taylan=3D20Ulrich=3D20Bay=3DC4=3DB1rl=3DC4=3DB1/Kammer?=3D Date: Wed, 4 Mar 2015 22:34:13 +0100 Subject: [PATCH 22/25] gnu: Add recode. * gnu/packages/textutils.scm: New file. * gnu-system.am (GNU_SYSTEM_MODULES): Add it. --- gnu-system.am | 1 + gnu/packages/textutils.scm | 60 ++++++++++++++++++++++++++++++++++++++++++= ++++ 2 files changed, 61 insertions(+) create mode 100644 gnu/packages/textutils.scm diff --git a/gnu-system.am b/gnu-system.am index 2474c1f..4119f46 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -279,6 +279,7 @@ GNU_SYSTEM_MODULES =3D \ gnu/packages/telephony.scm \ gnu/packages/texinfo.scm \ gnu/packages/texlive.scm \ + gnu/packages/textutils.scm \ gnu/packages/time.scm \ gnu/packages/tmux.scm \ gnu/packages/tor.scm \ diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm new file mode 100644 index 0000000..6bc7ff4 --- /dev/null +++ b/gnu/packages/textutils.scm @@ -0,0 +1,60 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright =C2=A9 2015 Taylan Ulrich Bay=C4=B1rl=C4=B1/Kammer +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu packages textutils) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix packages) + #:use-module (guix download) + #:use-module (guix git-download) + #:use-module (guix build-system gnu) + #:use-module (gnu packages python)) + +(define-public recode + (package + (name "recode") + ;; Last beta release (3.7-beta2) is from 2008; last commit from Feb 20= 14. + ;; So we use that commit instead. + (version "3.7.0.201402") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/pinard/Recode.git") + (commit "2d7092a9999194fc0e9449717a8048c8d8e26c18"))) + (sha256 + (base32 "1wssv8z6g3ryrw33sksz4rjhlnhgvvdqszw1ggl4rcwks34n86zm")))) + (build-system gnu-build-system) + (native-inputs `(("python" ,python-2))) + (arguments + '(#:phases + (alist-cons-before + 'check 'fix-setup-py + (lambda _ + (substitute* "tests/setup.py" + (("([[:space:]]*)include_dirs=3D.*" all space) + (string-append all space "library_dirs=3D['../src/.libs'],\n"= )))) + %standard-phases))) + (home-page "https://github.com/pinard/Recode") + (synopsis "Text encoding converter") + (description "The Recode library converts files between character sets= and +usages. It recognises or produces over 200 different character sets (or a= bout +300 if combined with an iconv library) and transliterates files between al= most +any pair. When exact transliteration are not possible, it gets rid of +offending characters or falls back on approximations. The recode program = is a +handy front-end to the library.") + (license (list license:gpl2+ license:lgpl2.1+)))) --=20 2.2.1 --=-=-=--