From patchwork Sat Apr 27 09:36:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brendan Tildesley X-Patchwork-Id: 13794 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id BA4EE16F51; Sat, 27 Apr 2019 14:14:26 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_DKIM_INVALID, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 6C9F116F4F for ; Sat, 27 Apr 2019 14:14:26 +0100 (BST) Received: from localhost ([127.0.0.1]:60266 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hKN9t-0001OD-UM for patchwork@mira.cbaines.net; Sat, 27 Apr 2019 09:14:25 -0400 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 X-Loop: help-debbugs@gnu.org Subject: [bug#35446] [PATCH 24/26] gnu: calibre: Unbundle python2-odfpy Resent-From: Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 27 Apr 2019 09:39:10 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 35446 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 35446@debbugs.gnu.org Received: via spool by 35446-submit@debbugs.gnu.org id=B35446.15563579124404 (code B ref 35446); Sat, 27 Apr 2019 09:39:10 +0000 Received: (at 35446) by debbugs.gnu.org; 27 Apr 2019 09:38:32 +0000 Received: from localhost ([127.0.0.1]:34434 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hKJmy-00018r-HI for submit@debbugs.gnu.org; Sat, 27 Apr 2019 05:38:32 -0400 Received: from mx1.mailbox.org ([80.241.60.212]:39172) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hKJme-00016D-JD for 35446@debbugs.gnu.org; Sat, 27 Apr 2019 05:38:13 -0400 Received: from smtp1.mailbox.org (smtp1.mailbox.org [IPv6:2001:67c:2050:105:465:1:1:0]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by mx1.mailbox.org (Postfix) with ESMTPS id 3215C4C6A2 for <35446@debbugs.gnu.org>; Sat, 27 Apr 2019 11:38:07 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brendan.scot; s=MBO0001; t=1556357887; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=vSnb4/4svad57B512IzM9a96qYqepbq7LWEUXRhKhUs=; b=CuawA2VfKq9BThsK2D7qrxyVvoQjSaZD70tOPwaTlZ0eMFgDHZI5QH+01Jb6VaCDVbtJvF h71S5SeSJXVy49v2G6cujbikudmXm81v8lmaF68wTPCkSz3lyT2EdEuSOZihzilv+KGcGl Ri7SpXwR6066UCILofZrxTsUl+3nWPJMvLmdwxQa5iUrEfetY54dJ+z303kE5yORhheqxP Kgn9tCf7OqHdirFan7NhaJENdJQok21ojWsAmlIGV3zmuhlBI567U5LixivYwu/ESh+iYJ seGT8N1Ro1dpaNLghXBMa/P5Ya5sHmp1Q7ieUHbdEArVEo76I5E32MdQM2s47g== Received: from smtp1.mailbox.org ([80.241.60.240]) by spamfilter06.heinlein-hosting.de (spamfilter06.heinlein-hosting.de [80.241.56.125]) (amavisd-new, port 10030) with ESMTP id VIpZ-g3WfWAT for <35446@debbugs.gnu.org>; Sat, 27 Apr 2019 11:37:58 +0200 (CEST) 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 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-Mailman-Approved-At: Sat, 27 Apr 2019 09:12:44 -0400 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * 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)