From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:55652) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hKJnf-0007KN-Js for guix-patches@gnu.org; Sat, 27 Apr 2019 05:39:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hKJne-0005bd-B0 for guix-patches@gnu.org; Sat, 27 Apr 2019 05:39:15 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49144) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hKJnb-0005W3-2M for guix-patches@gnu.org; Sat, 27 Apr 2019 05:39:12 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hKJna-0001Bg-VD for guix-patches@gnu.org; Sat, 27 Apr 2019 05:39:10 -0400 Subject: [bug#35446] [PATCH 24/26] gnu: calibre: Unbundle python2-odfpy Resent-Message-ID: From: Brendan Tildesley Date: Sat, 27 Apr 2019 19:36:57 +1000 Message-Id: <20190427093659.21851-24-mail@brendan.scot> In-Reply-To: <20190427093659.21851-1-mail@brendan.scot> References: <20190427093659.21851-1-mail@brendan.scot> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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: 35446@debbugs.gnu.org * gnu/packages/ebook.scm (calibre): [snippets]: Remove all of src/odf instead of just the thumbnail with the uncertain license (that was probably free anyway). [inputs]: Add python2-odfpy. --- gnu/packages/ebook.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm index 993a425873..29b8589cb8 100644 --- a/gnu/packages/ebook.scm +++ b/gnu/packages/ebook.scm @@ -89,13 +89,13 @@ (sha256 (base32 "167hhv4wimkjnyfgqkyqmaiixhicbxacy6190gps98jyj4csi8ra")) - ;; Remove non-free or doubtful code, see + ;; Unbundle python2-pdf. ;; https://lists.gnu.org/archive/html/guix-devel/2015-02/msg00478.html (modules '((guix build utils))) (snippet '(begin - (delete-file "src/odf/thumbnail.py") - #t)) + (delete-file-recursively "src/odf") + #t)) (patches (search-patches "calibre-no-updates-dialog.patch" "calibre-remove-test-bs4.patch" ;; TODO: fix test. "calibre-remove-test-sqlite.patch" ;; TODO: fix test. @@ -141,6 +141,7 @@ ;; python2-msgpack is needed for the network content server to work. ("python2-msgpack" ,python2-msgpack) ("python2-netifaces" ,python2-netifaces) + ("python2-odfpy" ,python2-odfpy) ("python2-pillow" ,python2-pillow) ("python2-psutil" ,python2-psutil) ("python2-pygments" ,python2-pygments) -- 2.21.0