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

...

Browse Source
This commit is contained in:
Kovid Goyal 2010-11-30 14:40:31 -07:00
parent 5fa54ef9ad
commit 788138cd97
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
setup/installer/linux/freeze2.py
View File

@ -340,6 +340,8 @@ class LinuxFreeze(Command):
__builtin__.help = _Helper() __builtin__.help = _Helper()
def set_qt_plugin_path(): def set_qt_plugin_path():
import uuid
uuid.uuid4() # Workaround for libuuid/PyQt conflict
from PyQt4.Qt import QCoreApplication from PyQt4.Qt import QCoreApplication
paths = list(map(unicode, QCoreApplication.libraryPaths())) paths = list(map(unicode, QCoreApplication.libraryPaths()))
paths.insert(0, sys.frozen_path + '/lib/qt_plugins') paths.insert(0, sys.frozen_path + '/lib/qt_plugins')

4
src/calibre/__init__.py
View File

@ -21,7 +21,9 @@ from calibre.constants import iswindows, isosx, islinux, isfreebsd, isfrozen, \
filesystem_encoding, plugins, config_dir filesystem_encoding, plugins, config_dir
from calibre.startup import winutil, winutilerror, guess_type from calibre.startup import winutil, winutilerror, guess_type
uuid.uuid4() # Imported before PyQt4 to workaround PyQt4 util-linux conflict on gentoo if islinux and not getattr(sys, 'frozen', False):
# Imported before PyQt4 to workaround PyQt4 util-linux conflict on gentoo
uuid.uuid4()
if False: if False:
# Prevent pyflakes from complaining # Prevent pyflakes from complaining