Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-06-23 15:30:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

Update version of Qt in OS X build to 5.5.1

Browse Source 
Needed to prevent QT from using the system openssl library. For Qt >=
5.5 it uses Apple's TextScure API instead of openssl.
This commit is contained in:
Kovid Goyal 2016-01-30 15:56:27 +05:30
parent fc7d4830a9
commit 59d1a6f2c6
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
setup/build_environment.py
View File

@ -182,6 +182,7 @@ if iswindows:
podofo_inc = os.path.join(sw_inc_dir, 'podofo') podofo_inc = os.path.join(sw_inc_dir, 'podofo')
podofo_lib = sw_lib_dir podofo_lib = sw_lib_dir
elif isosx: elif isosx:
QT_DLLS += ['Qt5DBus']
QT_FRAMEWORKS = [x.replace('5', '') for x in QT_DLLS] QT_FRAMEWORKS = [x.replace('5', '') for x in QT_DLLS]
sw = os.environ.get('SW', os.path.expanduser('~/sw')) sw = os.environ.get('SW', os.path.expanduser('~/sw'))
podofo_inc = os.path.join(sw, 'include', 'podofo') podofo_inc = os.path.join(sw, 'include', 'podofo')

15
setup/installer/osx/app/main.py
View File

@ -262,12 +262,15 @@ class Py2App(object):
@flush @flush
def get_local_dependencies(self, path_to_lib): def get_local_dependencies(self, path_to_lib):
for x, is_id in self.get_dependencies(path_to_lib): for x, is_id in self.get_dependencies(path_to_lib):
for y in (SW+'/lib/', SW+'/qt/lib/', SW+'/python/Python.framework/', SW+'/private/ssl/lib/'): if x.startswith('@rpath/Qt'):
if x.startswith(y): yield x, x[len('@rpath/'):], is_id
if y == SW+'/python/Python.framework/': else:
y = SW+'/python/' for y in (SW+'/lib/', SW+'/python/Python.framework/', SW+'/private/ssl/lib/'):
yield x, x[len(y):], is_id if x.startswith(y):
break if y == SW+'/python/Python.framework/':
y = SW+'/python/'
yield x, x[len(y):], is_id
break
@flush @flush
def change_dep(self, old_dep, new_dep, is_id, path_to_lib): def change_dep(self, old_dep, new_dep, is_id, path_to_lib):