From patchwork Fri May 3 16:42:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brendan Tildesley X-Patchwork-Id: 13863 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 9FB6616F93; Fri, 3 May 2019 17:44:23 +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 0903C16F92 for ; Fri, 3 May 2019 17:44:23 +0100 (BST) Received: from localhost ([127.0.0.1]:44387 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMbIM-0004qH-EN for patchwork@mira.cbaines.net; Fri, 03 May 2019 12:44:22 -0400 Received: from eggs.gnu.org ([209.51.188.92]:54935) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMbIH-0004kI-Rh for guix-patches@gnu.org; Fri, 03 May 2019 12:44:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hMbIG-00044Z-Lg for guix-patches@gnu.org; Fri, 03 May 2019 12:44:17 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:35961) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hMbI8-0003y4-9L for guix-patches@gnu.org; Fri, 03 May 2019 12:44:09 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hMbI5-0007HM-VY for guix-patches@gnu.org; Fri, 03 May 2019 12:44:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#35446] [PATCH v2 05/24] gnu: calibre: Patch out unrar test. Resent-From: Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 03 May 2019 16:44:05 +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.155690184027874 (code B ref 35446); Fri, 03 May 2019 16:44:05 +0000 Received: (at 35446) by debbugs.gnu.org; 3 May 2019 16:44:00 +0000 Received: from localhost ([127.0.0.1]:49487 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hMbI0-0007FU-AB for submit@debbugs.gnu.org; Fri, 03 May 2019 12:44:00 -0400 Received: from mx1.mailbox.org ([80.241.60.212]:37710) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hMbHy-0007ER-L0 for 35446@debbugs.gnu.org; Fri, 03 May 2019 12:43:59 -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 38D564D7D4 for <35446@debbugs.gnu.org>; Fri, 3 May 2019 18:43:53 +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=1556901833; 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=yvVRyr15rosEqPmiVMy+ir8jQQnXTHG7lhEpF/1mlb0=; b=H0WIT3nozxRsRSbe72mHa8W8XZxVpvRjC++ABwEHr1C6YLc0iCw2RN0BKvlXkgbx1gjrZk z0CoaSbva+AlXGKSEMqW2kcvRcPRLW3mTVjXVeOvT6vbNGumbOolt1ExI26CJ4QEkiyXFB EbFpqEmh6IL88oriadiKPbwWkkMLEbHUltgLsCXQbITiAlXIFFP7c3NvyL9QKAQIKlISRD fEwQpFYi3Di0LmnuBK+Sl/nBI7cAxXTaBYBcGCNrshLzWaFBUZ0dIP50+4do+KM4BeoNBv COHTK4DehBCwgNpmQeDpjTroiucrLumzVQZAT6jSPfbSQbAmCPE7VV8zndnYRw== Received: from smtp1.mailbox.org ([80.241.60.240]) by spamfilter02.heinlein-hosting.de (spamfilter02.heinlein-hosting.de [80.241.56.116]) (amavisd-new, port 10030) with ESMTP id gfNXvtPnQI9W for <35446@debbugs.gnu.org>; Fri, 3 May 2019 18:43:39 +0200 (CEST) From: Brendan Tildesley Date: Sat, 4 May 2019 02:42:13 +1000 Message-Id: <20190503164232.1799-5-mail@brendan.scot> In-Reply-To: <20190503164232.1799-1-mail@brendan.scot> References: <20190503164232.1799-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-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 d7d1a3fed6..d5b7a2c5e5 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -690,6 +690,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 6bc3813725..f2875ef2fc 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 +