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

Fix dylib loading for webengine helper process

Browse Source
This commit is contained in:
Kovid Goyal 2019-08-30 13:26:00 +05:30
parent b5a16dc10c
commit 1db4a15d89
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
bypy/macos/__main__.py
View File

@ -169,7 +169,6 @@ class Freeze(object):
self.frameworks_dir = join(self.contents_dir, 'Frameworks') self.frameworks_dir = join(self.contents_dir, 'Frameworks')
self.exe_dir = join(self.contents_dir, 'MacOS') self.exe_dir = join(self.contents_dir, 'MacOS')
self.helpers_dir = join(self.build_dir, 'Helpers', 'utils.app', 'Contents', 'MacOS') self.helpers_dir = join(self.build_dir, 'Helpers', 'utils.app', 'Contents', 'MacOS')
self.webengine_dir = join(self.build_dir, 'Helpers', 'QtWebEngineProcess.app', 'Contents', 'MacOS')
self.site_packages = join(self.resources_dir, 'Python', 'site-packages') self.site_packages = join(self.resources_dir, 'Python', 'site-packages')
self.to_strip = [] self.to_strip = []
self.warnings = [] self.warnings = []
@ -328,6 +327,12 @@ class Freeze(object):
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(
self.frameworks_dir, 'QtWebEngineCore.framework/Versions/5/Helpers/QtWebEngineProcess.app/Contents/MacOS/QtWebEngineProcess')
self.fix_dependencies_in_lib(webengine_process)
cdir = dirname(dirname(webengine_process))
dest = join(cdir, 'Frameworks')
os.symlink(os.path.relpath(self.frameworks_dir, cdir), dest)
def add_qt_framework(self, f): def add_qt_framework(self, f):
libname = f libname = f
@ -361,12 +366,15 @@ class Freeze(object):
subprocess.check_call([ subprocess.check_call([
'iconutil', '-c', 'icns', x, '-o', join( 'iconutil', '-c', 'icns', x, '-o', join(
self.resources_dir, basename(x).partition('.')[0] + '.icns')]) self.resources_dir, basename(x).partition('.')[0] + '.icns')])
for helpers in (self.helpers_dir, self.webengine_dir): for helpers in (self.helpers_dir,):
os.makedirs(helpers) os.makedirs(helpers)
cdir = dirname(helpers) cdir = dirname(helpers)
dest = join(cdir, 'Frameworks') dest = join(cdir, 'Frameworks')
src = self.frameworks_dir src = self.frameworks_dir
os.symlink(os.path.relpath(src, cdir), dest) os.symlink(os.path.relpath(src, cdir), dest)
dest = join(cdir, 'Resources')
src = self.resources_dir
os.symlink(os.path.relpath(src, cdir), dest)
@flush @flush
def add_calibre_plugins(self): def add_calibre_plugins(self):