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

Minimum macOS version now 11.0

Browse Source
This commit is contained in:
Kovid Goyal 2023-10-03 16:05:52 +05:30
parent fcb09931a9
commit fcc89de564
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bypy/macos.conf
View File

@ -5,5 +5,5 @@ vm_name 'macos-calibre'
root '/Users/Shared/calibre-build' root '/Users/Shared/calibre-build'
python '/usr/bin/python3' python '/usr/bin/python3'
rsync '/opt/homebrew/bin/rsync' rsync '/opt/homebrew/bin/rsync'
deploy_target '10.15' deploy_target '11.0'
universal 'true' universal 'true'

14
bypy/macos/__main__.py
View File

@ -87,7 +87,7 @@ def compile_launcher_lib(contents_dir, gcc, base, pyver, inc_dir):
gcc = os.environ.get('CC', 'clang') gcc = os.environ.get('CC', 'clang')
def compile_launchers(contents_dir, inc_dir, xprograms, pyver): def compile_launchers(contents_dir, inc_dir, xprograms, pyver, rpath):
base = dirname(abspath(__file__)) base = dirname(abspath(__file__))
lib = compile_launcher_lib(contents_dir, gcc, base, pyver, inc_dir) lib = compile_launcher_lib(contents_dir, gcc, base, pyver, inc_dir)
src = join(base, 'launcher.c') src = join(base, 'launcher.c')
@ -100,7 +100,7 @@ def compile_launchers(contents_dir, inc_dir, xprograms, pyver):
is_gui = 'true' if ptype == 'gui' else 'false' is_gui = 'true' if ptype == 'gui' else 'false'
cmd = [gcc] + ARCH_FLAGS + [ cmd = [gcc] + ARCH_FLAGS + [
'-Wall', f'-DPROGRAM=L"{program}"', f'-DMODULE=L"{module}"', f'-DFUNCTION=L"{func}"', f'-DIS_GUI={is_gui}', '-Wall', f'-DPROGRAM=L"{program}"', f'-DMODULE=L"{module}"', f'-DFUNCTION=L"{func}"', f'-DIS_GUI={is_gui}',
'-I' + base, src, lib, '-o', out, '-headerpad_max_install_names' '-I' + base, src, lib, '-o', out, '-headerpad_max_install_names', '-rpath', rpath,
] ]
# print('\t'+' '.join(cmd)) # print('\t'+' '.join(cmd))
sys.stdout.flush() sys.stdout.flush()
@ -246,7 +246,7 @@ class Freeze:
progs += list(zip(basenames[x], main_modules[x], main_functions[x], repeat(x))) progs += list(zip(basenames[x], main_modules[x], main_functions[x], repeat(x)))
for program, module, func, ptype in progs: for program, module, func, ptype in progs:
programs[program] = (module, func, ptype) programs[program] = (module, func, ptype)
programs = compile_launchers(self.contents_dir, self.inc_dir, programs, py_ver) programs = compile_launchers(self.contents_dir, self.inc_dir, programs, py_ver, self.FID)
for out in programs: for out in programs:
self.fix_dependencies_in_lib(out) self.fix_dependencies_in_lib(out)
@ -271,9 +271,7 @@ class Freeze:
@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):
if x.startswith('@rpath/Qt') or x.startswith('@rpath/libexpat') or x.startswith('@rpath/libpodofo') or x.startswith('@rpath/libzstd'): if x in ('libunrar.dylib', 'libstemmer.0.dylib', 'libstemmer.dylib') and not is_id:
yield x, x[len('@rpath/'):], is_id
elif x in ('libunrar.dylib', 'libstemmer.0.dylib', 'libstemmer.dylib') and not is_id:
yield x, x, is_id yield x, x, is_id
else: else:
for y in (PREFIX + '/lib/', PREFIX + '/python/Python.framework/'): for y in (PREFIX + '/lib/', PREFIX + '/python/Python.framework/'):
@ -396,7 +394,7 @@ class Freeze:
CFBundlePackageType='APPL', CFBundlePackageType='APPL',
CFBundleSignature='????', CFBundleSignature='????',
CFBundleExecutable='pdftohtml', CFBundleExecutable='pdftohtml',
LSMinimumSystemVersion='10.15.0', LSMinimumSystemVersion='11.0.0',
LSRequiresNativeExecution=True, LSRequiresNativeExecution=True,
NSAppleScriptEnabled=False, NSAppleScriptEnabled=False,
CFBundleIconFile='', CFBundleIconFile='',
@ -446,7 +444,7 @@ class Freeze:
CFBundleExecutable='calibre', CFBundleExecutable='calibre',
CFBundleDocumentTypes=docs, CFBundleDocumentTypes=docs,
CFBundleURLTypes=url_handlers, CFBundleURLTypes=url_handlers,
LSMinimumSystemVersion='10.15.0', LSMinimumSystemVersion='11.0.0',
LSRequiresNativeExecution=True, LSRequiresNativeExecution=True,
NSAppleScriptEnabled=False, NSAppleScriptEnabled=False,
NSSupportsAutomaticGraphicsSwitching=True, NSSupportsAutomaticGraphicsSwitching=True,