From ec79a9033e98ebcdc0632ed2703b6881d716918d Mon Sep 17 00:00:00 2001
From: Jesús Eduardo <heckyel@openmailbox.org>
Date: Mon, 15 May 2017 17:30:38 -0500
Subject: Calibre: Update v2.85.1 + fixed patch

---
 ...-that-contacts-calibre-servers-to-check-u.patch | 29 ++++++----------------
 1 file changed, 8 insertions(+), 21 deletions(-)

(limited to 'libre/calibre/0001-Remove-code-that-contacts-calibre-servers-to-check-u.patch')

diff --git a/libre/calibre/0001-Remove-code-that-contacts-calibre-servers-to-check-u.patch b/libre/calibre/0001-Remove-code-that-contacts-calibre-servers-to-check-u.patch
index 443d9968b..fd08922eb 100644
--- a/libre/calibre/0001-Remove-code-that-contacts-calibre-servers-to-check-u.patch
+++ b/libre/calibre/0001-Remove-code-that-contacts-calibre-servers-to-check-u.patch
@@ -1,5 +1,7 @@
---- calibre-2.84.0/src/calibre/gui2/update.py.orig	2017-04-26 14:55:30.824093338 -0300
-+++ calibre-2.84.0/src/calibre/gui2/update.py	2017-04-26 15:00:09.807495982 -0300
+diff --git a/src/calibre/gui2/update.py b/src/calibre/gui2/update.py
+index 9ce55d0..04367de 100644
+--- a/src/calibre/gui2/update.py
++++ b/src/calibre/gui2/update.py
 @@ -1,19 +1,17 @@
  __license__   = 'GPL v3'
  __copyright__ = '2008, Kovid Goyal <kovid at kovidgoyal.net>'
@@ -14,9 +16,8 @@
 +        QLabel, QDialogButtonBox, QIcon)
  
 -from calibre.constants import (__appname__, __version__, iswindows, isosx,
--        isportable, is64bit, numeric_version)
 +from calibre.constants import (__appname__, iswindows, isosx,
-+        isportable, is64bit)
+         isportable, is64bit, numeric_version)
  from calibre import prints, as_unicode
 -from calibre.utils.config import prefs
 -from calibre.utils.https import get_https_resource_securely
@@ -25,7 +26,7 @@
  from calibre.gui2.dialogs.plugin_updater import get_plugin_updates_available
  
  URL = 'https://code.calibre-ebook.com/latest'
-@@ -30,35 +28,7 @@
+@@ -30,35 +28,7 @@ def get_download_url():
  
  
  def get_newest_version():
@@ -62,7 +63,7 @@
  
  
  class Signal(QObject):
-@@ -81,12 +51,6 @@
+@@ -81,12 +51,6 @@ class CheckForUpdates(Thread):
              calibre_update_version = NO_CALIBRE_UPDATE
              plugins_update_found = 0
              try:
@@ -75,18 +76,4 @@
                  update_plugins = get_plugin_updates_available(raise_error=True)
                  if update_plugins is not None:
                      plugins_update_found = len(update_plugins)
-@@ -193,13 +157,7 @@
-         self.status_bar.update_label.setText(msg)
-         self.status_bar.update_label.setVisible(True)
- 
--        if has_calibre_update:
--            if force:
--                if not no_show_popup:
--                    self._update_notification__ = UpdateNotification(calibre_version,
--                            number_of_plugin_updates, parent=self)
--                    self._update_notification__.show()
--        elif has_plugin_updates:
-+        if has_plugin_updates:
-             if force:
-                 from calibre.gui2.dialogs.plugin_updater import (PluginUpdaterDialog,
-                     FILTER_UPDATE_AVAILABLE)
+
-- 
cgit v1.2.3