mirror of
https://github.com/kovidgoyal/calibre.git
synced 2025-07-09 03:04:10 -04:00
Sync to trunk.
This commit is contained in:
commit
eb91ecd2c2
@ -36,6 +36,7 @@ def freeze():
|
|||||||
'/lib/libz.so.1',
|
'/lib/libz.so.1',
|
||||||
'/lib/libbz2.so.1',
|
'/lib/libbz2.so.1',
|
||||||
'/usr/lib/libpoppler.so.4',
|
'/usr/lib/libpoppler.so.4',
|
||||||
|
'/usr/lib/libpoppler-qt4.so.3',
|
||||||
'/usr/lib/libxml2.so.2',
|
'/usr/lib/libxml2.so.2',
|
||||||
'/usr/lib/libdbus-1.so.3',
|
'/usr/lib/libdbus-1.so.3',
|
||||||
'/usr/lib/libopenjpeg.so.2',
|
'/usr/lib/libopenjpeg.so.2',
|
||||||
|
@ -237,8 +237,9 @@ _check_symlinks_prescript()
|
|||||||
print
|
print
|
||||||
print 'Adding poppler'
|
print 'Adding poppler'
|
||||||
for x in ('pdftohtml', 'libpoppler.4.dylib', 'libpoppler-qt4.3.dylib'):
|
for x in ('pdftohtml', 'libpoppler.4.dylib', 'libpoppler-qt4.3.dylib'):
|
||||||
os.link(os.path.join(os.path.expanduser('~/poppler'), x),
|
tgt = os.path.join(frameworks_dir, x)
|
||||||
os.path.join(frameworks_dir, x))
|
os.link(os.path.join(os.path.expanduser('~/poppler'), x), tgt)
|
||||||
|
self.fix_qt_dependencies(tgt, self.qt_dependencies(tgt))
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ -35,6 +35,12 @@ def get_metadata(stream, cover=True):
|
|||||||
if creator:
|
if creator:
|
||||||
mi.book_producer = creator
|
mi.book_producer = creator
|
||||||
|
|
||||||
|
if doc.subject:
|
||||||
|
mi.category = doc.subject
|
||||||
|
|
||||||
|
if doc.keywords:
|
||||||
|
mi.tags = [x.strip() for x in doc.keywords.split(',')]
|
||||||
|
|
||||||
if cover:
|
if cover:
|
||||||
from calibre.gui2 import is_ok_to_use_qt
|
from calibre.gui2 import is_ok_to_use_qt
|
||||||
cdata = None
|
cdata = None
|
||||||
|
Loading…
x
Reference in New Issue
Block a user