From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49735) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dAUTp-0000R7-I5 for guix-patches@gnu.org; Tue, 16 May 2017 00:53:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dAUTm-0003Za-Gj for guix-patches@gnu.org; Tue, 16 May 2017 00:53:05 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:44601) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dAUTm-0003ZW-DP for guix-patches@gnu.org; Tue, 16 May 2017 00:53:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1dAUTm-0005uX-7N for guix-patches@gnu.org; Tue, 16 May 2017 00:53:02 -0400 Subject: bug#26924: [PATCH 04/10] gnu: calibre: Unbundle python2-markdown Resent-Message-ID: References: From: Brendan Tildesley Message-ID: <2de87079-66d7-e23a-62dc-3b55227b77e2@openmailbox.org> Date: Tue, 16 May 2017 14:52:19 +1000 MIME-Version: 1.0 In-Reply-To: Content-Type: multipart/mixed; boundary="------------8AC34C0CF7726BD50D5E3A56" 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. --------------8AC34C0CF7726BD50D5E3A56 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit --------------8AC34C0CF7726BD50D5E3A56 Content-Type: text/x-patch; name="0004-gnu-calibre-Unbundle-python2-markdown.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0004-gnu-calibre-Unbundle-python2-markdown.patch" >From 00e6be6e4e5461424cd475120bc73eafa97b172e Mon Sep 17 00:00:00 2001 From: Brendan Tildesley Date: Sat, 13 May 2017 23:24:06 +1000 Subject: [PATCH 04/10] gnu: calibre: Unbundle python2-markdown * gnu/packages/ebook.scm (calibre): [snippet]: Replace python references to bundled markdown with packaged. Remove markdown from source. [inputs]: Add python2-markdown as a dependency. --- gnu/packages/ebook.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm index 70ec9ed35..e75183185 100644 --- a/gnu/packages/ebook.scm +++ b/gnu/packages/ebook.scm @@ -78,8 +78,12 @@ (modules '((guix build utils))) (snippet '(begin + (delete-file-recursively "src/calibre/ebooks/markdown") (delete-file-recursively "src/unrar") - (delete-file "src/odf/thumbnail.py"))) + (delete-file "src/odf/thumbnail.py") + (substitute* (find-files "." "\\.py") + (("calibre\\.ebooks\\.markdown") "markdown")) + #t)) (patches (search-patches "calibre-drop-unrar.patch" "calibre-use-packaged-feedparser.patch" "calibre-dont-load-remote-icons.patch" @@ -120,6 +124,7 @@ ("python2-dbus" ,python2-dbus) ("python2-feedparser" ,python2-feedparser) ("python2-lxml" ,python2-lxml) + ("python2-markdown" ,python2-markdown) ("python2-mechanize" ,python2-mechanize) ("python2-netifaces" ,python2-netifaces) ("python2-pillow" ,python2-pillow) -- 2.13.0 --------------8AC34C0CF7726BD50D5E3A56--