]>
Commit | Line | Data |
---|---|---|
d770c022 JR |
1 | diff -urNp -x '*.orig' calibre-4.20.0.org/src/calibre/linux.py calibre-4.20.0/src/calibre/linux.py |
2 | --- calibre-4.20.0.org/src/calibre/linux.py 2021-06-23 14:08:51.192699952 +0200 | |
3 | +++ calibre-4.20.0/src/calibre/linux.py 2021-06-23 14:08:53.186104962 +0200 | |
4 | @@ -875,7 +875,7 @@ class PostInstall: | |
49a96cf0 JR |
5 | def install_single_icon(iconsrc, basename, size, context, is_last_icon=False): |
6 | filename = f'{basename}-{size}.png' | |
7 | render_img(iconsrc, filename, width=int(size), height=int(size)) | |
8 | - cmd = ['xdg-icon-resource', 'install', '--noupdate', '--context', context, '--size', str(size), filename, basename] | |
9 | + cmd = ['xdg-icon-resource', 'install', '--noupdate', '--novendor', '--context', context, '--size', str(size), filename, basename] | |
10 | if is_last_icon: | |
11 | del cmd[2] | |
12 | cc(cmd) | |
d770c022 | 13 | @@ -941,7 +941,7 @@ class PostInstall: |
1068761e | 14 | |
49a96cf0 JR |
15 | APPDATA = get_appdata() |
16 | for x in des: | |
17 | - cmd = ['xdg-desktop-menu', 'install', '--noupdate', './'+x] | |
18 | + cmd = ['xdg-desktop-menu', 'install', '--noupdate', '--novendor', './'+x] | |
19 | cc(' '.join(cmd), shell=True) | |
20 | self.menu_resources.append(x) | |
21 | ak = x.partition('.')[0] | |
d770c022 | 22 | @@ -951,8 +951,7 @@ class PostInstall: |
49a96cf0 JR |
23 | MIME = P(MIME_BASE) |
24 | self.mime_resources.append(MIME_BASE) | |
25 | if not getattr(self.opts, 'staged_install', False): | |
26 | - cc(['xdg-mime', 'install', MIME]) | |
27 | - cc(['xdg-desktop-menu', 'forceupdate']) | |
28 | + cc(['xdg-mime', 'install', '--novendor', MIME]) | |
29 | else: | |
30 | from shutil import copyfile | |
31 | copyfile(MIME, os.path.join(env['XDG_DATA_DIRS'], 'mime', 'packages', MIME_BASE)) |