From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59246) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d9v9r-0003Gh-Ll for guix-patches@gnu.org; Sun, 14 May 2017 11:10:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d9v9m-0004jQ-SU for guix-patches@gnu.org; Sun, 14 May 2017 11:10:07 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:42251) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1d9v9m-0004j6-Om for guix-patches@gnu.org; Sun, 14 May 2017 11:10:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1d9v9m-0001KE-Gg for guix-patches@gnu.org; Sun, 14 May 2017 11:10:02 -0400 Subject: bug#26924: [PATCH 08/12] gnu: calibre: Unbundle chardet References: In-Reply-To: Resent-Message-ID: From: Brendan Tildesley Message-ID: Date: Mon, 15 May 2017 01:09:04 +1000 MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="------------33558980BCDBF0A6124B5DEC" 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. --------------33558980BCDBF0A6124B5DEC Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit --------------33558980BCDBF0A6124B5DEC Content-Type: text/x-patch; name="0008-gnu-calibre-Unbundle-chardet.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0008-gnu-calibre-Unbundle-chardet.patch" >From e6e476e6a2aff0aa17b1828837cb2ce69714a2fc Mon Sep 17 00:00:00 2001 From: Brendan Tildesley Date: Sun, 14 May 2017 22:38:07 +1000 Subject: [PATCH 08/12] gnu: calibre: Unbundle chardet * gnu/packages/ebook.scm (calibre): Unbundle 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 97e245291..f38dba662 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")))) (patches (search-patches "calibre-drop-unrar.patch" @@ -118,6 +120,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.12.2 --------------33558980BCDBF0A6124B5DEC--