]>
Commit | Line | Data |
---|---|---|
1068761e JR |
1 | --- calibre-2.44.1/src/calibre/linux.py.orig 2015-11-21 11:22:06.420641478 +0100 |
2 | +++ calibre-2.44.1/src/calibre/linux.py 2015-11-21 11:20:41.000000000 +0100 | |
3 | @@ -781,7 +781,7 @@ | |
4 | def install_single_icon(iconsrc, basename, size, context, is_last_icon=False): | |
5 | filename = '%s-%s.png' % (basename, size) | |
6 | render_img(iconsrc, filename, width=int(size), height=int(size)) | |
7b172d7e JR |
7 | - cmd = ['xdg-icon-resource', 'install', '--noupdate', '--context', context, '--size', unicode_type(size), filename, basename] |
8 | + cmd = ['xdg-icon-resource', 'install', '--noupdate', '--novendor', '--context', context, '--size', unicode_type(size), filename, basename] | |
1068761e JR |
9 | if is_last_icon: |
10 | del cmd[2] | |
11 | cc(cmd) | |
12 | @@ -850,7 +850,7 @@ | |
13 | ||
14 | APPDATA = get_appdata() | |
15 | for x in des: | |
16 | - cmd = ['xdg-desktop-menu', 'install', '--noupdate', './'+x] | |
17 | + cmd = ['xdg-desktop-menu', 'install', '--noupdate', '--novendor', './'+x] | |
18 | cc(' '.join(cmd), shell=True) | |
19 | self.menu_resources.append(x) | |
20 | ak = x.partition('.')[0] | |
7b172d7e JR |
21 | @@ -856,8 +856,7 @@ |
22 | MIME = P(MIME_BASE) | |
23 | self.mime_resources.append(MIME_BASE) | |
24 | if not getattr(self.opts, 'staged_install', False): | |
25 | - cc(['xdg-mime', 'install', MIME]) | |
26 | - cc(['xdg-desktop-menu', 'forceupdate']) | |
27 | + cc(['xdg-mime', 'install', '--novendor', MIME]) | |
28 | else: | |
29 | from shutil import copyfile | |
30 | copyfile(MIME, os.path.join(env['XDG_DATA_DIRS'], 'mime', 'packages', MIME_BASE)) |