Re: [PATCHES] Add recode, enca.

[Taylan Ulrich Bayırlı/Kammer]

address@hidden (Ludovic Courtès) writes:

>> You could set LD_LIBRARY_PATH to "." (or the subdirectory where the
>> library can be found) before running the tests.
>
> This should be ‘LIBRARY_PATH’, not ‘LD_LIBRARY_PATH’, 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.

>From 8bd6b2b327820a15292097c9deeabcedfb9346ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Taylan=20Ulrich=20Bay=C4=B1rl=C4=B1/Kammer?=
 <address@hidden>
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 =                                \
   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 © 2015 Taylan Ulrich Bayırlı/Kammer <address@hidden>
+;;;
+;;; 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 <http://www.gnu.org/licenses/>.
+
+(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 2014.
+    ;; 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=.*" all space)
+             (string-append all space "library_dirs=['../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 about
+300 if combined with an iconv library) and transliterates files between almost
+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+))))
-- 
2.2.1