diff options
| author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2013-12-27 23:55:53 +0000 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2013-12-27 23:55:53 +0000 |
| commit | 65eeff79fff8a1bfdf67ca51d147384f46f4d5c0 (patch) | |
| tree | fbfdff322b28d9a3c37e6e31c94caf1d8e48dac1 /libre/calibre-libre/desktop_integration.patch | |
| parent | d53c44f055929b18d7d1b25f8367ee5836c435fc (diff) | |
Fri Dec 27 23:54:04 UTC 2013
Diffstat (limited to 'libre/calibre-libre/desktop_integration.patch')
| -rw-r--r-- | libre/calibre-libre/desktop_integration.patch | 26 |
1 files changed, 18 insertions, 8 deletions
diff --git a/libre/calibre-libre/desktop_integration.patch b/libre/calibre-libre/desktop_integration.patch index 2c6f07672..9b20820e6 100644 --- a/libre/calibre-libre/desktop_integration.patch +++ b/libre/calibre-libre/desktop_integration.patch @@ -1,6 +1,7 @@ ---- a/src/calibre/linux.py 2013-03-01 05:49:28.000000000 +0100 -+++ b/src/calibre/linux.py 2013-03-03 14:53:05.000000000 +0100 -@@ -447,19 +447,6 @@ +diff -aur calibre/src/calibre/linux.py calibre.new/src/calibre/linux.py +--- calibre/src/calibre/linux.py 2013-12-13 03:47:23.000000000 +0100 ++++ calibre.new/src/calibre/linux.py 2013-12-17 20:11:58.319040313 +0100 +@@ -451,18 +451,6 @@ self.setup_completion() if islinux or isbsd: self.setup_desktop_integration() @@ -16,11 +17,10 @@ - shutil.rmtree(f) if os.path.isdir(f) else os.unlink(f) - if os.stat(config_dir).st_uid == 0: - os.rmdir(config_dir) -- + if warn is None and self.warnings: self.info('There were %d warnings'%len(self.warnings)) - for args, kwargs in self.warnings: -@@ -508,7 +495,7 @@ +@@ -513,7 +501,7 @@ if isnetbsd: f = os.path.join(self.opts.staging_root, 'share/bash_completion.d/calibre') else: @@ -29,7 +29,7 @@ if not os.path.exists(os.path.dirname(f)): os.makedirs(os.path.dirname(f)) if zsh.dest: -@@ -651,63 +638,39 @@ +@@ -657,71 +645,45 @@ with TemporaryDirectory() as tdir, CurrentDir(tdir), \ PreserveMIMEDefaults(): @@ -57,11 +57,15 @@ - render_img('viewer.png', 'calibre-viewer.png') - cc('xdg-icon-resource install --size 128 calibre-viewer.png calibre-viewer', shell=True) - self.icon_resources.append(('apps', 'calibre-viewer', '128')) +- render_img('tweak.png', 'calibre-ebook-edit.png') +- cc('xdg-icon-resource install --size 128 calibre-ebook-edit.png calibre-ebook-edit', shell=True) +- self.icon_resources.append(('apps', 'calibre-ebook-edit', '128')) + dir = os.path.join(self.opts.staging_sharedir,'../pixmaps') + os.mkdir(dir) + render_img('mimetypes/lrf.png', os.path.join(dir,'calibre-lrf.png')) + render_img('lt.png', os.path.join(dir, 'calibre-gui.png')) + render_img('viewer.png', os.path.join(dir, 'calibre-viewer.png')) ++ render_img('tweak.png', os.path.join(dir, 'calibre-ebook-edit.png')) mimetypes = set([]) for x in all_input_formats(): @@ -73,6 +77,7 @@ def write_mimetypes(f): f.write('MimeType=%s;\n'%';'.join(mimetypes)) + from calibre.ebooks.oeb.polish.main import SUPPORTED - f = open('calibre-lrfviewer.desktop', 'wb') + dir = os.path.join(self.opts.staging_sharedir,'../applications') + os.mkdir(dir) @@ -83,6 +88,11 @@ + f = open(os.path.join(dir, 'calibre-ebook-viewer.desktop'), 'wb') f.write(EVIEWER) write_mimetypes(f) +- f = open('calibre-ebook-edit.desktop', 'wb') ++ f = open(os.path.join(dir, 'calibre-ebook-edit.desktop'), 'wb') + f.write(ETWEAK) + mt = [guess_type('a.' + x.lower())[0] for x in SUPPORTED] + f.write('MimeType=%s;\n'%';'.join(mt)) f.close() - f = open('calibre-gui.desktop', 'wb') + f = open(os.path.join(dir, 'calibre-gui.desktop'), 'wb') @@ -90,7 +100,7 @@ write_mimetypes(f) f.close() - des = ('calibre-gui.desktop', 'calibre-lrfviewer.desktop', -- 'calibre-ebook-viewer.desktop') +- 'calibre-ebook-viewer.desktop', 'calibre-ebook-edit.desktop') - for x in des: - cmd = ['xdg-desktop-menu', 'install', '--noupdate', './'+x] - cc(' '.join(cmd), shell=True) |