From mboxrd@z Thu Jan 1 00:00:00 1970 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 Subject: [bug#35446] [PATCH 12/26] gnu: calibre: Patch out unrar test. Resent-Message-ID: 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 Content-Transfer-Encoding: 8bit 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: 35446@debbugs.gnu.org * 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 + -- 2.21.0