Sync to trunk.

This commit is contained in:
John Schember 2009-08-02 09:17:25 -04:00
commit eb91ecd2c2
3 changed files with 10 additions and 2 deletions

View File

@ -36,6 +36,7 @@ def freeze():
'/lib/libz.so.1',
'/lib/libbz2.so.1',
'/usr/lib/libpoppler.so.4',
'/usr/lib/libpoppler-qt4.so.3',
'/usr/lib/libxml2.so.2',
'/usr/lib/libdbus-1.so.3',
'/usr/lib/libopenjpeg.so.2',

View File

@ -237,8 +237,9 @@ _check_symlinks_prescript()
print
print 'Adding poppler'
for x in ('pdftohtml', 'libpoppler.4.dylib', 'libpoppler-qt4.3.dylib'):
os.link(os.path.join(os.path.expanduser('~/poppler'), x),
os.path.join(frameworks_dir, x))
tgt = 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))

View File

@ -35,6 +35,12 @@ def get_metadata(stream, cover=True):
if 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:
from calibre.gui2 import is_ok_to_use_qt
cdata = None