mirror of
https://github.com/kovidgoyal/calibre.git
synced 2025-07-09 03:04:10 -04:00
Minor fixes for new build deps
This commit is contained in:
parent
2fffec0ece
commit
c31ead51dc
@ -94,7 +94,7 @@ def import_site_packages(srcdir, dest):
|
|||||||
if ext in ('py', 'so'):
|
if ext in ('py', 'so'):
|
||||||
shutil.copy2(f, dest)
|
shutil.copy2(f, dest)
|
||||||
elif ext == 'pth' and x != 'setuptools.pth':
|
elif ext == 'pth' and x != 'setuptools.pth':
|
||||||
for line in open(f, 'rb').read().splitlines():
|
for line in open(f, 'rb').read().decode('utf-8').splitlines():
|
||||||
src = os.path.abspath(j(srcdir, line))
|
src = os.path.abspath(j(srcdir, line))
|
||||||
if os.path.exists(src) and os.path.isdir(src):
|
if os.path.exists(src) and os.path.isdir(src):
|
||||||
import_site_packages(src, dest)
|
import_site_packages(src, dest)
|
||||||
|
@ -449,7 +449,7 @@ class Freeze(object):
|
|||||||
@flush
|
@flush
|
||||||
def add_poppler(self):
|
def add_poppler(self):
|
||||||
print('\nAdding poppler')
|
print('\nAdding poppler')
|
||||||
for x in ('libopenjp2.7.dylib', 'libpoppler.87.dylib',):
|
for x in ('libopenjp2.7.dylib', 'libpoppler.102.dylib',):
|
||||||
self.install_dylib(join(PREFIX, 'lib', x))
|
self.install_dylib(join(PREFIX, 'lib', x))
|
||||||
for x in ('pdftohtml', 'pdftoppm', 'pdfinfo'):
|
for x in ('pdftohtml', 'pdftoppm', 'pdfinfo'):
|
||||||
self.install_dylib(
|
self.install_dylib(
|
||||||
|
Loading…
x
Reference in New Issue
Block a user