From patchwork Sat Apr 27 09:36:40 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brendan Tildesley X-Patchwork-Id: 13770 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 92C4516F51; Sat, 27 Apr 2019 14:13:01 +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 0700716F4F for ; Sat, 27 Apr 2019 14:13:01 +0100 (BST) Received: from localhost ([127.0.0.1]:60205 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hKN8W-0008Uh-Ee for patchwork@mira.cbaines.net; Sat, 27 Apr 2019 09:13:00 -0400 Received: from eggs.gnu.org ([209.51.188.92]:55254) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hKJmX-000787-NE for guix-patches@gnu.org; Sat, 27 Apr 2019 05:38:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hKJmV-0004Ed-Qh for guix-patches@gnu.org; Sat, 27 Apr 2019 05:38:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49076) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hKJmV-0004E1-F2 for guix-patches@gnu.org; Sat, 27 Apr 2019 05:38:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hKJmV-00014j-Be for guix-patches@gnu.org; Sat, 27 Apr 2019 05:38:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#35446] [PATCH 07/26] gnu: calibre: Remove markdown unbundling code. Resent-From: Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 27 Apr 2019 09:38:03 +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.15563578674008 (code B ref 35446); Sat, 27 Apr 2019 09:38:03 +0000 Received: (at 35446) by debbugs.gnu.org; 27 Apr 2019 09:37:47 +0000 Received: from localhost ([127.0.0.1]:34367 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hKJmF-00012a-DC for submit@debbugs.gnu.org; Sat, 27 Apr 2019 05:37:47 -0400 Received: from mx1.mailbox.org ([80.241.60.212]:37190) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hKJmB-00011f-5E for 35446@debbugs.gnu.org; Sat, 27 Apr 2019 05:37:43 -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 B84004CA79 for <35446@debbugs.gnu.org>; Sat, 27 Apr 2019 11:37:37 +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=1556357857; 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=c6pWpPjGbfs32fD5PzCcd7E5VTHedILTIIEQIBYzzVk=; b=rjVgKM2g6PSxWKoxoFbSf2NoYg+RA/H6kIUFhFL3VlC3/n3Bt6k7vF+tkEs9pA3xr9bYvl VBpK2UboIqsVfcIzlY+o2vmqY7uvPQnh+PUHcLc+mFAcLy/HNlkK54QBFMpFDgHpo5uSdN ZitIugEbQQqMNEDUx9+ScOrs8elRlSE9Z6RYIzDT3/Oz/yQr0IhEH9OhDwyk/fBPcK7ZN+ AF3858n3QDs27+sCGdybkaZbqTNmHrzo2H8ruHMvbdDus8s1dSd2paXT8PPlW9L2dSr5lq hsjdmc/ns/T/HBQBnUiQbbwSEU4sFSSeMrtS4gVt32P15H7k9/txsWk/clrDtw== Received: from smtp1.mailbox.org ([80.241.60.240]) by hefe.heinlein-support.de (hefe.heinlein-support.de [91.198.250.172]) (amavisd-new, port 10030) with ESMTP id waA1WSrS3Tfy for <35446@debbugs.gnu.org>; Sat, 27 Apr 2019 11:37:29 +0200 (CEST) From: Brendan Tildesley Date: Sat, 27 Apr 2019 19:36:40 +1000 Message-Id: <20190427093659.21851-7-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:43 -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/ebooks.scm (calibre)[snippet]: Markdown is nolonger bundled, --- gnu/packages/ebook.scm | 3 --- 1 file changed, 3 deletions(-) diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm index 3c7baa6e9c..45a456a63b 100644 --- a/gnu/packages/ebook.scm +++ b/gnu/packages/ebook.scm @@ -93,11 +93,8 @@ (modules '((guix build utils))) (snippet '(begin - (delete-file-recursively "src/calibre/ebooks/markdown") (delete-file "src/odf/thumbnail.py") (delete-file-recursively "resources/fonts/liberation") - (substitute* (find-files "." "\\.py") - (("calibre\\.ebooks\\.markdown") "markdown")) #t)) (patches (search-patches "calibre-no-updates-dialog.patch")))) (build-system python-build-system)