diff options
Diffstat (limited to 'office/calibre/patches')
| -rw-r--r-- | office/calibre/patches/calibre-module-fix.patch | 14 | ||||
| -rw-r--r-- | office/calibre/patches/calibre-no-update.patch | 24 | ||||
| -rw-r--r-- | office/calibre/patches/remove-desktop-integration.patch | 13 |
3 files changed, 0 insertions, 51 deletions
diff --git a/office/calibre/patches/calibre-module-fix.patch b/office/calibre/patches/calibre-module-fix.patch deleted file mode 100644 index 6c0ee5178b..0000000000 --- a/office/calibre/patches/calibre-module-fix.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Naur calibre.orig/setup/install.py calibre/setup/install.py ---- calibre.orig/setup/install.py 2010-03-05 21:13:33.000000000 +0000 -+++ calibre/setup/install.py 2010-03-07 00:07:41.000000000 +0000 -@@ -142,7 +142,9 @@ - - def install_env_module(self): - import distutils.sysconfig as s -- libdir = s.get_python_lib(prefix=self.opts.staging_root) -+ libdir = s.get_python_lib(prefix=(self.opts.staging_root + sys.prefix)) -+ if not os.path.exists(libdir): -+ os.makedirs(libdir) - try: - if not os.path.exists(libdir): - os.makedirs(libdir) diff --git a/office/calibre/patches/calibre-no-update.patch b/office/calibre/patches/calibre-no-update.patch deleted file mode 100644 index 99b9f7c099..0000000000 --- a/office/calibre/patches/calibre-no-update.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -Nur calibre-2.9.0.orig/src/calibre/gui2/update.py calibre-2.9.0/src/calibre/gui2/update.py ---- calibre-2.9.0.orig/src/calibre/gui2/update.py 2014-11-08 21:43:22.888681538 -0700 -+++ calibre-2.9.0/src/calibre/gui2/update.py 2014-11-08 21:45:27.363383815 -0700 -@@ -63,20 +63,6 @@ - while not self.shutdown_event.is_set(): - calibre_update_version = NO_CALIBRE_UPDATE - plugins_update_found = 0 -- try: -- version = get_newest_version() -- if version[:2] > numeric_version[:2]: -- calibre_update_version = version -- except Exception as e: -- prints('Failed to check for calibre update:', as_unicode(e)) -- try: -- update_plugins = get_plugin_updates_available(raise_error=True) -- if update_plugins is not None: -- plugins_update_found = len(update_plugins) -- except Exception as e: -- prints('Failed to check for plugin update:', as_unicode(e)) -- if calibre_update_version != NO_CALIBRE_UPDATE or plugins_update_found > 0: -- self.signal.update_found.emit(calibre_update_version, plugins_update_found) - self.shutdown_event.wait(self.INTERVAL) - - def shutdown(self): diff --git a/office/calibre/patches/remove-desktop-integration.patch b/office/calibre/patches/remove-desktop-integration.patch deleted file mode 100644 index dbf54d6cb0..0000000000 --- a/office/calibre/patches/remove-desktop-integration.patch +++ /dev/null @@ -1,13 +0,0 @@ -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 = [] - if islinux or isbsd: - self.setup_completion() -- if islinux or isbsd: -- self.setup_desktop_integration() -- self.create_uninstaller() - - from calibre.utils.config import config_dir - if os.path.exists(config_dir): |