diff options
| author | Brendan Tildesley <mail@brendan.scot> | 2019-05-05 14:04:02 +0200 |
|---|---|---|
| committer | Danny Milosavljevic <dannym@scratchpost.org> | 2019-05-05 14:44:20 +0200 |
| commit | 15871b40872b9534a9dc3af9fda163601a360a51 (patch) | |
| tree | e3f5382a38940ac69ac1f7c0a5dae1d221ef274a /gnu | |
| parent | c187c9d786e10d68f5730c2728cee266bdbb406f (diff) | |
| download | guix-15871b40872b9534a9dc3af9fda163601a360a51.tar.gz | |
gnu: calibre: Remove unrar test.
* gnu/packages/patches/calibre-remove-test-unrar.patch: New file. * gnu/packages/ebook.scm (calibre)[source]: Use it. * gnu/local.mk (dist_patch_DATA): Add it. Signed-off-by: Danny Milosavljevic <dannym@scratchpost.org>
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/local.mk | 1 | ||||
| -rw-r--r-- | gnu/packages/ebook.scm | 3 | ||||
| -rw-r--r-- | gnu/packages/patches/calibre-remove-test-unrar.patch | 28 |
3 files changed, 31 insertions, 1 deletions
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 b26eacac52..79fa99cf4a 100644 --- a/gnu/packages/ebook.scm +++ b/gnu/packages/ebook.scm @@ -96,7 +96,8 @@ '(begin (delete-file "src/odf/thumbnail.py") #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..4e5572d1a6 --- /dev/null +++ b/gnu/packages/patches/calibre-remove-test-unrar.patch @@ -0,0 +1,28 @@ +Unrar contains security vulnerabilities and has thus been removed from Guix. +From a16f97b02bd8afd0ec05c471e156f631f2cc6eec Mon Sep 17 00:00:00 2001 +From: Brendan Tildesley <mail@brendan.scot> +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 + |