diff options
| author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-02-17 17:32:01 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-02-17 17:32:01 -0300 |
| commit | 88e1da204a82b0e8c0fa1a9e42ecd1b86a08eab8 (patch) | |
| tree | 37421daac725a396555168b30cacc1868b02611e /libre/calibre-libre/desktop_integration.patch | |
| parent | 308f6ff034c928c0c4fc2ce168df7192ca2b1209 (diff) | |
| parent | 9e3260441a96b92953b3cfc91cf552f2d5177225 (diff) | |
Merge branch 'master' of vparabola:abslibre
Diffstat (limited to 'libre/calibre-libre/desktop_integration.patch')
| -rw-r--r-- | libre/calibre-libre/desktop_integration.patch | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/libre/calibre-libre/desktop_integration.patch b/libre/calibre-libre/desktop_integration.patch index 9b20820e6..da3c7a52e 100644 --- a/libre/calibre-libre/desktop_integration.patch +++ b/libre/calibre-libre/desktop_integration.patch @@ -1,6 +1,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 +--- calibre/src/calibre/linux.py 2014-02-07 04:19:59.000000000 +0100 ++++ calibre.new/src/calibre/linux.py 2014-02-08 13:07:09.925693077 +0100 @@ -451,18 +451,6 @@ self.setup_completion() if islinux or isbsd: @@ -29,7 +29,7 @@ diff -aur calibre/src/calibre/linux.py calibre.new/src/calibre/linux.py if not os.path.exists(os.path.dirname(f)): os.makedirs(os.path.dirname(f)) if zsh.dest: -@@ -657,71 +645,45 @@ +@@ -657,56 +645,37 @@ with TemporaryDirectory() as tdir, CurrentDir(tdir), \ PreserveMIMEDefaults(): @@ -99,12 +99,17 @@ diff -aur calibre/src/calibre/linux.py calibre.new/src/calibre/linux.py f.write(GUI) write_mimetypes(f) f.close() -- des = ('calibre-gui.desktop', 'calibre-lrfviewer.desktop', -- 'calibre-ebook-viewer.desktop', 'calibre-ebook-edit.desktop') +@@ -725,15 +694,9 @@ + translators = dict(get_all_translators()) + + APPDATA = get_appdata() - for x in des: - cmd = ['xdg-desktop-menu', 'install', '--noupdate', './'+x] - cc(' '.join(cmd), shell=True) - self.menu_resources.append(x) +- ak = x.partition('.')[0] +- if ak in APPDATA and os.access(appdata, os.W_OK): +- write_appdata(ak, APPDATA[ak], appdata, translators) - cc(['xdg-desktop-menu', 'forceupdate']) - f = open('calibre-mimetypes.xml', 'wb') + dir = os.path.join(self.opts.staging_sharedir,'../mime/packages/') @@ -112,8 +117,4 @@ diff -aur calibre/src/calibre/linux.py calibre.new/src/calibre/linux.py + f = open(os.path.join(dir, 'calibre.xml'), 'wb') f.write(MIME) f.close() -- self.mime_resources.append('calibre-mimetypes.xml') -- cc('xdg-mime install ./calibre-mimetypes.xml', shell=True) - except Exception: - if self.opts.fatal_errors: - raise + self.mime_resources.append('calibre-mimetypes.xml') |