summaryrefslogtreecommitdiff
path: root/libre/calibre-libre/desktop_integration.patch
diff options
context:
space:
mode:
Diffstat (limited to 'libre/calibre-libre/desktop_integration.patch')
-rw-r--r--libre/calibre-libre/desktop_integration.patch10
1 files changed, 6 insertions, 4 deletions
diff --git a/libre/calibre-libre/desktop_integration.patch b/libre/calibre-libre/desktop_integration.patch
index c98b225b8..9b20820e6 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-13 11:24:15.165257058 +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:
@@ -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,51 +645,32 @@
+@@ -657,71 +645,45 @@
with TemporaryDirectory() as tdir, CurrentDir(tdir), \
PreserveMIMEDefaults():
@@ -65,7 +65,7 @@ diff -aur calibre/src/calibre/linux.py calibre.new/src/calibre/linux.py
+ 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('edit.png', os.path.join(dir, 'calibre-ebook-tweak.png'))
++ render_img('tweak.png', os.path.join(dir, 'calibre-ebook-edit.png'))
mimetypes = set([])
for x in all_input_formats():
@@ -93,7 +93,9 @@ diff -aur calibre/src/calibre/linux.py calibre.new/src/calibre/linux.py
f.write(ETWEAK)
mt = [guess_type('a.' + x.lower())[0] for x in SUPPORTED]
f.write('MimeType=%s;\n'%';'.join(mt))
-@@ -710,18 +679,11 @@
+ f.close()
+- f = open('calibre-gui.desktop', 'wb')
++ f = open(os.path.join(dir, 'calibre-gui.desktop'), 'wb')
f.write(GUI)
write_mimetypes(f)
f.close()