mirror of
https://github.com/LBRYFoundation/LBRY-Vault.git
synced 2025-09-01 01:35:20 +00:00
Fixup to get PyQt5 5.10 working ok and looking right on Mac
This commit is contained in:
parent
7ff32877f7
commit
6b09d478a5
2 changed files with 18 additions and 3 deletions
|
@ -1,6 +1,6 @@
|
||||||
# -*- mode: python -*-
|
# -*- mode: python -*-
|
||||||
|
|
||||||
from PyInstaller.utils.hooks import collect_data_files, collect_submodules
|
from PyInstaller.utils.hooks import collect_data_files, collect_submodules, collect_dynamic_libs
|
||||||
|
|
||||||
import sys
|
import sys
|
||||||
import os
|
import os
|
||||||
|
@ -40,6 +40,20 @@ datas += collect_data_files('trezorlib')
|
||||||
datas += collect_data_files('btchip')
|
datas += collect_data_files('btchip')
|
||||||
datas += collect_data_files('keepkeylib')
|
datas += collect_data_files('keepkeylib')
|
||||||
|
|
||||||
|
# We had an issue with PyQt 5.10 not picking up the libqmacstyles.dylib properly,
|
||||||
|
# and thus Electrum looking terrible on Mac.
|
||||||
|
# The below 3 statements are a workaround for that issue.
|
||||||
|
# This should 'do nothing bad' in any case should a future version of PyQt5 not even
|
||||||
|
# need this.
|
||||||
|
binaries = []
|
||||||
|
dylibs_in_pyqt5 = collect_dynamic_libs('PyQt5', 'DUMMY_NOT_USED')
|
||||||
|
for tuple in dylibs_in_pyqt5:
|
||||||
|
# find libqmacstyle.dylib ...
|
||||||
|
if "libqmacstyle.dylib" in tuple[0]:
|
||||||
|
# .. and include all the .dylibs in that dir in our 'binaries' PyInstaller spec
|
||||||
|
binaries += [( os.path.dirname(tuple[0]) + '/*.dylib', 'PyQt5/Qt/plugins/styles' )]
|
||||||
|
break
|
||||||
|
|
||||||
# We don't put these files in to actually include them in the script but to make the Analysis method scan them for imports
|
# We don't put these files in to actually include them in the script but to make the Analysis method scan them for imports
|
||||||
a = Analysis([electrum+MAIN_SCRIPT,
|
a = Analysis([electrum+MAIN_SCRIPT,
|
||||||
electrum+'gui/qt/main_window.py',
|
electrum+'gui/qt/main_window.py',
|
||||||
|
@ -57,6 +71,7 @@ a = Analysis([electrum+MAIN_SCRIPT,
|
||||||
electrum+'plugins/keepkey/qt.py',
|
electrum+'plugins/keepkey/qt.py',
|
||||||
electrum+'plugins/ledger/qt.py',
|
electrum+'plugins/ledger/qt.py',
|
||||||
],
|
],
|
||||||
|
binaries=binaries,
|
||||||
datas=datas,
|
datas=datas,
|
||||||
hiddenimports=hiddenimports,
|
hiddenimports=hiddenimports,
|
||||||
hookspath=[])
|
hookspath=[])
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
pycryptodomex==3.4.12
|
pycryptodomex==3.4.12
|
||||||
PyQt5==5.9
|
PyQt5==5.10
|
||||||
sip==4.19.7
|
sip==4.19.7
|
||||||
six==1.11.0
|
six==1.11.0
|
||||||
websocket-client==0.46.0
|
websocket-client==0.46.0
|
Loading…
Add table
Reference in a new issue