Gentoo Archives: gentoo-commits

From: Zac Medico <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/calibre/files/
Date: Sun, 27 Mar 2022 16:53:29
Message-Id: 1648399999.03faa6adbd618a7f2215708279d7940ee578cc57.zmedico@gentoo
1 commit: 03faa6adbd618a7f2215708279d7940ee578cc57
2 Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
3 AuthorDate: Sun Mar 27 11:40:18 2022 +0000
4 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
5 CommitDate: Sun Mar 27 16:53:19 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03faa6ad
7
8 app-text/calibre: remove unused patch
9
10 Closes: https://github.com/gentoo/gentoo/pull/24774
11 Package-Manager: Portage-3.0.30, Repoman-3.0.3
12 Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
13 Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>
14
15 .../calibre/files/calibre-5.31.0-jxr-test.patch | 26 ----------------------
16 1 file changed, 26 deletions(-)
17
18 diff --git a/app-text/calibre/files/calibre-5.31.0-jxr-test.patch b/app-text/calibre/files/calibre-5.31.0-jxr-test.patch
19 deleted file mode 100644
20 index c39508474b68..000000000000
21 --- a/app-text/calibre/files/calibre-5.31.0-jxr-test.patch
22 +++ /dev/null
23 @@ -1,26 +0,0 @@
24 -Avoid calling libjxr's JxrDecApp as we currently don't package it.
25 ---- a/src/calibre/utils/img.py
26 -+++ b/src/calibre/utils/img.py
27 -@@ -119,8 +119,6 @@ def image_from_data(data):
28 - i = QImage()
29 - if not i.loadFromData(data):
30 - q = what(None, data)
31 -- if q == 'jxr':
32 -- return load_jxr_data(data)
33 - raise NotImage('Not a valid image (detected type: {})'.format(q))
34 - return i
35 -
36 ---- a/src/calibre/utils/img.py
37 -+++ b/src/calibre/utils/img.py
38 -@@ -644,11 +644,6 @@ def test(): # {{{
39 - despeckle_image(img)
40 - remove_borders_from_image(img)
41 - image_to_data(img, fmt='GIF')
42 -- raw = subprocess.Popen([get_exe_path('JxrDecApp'), '-h'],
43 -- creationflags=subprocess.DETACHED_PROCESS if iswindows else 0,
44 -- stdout=subprocess.PIPE).stdout.read()
45 -- if b'JPEG XR Decoder Utility' not in raw:
46 -- raise SystemExit('Failed to run JxrDecApp')
47 - # }}}
48 -
49 -