diff options
Diffstat (limited to 'community/calibre/desktop_integration.patch')
| -rw-r--r-- | community/calibre/desktop_integration.patch | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/community/calibre/desktop_integration.patch b/community/calibre/desktop_integration.patch index fa58443ed..40d48c03e 100644 --- a/community/calibre/desktop_integration.patch +++ b/community/calibre/desktop_integration.patch @@ -1,7 +1,6 @@ -diff -rupN calibre.orig//src/calibre/linux.py calibre/src/calibre/linux.py ---- calibre.orig//src/calibre/linux.py 2010-09-17 22:38:02.000000000 +0200 -+++ calibre/src/calibre/linux.py 2010-09-19 15:50:15.029705851 +0200 -@@ -334,52 +323,39 @@ class PostInstall: +--- a/src/calibre/linux.py 2011-05-27 18:42:14.000000000 +0200 ++++ b/src/calibre/linux.py 2011-05-29 14:57:49.000000000 +0200 +@@ -340,51 +340,39 @@ with TemporaryDirectory() as tdir: with CurrentDir(tdir): @@ -26,7 +25,7 @@ diff -rupN calibre.orig//src/calibre/linux.py calibre/src/calibre/linux.py mimetypes = set([]) for x in all_input_formats(): mt = guess_type('dummy.'+x)[0] -- if mt and 'chemical' not in mt: +- if mt and 'chemical' not in mt and 'ctc-posml' not in mt: + if mt and 'chemical' not in mt and 'text' not in mt and 'pdf' not in mt and 'xhtml' not in mt: mimetypes.add(mt) @@ -52,11 +51,10 @@ diff -rupN calibre.orig//src/calibre/linux.py calibre/src/calibre/linux.py - des = ('calibre-gui.desktop', 'calibre-lrfviewer.desktop', - 'calibre-ebook-viewer.desktop') - for x in des: -- cmd = ['xdg-desktop-menu', 'install', './'+x] -- if x != des[-1]: -- cmd.insert(2, '--noupdate') +- cmd = ['xdg-desktop-menu', 'install', '--noupdate', './'+x] - check_call(' '.join(cmd), shell=True) - self.menu_resources.append(x) +- check_call(['xdg-desktop-menu', 'forceupdate']) - f = open('calibre-mimetypes', 'wb') + dir = os.path.join(self.opts.staging_sharedir,'../mime/packages/') + os.makedirs(dir) |