From patchwork Sat Apr 27 09:36:45 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brendan Tildesley X-Patchwork-Id: 13789 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 AF91316F51; Sat, 27 Apr 2019 14:14:03 +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 0D81A16F4F for ; Sat, 27 Apr 2019 14:14:03 +0100 (BST) Received: from localhost ([127.0.0.1]:60245 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hKN9W-0000w4-Fm for patchwork@mira.cbaines.net; Sat, 27 Apr 2019 09:14:02 -0400 Received: from eggs.gnu.org ([209.51.188.92]:55566) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hKJnY-0007Ip-Ov for guix-patches@gnu.org; Sat, 27 Apr 2019 05:39:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hKJnU-0005Ku-6a for guix-patches@gnu.org; Sat, 27 Apr 2019 05:39:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49132) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hKJnU-0005Kh-2r for guix-patches@gnu.org; Sat, 27 Apr 2019 05:39:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hKJnT-0001AM-VM for guix-patches@gnu.org; Sat, 27 Apr 2019 05:39:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#35446] [PATCH 12/26] gnu: calibre: Patch out unrar test. Resent-From: Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 27 Apr 2019 09:39: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.15563578934295 (code B ref 35446); Sat, 27 Apr 2019 09:39:03 +0000 Received: (at 35446) by debbugs.gnu.org; 27 Apr 2019 09:38:13 +0000 Received: from localhost ([127.0.0.1]:34412 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hKJme-000176-An for submit@debbugs.gnu.org; Sat, 27 Apr 2019 05:38:12 -0400 Received: from mx1.mailbox.org ([80.241.60.212]:38434) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hKJmS-00013b-J6 for 35446@debbugs.gnu.org; Sat, 27 Apr 2019 05:38:01 -0400 Received: from smtp1.mailbox.org (smtp1.mailbox.org [80.241.60.240]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by mx1.mailbox.org (Postfix) with ESMTPS id 2BAF24CC41 for <35446@debbugs.gnu.org>; Sat, 27 Apr 2019 11:37:55 +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=1556357875; 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=eVU1kMB3I18xGAjzt591TsszdmccC4J/M8/b20hiWRM=; b=1gCX+rSlzjvSsusHd3KspMxdaCINokroi2Y367noDCWSlM3vmR/mo7Uvt/r3EpYn8si5Z1 iwcVmwGSRtdKyx/jFeUcLhCs9g7cZs9Ic/7foKBuYyXA7Nn28zROyJK6AMl3qZM2y2QI57 srE2X+/I4J8mRyz0MoNlTDA18Tn/HlPN2tusIIyuDb7rH/UY0mCBfUOYPaTGxIDnzBMdIt TjSC3/B9xUAg7ZMersY+FDtRo5eIhQ+lFpVBp7pGHwuUuyosEw0UzT8ZLul0/FUrA9d6kA mYA9f95IY9oe/Knxjs9Mm72ng7YVc8Qhm4CaAPmmSa4Q8fHvH8y4Cjcsas/ztA== 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 f1NrG5QkrYfE for <35446@debbugs.gnu.org>; Sat, 27 Apr 2019 11:37:38 +0200 (CEST) From: Brendan Tildesley Date: Sat, 27 Apr 2019 19:36:45 +1000 Message-Id: <20190427093659.21851-12-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):[patches]: Patch out test_unrar. gnu/local.mk: Add reference to patch file. gnu/packages/patches/calibre-remove-test-unrar.patch: New file. --- gnu/local.mk | 1 + gnu/packages/ebook.scm | 3 ++- .../patches/calibre-remove-test-unrar.patch | 27 +++++++++++++++++++ 3 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/calibre-remove-test-unrar.patch diff --git a/gnu/local.mk b/gnu/local.mk index 3248619175..677ab0f625 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -688,6 +688,7 @@ dist_patch_DATA = \ %D%/packages/patches/boost-fix-icu-build.patch \ %D%/packages/patches/byobu-writable-status.patch \ %D%/packages/patches/calibre-no-updates-dialog.patch \ + %D%/packages/patches/calibre-remove-test-unrar.patch \ %D%/packages/patches/casync-renameat2-declaration.patch \ %D%/packages/patches/catdoc-CVE-2017-11110.patch \ %D%/packages/patches/cdparanoia-fpic.patch \ diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm index 9f6a2bf52e..1726f83093 100644 --- a/gnu/packages/ebook.scm +++ b/gnu/packages/ebook.scm @@ -97,7 +97,8 @@ (delete-file "src/odf/thumbnail.py") (delete-file-recursively "resources/fonts/liberation") #t)) - (patches (search-patches "calibre-no-updates-dialog.patch")))) + (patches (search-patches "calibre-no-updates-dialog.patch" + "calibre-remove-test-unrar.patch")))) (build-system python-build-system) (native-inputs `(("pkg-config" ,pkg-config) diff --git a/gnu/packages/patches/calibre-remove-test-unrar.patch b/gnu/packages/patches/calibre-remove-test-unrar.patch new file mode 100644 index 0000000000..fdffb0c750 --- /dev/null +++ b/gnu/packages/patches/calibre-remove-test-unrar.patch @@ -0,0 +1,27 @@ +From a16f97b02bd8afd0ec05c471e156f631f2cc6eec Mon Sep 17 00:00:00 2001 +From: Brendan Tildesley +Date: Tue, 26 Mar 2019 22:17:03 +1100 +Subject: [PATCH] Remove test_unrar. + +--- + src/calibre/test_build.py | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/src/calibre/test_build.py b/src/calibre/test_build.py +index d67afd20a6..709132ef17 100644 +--- a/src/calibre/test_build.py ++++ b/src/calibre/test_build.py +@@ -220,10 +220,6 @@ class BuildTest(unittest.TestCase): + from calibre.gui2.win_file_dialogs import test + test() + +- def test_unrar(self): +- from calibre.utils.unrar import test_basic +- test_basic() +- + @unittest.skipUnless(iswindows, 'WPD is windows only') + def test_wpd(self): + wpd = plugins['wpd'][0] +-- +2.21.0 +