Commit | Line | Data |
---|---|---|
b8ac8c28 AE |
1 | Taken from Debian. |
2 | ||
3 | Author: Dmitry Shachnev <mitya57@gmail.com> | |
4 | Description: do not build unrar extension as we strip unrar from the tarball | |
5 | Forwarded: not-needed | |
6 | Last-Update: 2013-04-04 | |
7 | ||
8 | Index: calibre/setup/extensions.py | |
9 | =================================================================== | |
10 | --- calibre.orig/setup/extensions.py 2014-02-02 10:42:14.510954007 +0100 | |
11 | +++ calibre/setup/extensions.py 2014-02-02 10:42:14.502954007 +0100 | |
12 | @@ -209,24 +209,6 @@ | |
13 | sip_files=['calibre/ebooks/pdf/render/qt_hack.sip'] | |
14 | ), | |
15 | ||
16 | - Extension('unrar', | |
17 | - ['unrar/%s.cpp'%(x.partition('.')[0]) for x in ''' | |
18 | - rar.o strlist.o strfn.o pathfn.o savepos.o smallfn.o global.o file.o | |
19 | - filefn.o filcreat.o archive.o arcread.o unicode.o system.o | |
20 | - isnt.o crypt.o crc.o rawread.o encname.o resource.o match.o | |
21 | - timefn.o rdwrfn.o consio.o options.o ulinks.o errhnd.o rarvm.o | |
22 | - secpassword.o rijndael.o getbits.o sha1.o extinfo.o extract.o | |
23 | - volume.o list.o find.o unpack.o cmddata.o filestr.o scantree.o | |
24 | - '''.split()] + ['calibre/utils/unrar.cpp'], | |
25 | - inc_dirs=['unrar'], | |
26 | - cflags=[('/' if iswindows else '-') + x for x in ( | |
27 | - 'DSILENT', 'DRARDLL', 'DUNRAR')] + ( | |
28 | - [] if iswindows else ['-D_FILE_OFFSET_BITS=64', | |
29 | - '-D_LARGEFILE_SOURCE']), | |
30 | - optimize_level=2, | |
31 | - libraries=['User32', 'Advapi32', 'kernel32', 'Shell32'] if iswindows else [] | |
32 | - ), | |
33 | - | |
34 | ] | |
35 | ||
36 | ||
37 | Index: calibre/src/calibre/ebooks/metadata/archive.py | |
38 | =================================================================== | |
39 | --- calibre.orig/src/calibre/ebooks/metadata/archive.py 2014-02-02 10:42:14.510954007 +0100 | |
40 | +++ calibre/src/calibre/ebooks/metadata/archive.py 2014-02-02 10:42:14.502954007 +0100 | |
41 | @@ -42,7 +42,7 @@ | |
42 | description = _('Extract common e-book formats from archives ' | |
43 | '(zip/rar) files. Also try to autodetect if they are actually ' | |
44 | 'cbz/cbr files.') | |
45 | - file_types = set(['zip', 'rar']) | |
46 | + file_types = set(['zip']) | |
47 | supported_platforms = ['windows', 'osx', 'linux'] | |
48 | on_import = True | |
49 |