From d05da909b5960ba3f987cf5151c65e552c3d890f Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Mon, 16 Nov 2015 13:11:36 +0530 Subject: [PATCH] Update version of poppler bundled with calibre --- setup/installer/linux/freeze2.py | 2 +- setup/installer/osx/app/main.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/setup/installer/linux/freeze2.py b/setup/installer/linux/freeze2.py index 341f9b3fe7..f44d45139c 100644 --- a/setup/installer/linux/freeze2.py +++ b/setup/installer/linux/freeze2.py @@ -71,7 +71,7 @@ def binary_includes(): j(SW, 'lib', 'lib' + x) for x in ( 'usb-1.0.so.0', 'mtp.so.9', 'expat.so.1', 'sqlite3.so.0', - 'podofo.so.0.9.1', 'z.so.1', 'bz2.so.1.0', 'poppler.so.46', + 'podofo.so.0.9.1', 'z.so.1', 'bz2.so.1.0', 'poppler.so.56', 'iconv.so.2', 'xml2.so.2', 'xslt.so.1', 'jpeg.so.8', 'png16.so.16', 'webp.so.5', 'exslt.so.0', 'imobiledevice.so.5', 'usbmuxd.so.4', 'plist.so.3', 'MagickCore-6.Q16.so.2', 'MagickWand-6.Q16.so.2', 'ssl.so.1.0.0', diff --git a/setup/installer/osx/app/main.py b/setup/installer/osx/app/main.py index b146a82e28..3fa10eda04 100644 --- a/setup/installer/osx/app/main.py +++ b/setup/installer/osx/app/main.py @@ -412,7 +412,7 @@ class Py2App(object): @flush def add_poppler(self): info('\nAdding poppler') - for x in ('libpoppler.46.dylib',): + for x in ('libpoppler.56.dylib',): self.install_dylib(os.path.join(SW, 'lib', x)) for x in ('pdftohtml', 'pdftoppm', 'pdfinfo'): self.install_dylib(os.path.join(SW, 'bin', x), False)