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: [PATCHES] Add recode, enca. Date: Wed, 04 Mar 2015 22:55:01 +0100 Message-ID: <87bnk8e8cq.fsf@taylan.uni.cx> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:39458) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YTHFy-0001GY-Bx for guix-devel@gnu.org; Wed, 04 Mar 2015 16:55:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YTHFw-0007cp-Qy for guix-devel@gnu.org; Wed, 04 Mar 2015 16:55:06 -0500 Received: from mail-wi0-x229.google.com ([2a00:1450:400c:c05::229]:44601) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YTHFw-0007ad-Gu for guix-devel@gnu.org; Wed, 04 Mar 2015 16:55:04 -0500 Received: by wivr20 with SMTP id r20so2418021wiv.3 for ; Wed, 04 Mar 2015 13:55:03 -0800 (PST) Received: from taylan.uni.cx (p200300514A4431520213E8FFFEED36FB.dip0.t-ipconnect.de. [2003:51:4a44:3152:213:e8ff:feed:36fb]) by mx.google.com with ESMTPSA id dn7sm11808928wid.12.2015.03.04.13.55.02 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 04 Mar 2015 13:55:03 -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-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: guix-devel@gnu.org --=-=-= Content-Type: text/plain Is it fine to put these in a new file called encoding.scm? In the first one, I couldn't figure out how to make the test suite run, which uses a setup.py file to compile a small program, which fails with "ld: cannot find -lrecode" (where recode is the library being tested). Any help welcome. --=-=-= Content-Type: text/x-diff; charset=utf-8 Content-Disposition: inline; filename=0001-gnu-Add-recode.patch Content-Transfer-Encoding: quoted-printable Content-Description: patch1 >From 7f56201d97209986a9813fdd5040feee8bfe2b56 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 1/5] gnu: Add recode. * gnu/packages/encoding.scm: New file. * gnu-system.am (GNU_SYSTEM_MODULES): Add it. --- gnu-system.am | 1 + gnu/packages/encoding.scm | 55 +++++++++++++++++++++++++++++++++++++++++++= ++++ 2 files changed, 56 insertions(+) create mode 100644 gnu/packages/encoding.scm diff --git a/gnu-system.am b/gnu-system.am index e78d6a5..46a3a42 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -90,6 +90,7 @@ GNU_SYSTEM_MODULES =3D \ gnu/packages/elf.scm \ gnu/packages/emacs.scm \ gnu/packages/enchant.scm \ + gnu/packages/encoding.scm \ gnu/packages/enlightenment.scm \ gnu/packages/feh.scm \ gnu/packages/file.scm \ diff --git a/gnu/packages/encoding.scm b/gnu/packages/encoding.scm new file mode 100644 index 0000000..9913e96 --- /dev/null +++ b/gnu/packages/encoding.scm @@ -0,0 +1,55 @@ +;;; 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 encoding) + #: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 "http://github.com/pinard/Recode.git") + (commit "2d7092a9999194fc0e9449717a8048c8d8e26c18"))) + (sha256 + (base32 "1wssv8z6g3ryrw33sksz4rjhlnhgvvdqszw1ggl4rcwks34n86zm")))) + (build-system gnu-build-system) + (native-inputs `(("python" ,python-2))) + (arguments + ;; Test-suite uses a setup.py file to compile a file, which then + ;; complains "ld: cannot find -lrecode". + '(#:tests? #f)) + (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 --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0002-gnu-Add-enca.patch Content-Description: patch2 >From 440acf1194e3105bd386b28eff92a9aeed25ace1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Taylan=20Ulrich=20Bay=C4=B1rl=C4=B1/Kammer?= Date: Wed, 4 Mar 2015 22:35:15 +0100 Subject: [PATCH 2/5] gnu: Add enca. * gnu/packages/encoding.scm (enca): New variable. --- gnu/packages/encoding.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/encoding.scm b/gnu/packages/encoding.scm index 9913e96..6b9ccb0 100644 --- a/gnu/packages/encoding.scm +++ b/gnu/packages/encoding.scm @@ -53,3 +53,23 @@ 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+)))) + +(define-public enca + (package + (name "enca") + (version "1.16") + (source + (origin + (method url-fetch) + (uri (string-append + "https://github.com/nijel/enca/archive/" version ".tar.gz")) + (sha256 + (base32 "1xik00x0yvhswsw2isnclabhv536xk1s42cf5z54gfbpbhc7ni8l")))) + (build-system gnu-build-system) + (inputs `(("recode" ,recode))) + (home-page "https://github.com/nijel/enca") + (synopsis "Text encoding detection tool") + (description "Enca (Extremely Naive Charset Analyser) consists of libenca, +an encoding detection library, and enca, a command line frontend, integrating +libenca and several charset conversion libraries and tools.") + (license license:gpl2))) -- 2.2.1 --=-=-=--