From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58638) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d9v7u-00031m-T3 for guix-patches@gnu.org; Sun, 14 May 2017 11:08:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d9v7q-0003IE-Nm for guix-patches@gnu.org; Sun, 14 May 2017 11:08:06 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:42239) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1d9v7q-0003Hv-LM for guix-patches@gnu.org; Sun, 14 May 2017 11:08:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1d9v7q-0001Go-GD for guix-patches@gnu.org; Sun, 14 May 2017 11:08:02 -0400 Subject: bug#26924: [PATCH 06/12] gnu: calibre: Undelete GPLv2 icon file. References: In-Reply-To: Resent-Message-ID: From: Brendan Tildesley Message-ID: <9ebee0d0-e6ab-0573-2974-5c501537efdd@openmailbox.org> Date: Mon, 15 May 2017 01:07:21 +1000 MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="------------08AD14DE3EF3E3A5992C67ED" 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. --------------08AD14DE3EF3E3A5992C67ED Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit --------------08AD14DE3EF3E3A5992C67ED Content-Type: text/x-patch; name="0006-gnu-calibre-Undelete-GPLv2-icon-file.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0006-gnu-calibre-Undelete-GPLv2-icon-file.patch" >From efcfd192fb22ab36054d41ba02ae3e5e32a9239c Mon Sep 17 00:00:00 2001 From: Brendan Tildesley Date: Sat, 13 May 2017 23:34:59 +1000 Subject: [PATCH 06/12] gnu: calibre: Undelete GPLv2 icon file. gnu/package/ebook.scm (calibre): Undelete GPLv2 icon file from openoffice (see thumbnail.py). --- gnu/packages/ebook.scm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm index d925504a2..6b9934724 100644 --- a/gnu/packages/ebook.scm +++ b/gnu/packages/ebook.scm @@ -73,14 +73,12 @@ (sha256 (base32 "1g8s0kp1gj05yysfgqpp2lgrxvzc0fsny1hwzx5jh9hvqn0b53cc")) - ;; Remove non-free or doubtful code, see - ;; https://lists.gnu.org/archive/html/guix-devel/2015-02/msg00478.html + ;; Remove nonfree unrar and bundled dependencies. (modules '((guix build utils))) (snippet '(begin (delete-file-recursively "src/calibre/ebooks/markdown") (delete-file-recursively "src/unrar") - (delete-file "src/odf/thumbnail.py") (substitute* (find-files "." "\\.py") (("calibre\\.ebooks\\.markdown") "markdown")))) (patches (search-patches "calibre-drop-unrar.patch" -- 2.12.2 --------------08AD14DE3EF3E3A5992C67ED--