From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50544) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dAUWj-00036x-4I for guix-patches@gnu.org; Tue, 16 May 2017 00:56:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dAUWg-0005Fh-2T for guix-patches@gnu.org; Tue, 16 May 2017 00:56:05 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:44613) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dAUWf-0005Fc-UE for guix-patches@gnu.org; Tue, 16 May 2017 00:56:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1dAUWf-0005zG-OF for guix-patches@gnu.org; Tue, 16 May 2017 00:56:01 -0400 Subject: bug#26924: [PATCH 07/10] gnu: calibre: Unbundle chardet. Resent-Message-ID: References: From: Brendan Tildesley Message-ID: <76ce9e20-6a0b-0145-4244-256bb698cfc8@openmailbox.org> Date: Tue, 16 May 2017 14:55:30 +1000 MIME-Version: 1.0 In-Reply-To: Content-Type: multipart/mixed; boundary="------------81244F4CD28C4A938C193E76" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 26924@debbugs.gnu.org This is a multi-part message in MIME format. --------------81244F4CD28C4A938C193E76 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit --------------81244F4CD28C4A938C193E76 Content-Type: text/x-patch; name="0007-gnu-calibre-Unbundle-chardet.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0007-gnu-calibre-Unbundle-chardet.patch" >From 5973fe21292b9331e0bfd00b77f91809aeb2682b Mon Sep 17 00:00:00 2001 From: Brendan Tildesley Date: Sun, 14 May 2017 22:38:07 +1000 Subject: [PATCH 07/10] gnu: calibre: Unbundle chardet. * gnu/packages/ebook.scm (calibre): Unbundle python2-chardet. [snippet]: Delete bundled chardet from source. [inputs]: Add python2-chardet. --- gnu/packages/ebook.scm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm index 3b241c670..b5ce71ffb 100644 --- a/gnu/packages/ebook.scm +++ b/gnu/packages/ebook.scm @@ -31,6 +31,7 @@ #:use-module (gnu packages fonts) #:use-module (gnu packages fontutils) #:use-module (gnu packages freedesktop) + #:use-module (gnu packages gnome) #:use-module (gnu packages glib) #:use-module (gnu packages icu4c) #:use-module (gnu packages image) @@ -81,6 +82,7 @@ (delete-file-recursively "src/calibre/ebooks/markdown") (delete-file-recursively "src/unrar") (delete-file-recursively "resources/fonts/liberation") + (delete-file-recursively "src/chardet") (substitute* (find-files "." "\\.py") (("calibre\\.ebooks\\.markdown") "markdown")) #t)) @@ -119,6 +121,7 @@ ("podofo" ,podofo) ("python" ,python-2) ("python2-apsw" ,python2-apsw) + ("python2-chardet" ,python2-chardet) ("python2-cssselect" ,python2-cssselect) ("python2-cssutils" ,python2-cssutils) ("python2-dateutil" ,python2-dateutil) -- 2.13.0 --------------81244F4CD28C4A938C193E76--