Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-08 02:34:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix #1687540 [calibre does not build reproducibly](https://bugs.launchpad.net/calibre/+bug/1687540)

Browse Source
This commit is contained in:
Kovid Goyal 2017-05-02 11:10:35 +05:30
parent 03b9edb84c
commit 4bab1eeaa1
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
setup/gui.py
View File

@ -10,6 +10,7 @@ import os
from setup import Command, __appname__ from setup import Command, __appname__
class GUI(Command): class GUI(Command):
description = 'Compile all GUI forms' description = 'Compile all GUI forms'
PATH = os.path.join(Command.SRC, __appname__, 'gui2') PATH = os.path.join(Command.SRC, __appname__, 'gui2')
@ -53,7 +54,7 @@ class GUI(Command):
self.info('Creating images.qrc') self.info('Creating images.qrc')
for s in sources: for s in sources:
files.append('<file>%s</file>'%s) files.append('<file>%s</file>'%s)
manifest = '<RCC>\n<qresource prefix="/">\n%s\n</qresource>\n</RCC>'%'\n'.join(files) manifest = '<RCC>\n<qresource prefix="/">\n%s\n</qresource>\n</RCC>'%'\n'.join(sorted(files))
with open('images.qrc', 'wb') as f: with open('images.qrc', 'wb') as f:
f.write(manifest) f.write(manifest)
finally: finally:
@ -71,5 +72,3 @@ class GUI(Command):
os.remove(c) os.remove(c)
if os.path.exists(self.QRC): if os.path.exists(self.QRC):
os.remove(self.QRC) os.remove(self.QRC)

4
src/calibre/linux.py
View File

@ -954,7 +954,7 @@ def opts_and_exts(name, op, exts, cover_opts=('--cover',), opf_opts=(),
extras = [] extras = []
for eopts, eexts in ((cover_opts, "${pics}"), (opf_opts, "'@(opf)'")): for eopts, eexts in ((cover_opts, "${pics}"), (opf_opts, "'@(opf)'")):
for opt in eopts: for opt in eopts:
extras.append(special_exts_template%(opt, eexts)) extras.append(special_exts_template%(opt, sorted(eexts)))
extras = '\n'.join(extras) extras = '\n'.join(extras)
return '_'+fname+'()'+\ return '_'+fname+'()'+\
@ -985,7 +985,7 @@ def opts_and_exts(name, op, exts, cover_opts=('--cover',), opf_opts=(),
} }
complete -o filenames -F _'''%dict(pics=spics, complete -o filenames -F _'''%dict(pics=spics,
opts=opts, extras=extras, exts=exts) + fname + ' ' + name +"\n\n" opts=opts, extras=extras, exts=sorted(exts)) + fname + ' ' + name +"\n\n"
VIEWER = '''\ VIEWER = '''\