Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Bump library versions

Browse Source
This commit is contained in:
Kovid Goyal 2021-12-18 14:31:40 +05:30
parent ee72b7b850
commit 8bc909debe
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bypy/init_env.py
View File

@ -48,8 +48,9 @@ if islinux:
elif ismacos: elif ismacos:
dlls += ['DBus'] dlls += ['DBus']
QT_MAJOR = 6
QT_DLLS = frozenset( QT_DLLS = frozenset(
'Qt6' + x for x in dlls f'Qt{QT_MAJOR}' + x for x in dlls
) )
QT_PLUGINS = [ QT_PLUGINS = [

17
bypy/macos/__main__.py
View File

@ -33,11 +33,12 @@ abspath, join, basename, dirname = os.path.abspath, os.path.join, os.path.basena
iv = globals()['init_env'] iv = globals()['init_env']
calibre_constants = iv['calibre_constants'] calibre_constants = iv['calibre_constants']
QT_DLLS, QT_PLUGINS, PYQT_MODULES = iv['QT_DLLS'], iv['QT_PLUGINS'], iv['PYQT_MODULES'] QT_DLLS, QT_PLUGINS, PYQT_MODULES = iv['QT_DLLS'], iv['QT_PLUGINS'], iv['PYQT_MODULES']
QT_MAJOR = iv['QT_MAJOR']
py_ver = '.'.join(map(str, python_major_minor_version())) py_ver = '.'.join(map(str, python_major_minor_version()))
sign_app = runpy.run_path(join(dirname(abspath(__file__)), 'sign.py'))['sign_app'] sign_app = runpy.run_path(join(dirname(abspath(__file__)), 'sign.py'))['sign_app']
QT_PREFIX = join(PREFIX, 'qt') QT_PREFIX = join(PREFIX, 'qt')
QT_FRAMEWORKS = [x.replace('6', '') for x in QT_DLLS] QT_FRAMEWORKS = [x.replace(f'{QT_MAJOR}', '') for x in QT_DLLS]
ENV = dict( ENV = dict(
FONTCONFIG_PATH='@executable_path/../Resources/fonts', FONTCONFIG_PATH='@executable_path/../Resources/fonts',
@ -329,8 +330,8 @@ class Freeze:
self.fix_dependencies_in_lib(l) self.fix_dependencies_in_lib(l)
x = os.path.relpath(l, ddir) x = os.path.relpath(l, ddir)
self.set_id(l, '@executable_path/' + x) self.set_id(l, '@executable_path/' + x)
webengine_process = join( webengine_process = os.path.realpath(join(
self.frameworks_dir, 'QtWebEngineCore.framework/Versions/5/Helpers/QtWebEngineProcess.app/Contents/MacOS/QtWebEngineProcess') self.frameworks_dir, 'QtWebEngineCore.framework/Versions/Current/Helpers/QtWebEngineProcess.app/Contents/MacOS/QtWebEngineProcess'))
self.fix_dependencies_in_lib(webengine_process) self.fix_dependencies_in_lib(webengine_process)
cdir = dirname(dirname(webengine_process)) cdir = dirname(dirname(webengine_process))
dest = join(cdir, 'Frameworks') dest = join(cdir, 'Frameworks')
@ -408,8 +409,8 @@ class Freeze:
for f in plugins: for f in plugins:
self.fix_dependencies_in_lib(f) self.fix_dependencies_in_lib(f)
if f.endswith('/podofo.so'): if f.endswith('/podofo.so'):
self.change_dep('libpodofo.0.9.6.dylib', self.change_dep('libpodofo.0.9.7.dylib',
'@executable_path/../Frameworks/libpodofo.0.9.6.dylib', False, f) '@executable_path/../Frameworks/libpodofo.0.9.7.dylib', False, f)
@flush @flush
def create_plist(self): def create_plist(self):
@ -469,13 +470,13 @@ class Freeze:
@flush @flush
def add_podofo(self): def add_podofo(self):
print('\nAdding PoDoFo') print('\nAdding PoDoFo')
pdf = join(PREFIX, 'lib', 'libpodofo.0.9.6.dylib') pdf = join(PREFIX, 'lib', 'libpodofo.0.9.7.dylib')
self.install_dylib(pdf) self.install_dylib(pdf)
@flush @flush
def add_poppler(self): def add_poppler(self):
print('\nAdding poppler') print('\nAdding poppler')
for x in ('libopenjp2.7.dylib', 'libpoppler.102.dylib',): for x in ('libopenjp2.7.dylib', 'libpoppler.115.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(
@ -520,7 +521,7 @@ class Freeze:
def add_misc_libraries(self): def add_misc_libraries(self):
for x in ( for x in (
'usb-1.0.0', 'mtp.9', 'chm.0', 'sqlite3.0', 'hunspell-1.7.0', 'usb-1.0.0', 'mtp.9', 'chm.0', 'sqlite3.0', 'hunspell-1.7.0',
'icudata.67', 'icui18n.67', 'icuio.67', 'icuuc.67', 'hyphen.0', 'icudata.70', 'icui18n.70', 'icuio.70', 'icuuc.70', 'hyphen.0',
'stemmer.0', 'xslt.1', 'exslt.0', 'xml2.2', 'z.1', 'unrar', 'lzma.5', 'stemmer.0', 'xslt.1', 'exslt.0', 'xml2.2', 'z.1', 'unrar', 'lzma.5',
'crypto.1.1', 'ssl.1.1', 'iconv.2', # 'ltdl.7' 'crypto.1.1', 'ssl.1.1', 'iconv.2', # 'ltdl.7'
): ):