diff options
| author | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2014-02-08 14:41:55 -0200 |
|---|---|---|
| committer | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2014-02-08 14:41:55 -0200 |
| commit | e6640cc7aa5f7fc46656cde74a5f4c2d4c412d34 (patch) | |
| tree | 0c265ab55cabd997d62fa777a314c83f370ba6dd /libre/calibre-libre/desktop_integration.patch | |
| parent | f9952fd6b962fe058e5beb2a417ec237bfddd50a (diff) | |
| download | abslibre-e6640cc7aa5f7fc46656cde74a5f4c2d4c412d34.tar.gz abslibre-e6640cc7aa5f7fc46656cde74a5f4c2d4c412d34.tar.bz2 abslibre-e6640cc7aa5f7fc46656cde74a5f4c2d4c412d34.zip | |
calibre-libre-1.23.0-1: updating version
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') |