From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50003) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dAUUn-0001J2-3j for guix-patches@gnu.org; Tue, 16 May 2017 00:54:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dAUUk-00049W-2O for guix-patches@gnu.org; Tue, 16 May 2017 00:54:05 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:44605) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dAUUj-00049M-Uw for guix-patches@gnu.org; Tue, 16 May 2017 00:54:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1dAUUj-0005w5-Pt for guix-patches@gnu.org; Tue, 16 May 2017 00:54:01 -0400 Subject: bug#26924: [PATCH 05/10] gnu: calibre: Undelete GPLv2 icon file. Resent-Message-ID: References: From: Brendan Tildesley Message-ID: <8c41b4c9-18fb-8e75-a080-385df5675426@openmailbox.org> Date: Tue, 16 May 2017 14:53:19 +1000 MIME-Version: 1.0 In-Reply-To: Content-Type: multipart/mixed; boundary="------------7B1C753BE0CE12D03D613EB2" 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. --------------7B1C753BE0CE12D03D613EB2 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit --------------7B1C753BE0CE12D03D613EB2 Content-Type: text/x-patch; name="0005-gnu-calibre-Undelete-GPLv2-icon-file.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0005-gnu-calibre-Undelete-GPLv2-icon-file.patch" >From d2cdfa11b01d747f146822dd23855e990946103e Mon Sep 17 00:00:00 2001 From: Brendan Tildesley Date: Sat, 13 May 2017 23:34:59 +1000 Subject: [PATCH 05/10] 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 e75183185..5af0d0480 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")) #t)) -- 2.13.0 --------------7B1C753BE0CE12D03D613EB2--