diff options
| -rw-r--r-- | office/calibre/calibre.SlackBuild | 4 | ||||
| -rw-r--r-- | office/calibre/calibre.info | 6 | ||||
| -rw-r--r-- | office/calibre/patches/calibre-no-update.patch | 24 |
3 files changed, 30 insertions, 4 deletions
diff --git a/office/calibre/calibre.SlackBuild b/office/calibre/calibre.SlackBuild index 9af01afca6..f19b533dd7 100644 --- a/office/calibre/calibre.SlackBuild +++ b/office/calibre/calibre.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=calibre -VERSION=${VERSION:-2.79.1} +VERSION=${VERSION:-2.80.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -74,6 +74,8 @@ find -L . \ patch -p1 < $CWD/patches/remove-desktop-integration.patch # Fix calibre module location. patch -p1 < $CWD/patches/calibre-module-fix.patch +# Remove calibre update check +patch -p1 < $CWD/patches/calibre-no-update.patch # Remove calibre portable scripts. rm -f resources/calibre-portable.* diff --git a/office/calibre/calibre.info b/office/calibre/calibre.info index 3e736e78cf..024a1b35a7 100644 --- a/office/calibre/calibre.info +++ b/office/calibre/calibre.info @@ -1,8 +1,8 @@ PRGNAM="calibre" -VERSION="2.79.1" +VERSION="2.80.0" HOMEPAGE="http://calibre-ebook.com" -DOWNLOAD="https://download.calibre-ebook.com/2.79.1/calibre-2.79.1.tar.xz" -MD5SUM="4f43cc7767df9d5f6df29c7d635474ee" +DOWNLOAD="https://download.calibre-ebook.com/2.80.0/calibre-2.80.0.tar.xz" +MD5SUM="be04e2159c65e1823c46bb2d938a25a6" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="cssutils dnspython lxml mechanize podofo python-dateutil netifaces psutil cssselect apsw optipng PyQt5 Pygments" diff --git a/office/calibre/patches/calibre-no-update.patch b/office/calibre/patches/calibre-no-update.patch new file mode 100644 index 0000000000..99b9f7c099 --- /dev/null +++ b/office/calibre/patches/calibre-no-update.patch @@ -0,0 +1,24 @@ +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): |