diff options
| author |   Matteo Bernardini | 2020-04-24 13:43:20 +0200 |
|---|---|---|
| committer | Matteo Bernardini | 2020-04-24 13:43:20 +0200 |
| commit | 5002997e7b6f27fdd45f06fe15586c71d5620e31 (patch) | |
| tree | 5ebef2795dc0c1e0d1ebd0ee910fc7eb5a57273c /office/calibre/patches/remove-desktop-integration.patch | |
| parent | 19d21e0644ebff62d23b90dadba1e3409a56589d (diff) | |
| download | slackbuilds-5002997e7b6f27fdd45f06fe15586c71d5620e31.tar.gz | |
20200424.1 global branch merge.current-20200424.1
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
Diffstat (limited to 'office/calibre/patches/remove-desktop-integration.patch')
| -rw-r--r-- | office/calibre/patches/remove-desktop-integration.patch | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/office/calibre/patches/remove-desktop-integration.patch b/office/calibre/patches/remove-desktop-integration.patch index dbf54d6cb0..0272a7c6eb 100644 --- a/office/calibre/patches/remove-desktop-integration.patch +++ b/office/calibre/patches/remove-desktop-integration.patch @@ -1,13 +1,14 @@ -diff -Naur calibre.orig/src/calibre/linux.py calibre/src/calibre/linux.py ---- calibre.orig/src/calibre/linux.py 2012-06-29 04:53:39.000000000 +0000 -+++ calibre/src/calibre/linux.py 2012-07-03 02:57:13.834849391 +0000 -@@ -177,9 +177,6 @@ - self.mime_resources = [] +diff -Naur calibre-3.48.0.orig/src/calibre/linux.py calibre-3.48.0/src/calibre/linux.py +--- calibre-3.48.0.orig/src/calibre/linux.py 2019-09-13 04:46:46.000000000 +0200 ++++ calibre-3.48.0/src/calibre/linux.py 2020-03-04 15:02:49.789055000 +0100 +@@ -725,10 +725,6 @@ + self.appdata_resources = [] if islinux or isbsd: self.setup_completion() - if islinux or isbsd: - self.setup_desktop_integration() -- self.create_uninstaller() +- if not getattr(self.opts, 'staged_install', False): +- self.create_uninstaller() from calibre.utils.config import config_dir if os.path.exists(config_dir): |