diff options
| author |   Matteo Bernardini | 2020-11-07 10:39:25 +0100 |
|---|---|---|
| committer | Matteo Bernardini | 2020-11-07 10:39:25 +0100 |
| commit | 69c0dd02dd77d45035c7458bbb3507bfd659bc47 (patch) | |
| tree | 67e0545ccec095bdced5501bd94b7a7c8c6ac70a /office/calibre/patches/remove-desktop-integration.patch | |
| parent | 47e77153bd7179d5081b4608265a62a12059e36f (diff) | |
| download | slackbuilds-69c0dd02dd77d45035c7458bbb3507bfd659bc47.tar.gz | |
20201107.1 global branch merge.current-20201107.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): |