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

Get webengine loading in the binary build

Browse Source
This commit is contained in:
Kovid Goyal 2019-08-29 09:22:27 +05:30
parent 9f449d90ee
commit 0f0df3b5e2
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bypy/init_env.py
View File

@ -37,6 +37,8 @@ dlls = [
'Widgets', 'Widgets',
# 'Multimedia', # 'Multimedia',
'OpenGL', 'OpenGL',
'Quick',
'Qml',
# 'MultimediaWidgets', # 'MultimediaWidgets',
'Xml', 'Xml',
# 'XmlPatterns', # 'XmlPatterns',

5
bypy/linux/__main__.py
View File

@ -115,11 +115,14 @@ def copy_libs(env):
stat.S_IRWXU | stat.S_IRGRP | stat.S_IXGRP | stat.S_IROTH | stat.S_IXOTH) stat.S_IRWXU | stat.S_IRGRP | stat.S_IXGRP | stat.S_IROTH | stat.S_IXOTH)
base = j(QT_PREFIX, 'plugins') base = j(QT_PREFIX, 'plugins')
dest = j(env.lib_dir, 'qt_plugins') dest = j(env.lib_dir, '..', 'plugins')
os.mkdir(dest) os.mkdir(dest)
for x in QT_PLUGINS: for x in QT_PLUGINS:
if x not in ('audio', 'printsupport'): if x not in ('audio', 'printsupport'):
shutil.copytree(j(base, x), j(dest, x)) shutil.copytree(j(base, x), j(dest, x))
dest = j(env.lib_dir, '..', 'libexec')
os.mkdir(dest)
shutil.copy2(os.path.join(QT_PREFIX, 'libexec', 'QtWebEngineProcess'), dest)
def copy_python(env, ext_dir): def copy_python(env, ext_dir):

6
bypy/linux/launcher.c
View File

@ -31,11 +31,7 @@ int main(int argc, char **argv) {
/* qt-at-spi causes crashes and performance issues in various distros, so disable it */ /* qt-at-spi causes crashes and performance issues in various distros, so disable it */
SET("QT_ACCESSIBILITY", "0") SET("QT_ACCESSIBILITY", "0")
memset(buf, 0, PATHLEN); SET("CALIBRE_QT_PREFIX", base)
ldp = getenv("QT_PLUGIN_PATH");
if (ldp == NULL) snprintf(buf, PATHLEN, "%s/qt_plugins", lib);
else snprintf(buf, PATHLEN, "%s/qt_plugins:%s", lib, ldp);
SET("QT_PLUGIN_PATH", buf);
memset(buf, 0, PATHLEN); memset(buf, 0, PATHLEN);
ldp = getenv("LD_LIBRARY_PATH"); ldp = getenv("LD_LIBRARY_PATH");

2
src/calibre/gui2/__init__.py
View File

@ -1110,7 +1110,7 @@ def sanitize_env_vars():
is needed to prevent library conflicts when launching external utilities.''' is needed to prevent library conflicts when launching external utilities.'''
if islinux and isfrozen: if islinux and isfrozen:
env_vars = {'LD_LIBRARY_PATH':'/lib', 'QT_PLUGIN_PATH':'/lib/qt_plugins'} env_vars = {'LD_LIBRARY_PATH':'/lib'}
elif iswindows: elif iswindows:
env_vars = {k:None for k in 'QT_PLUGIN_PATH'.split()} env_vars = {k:None for k in 'QT_PLUGIN_PATH'.split()}
elif isosx: elif isosx: