3
0
Fork 0
forked from mirrors/nixpkgs

Merge pull request #38066 from jluttine/calibre-3.20.0

calibre: remove unnecessary patch
This commit is contained in:
Anderson Torres 2018-04-29 16:07:13 -03:00 committed by GitHub
commit 6cc732ebbe
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -13,15 +13,3 @@ diff -burN calibre-2.9.0.orig/src/calibre/gui2/main.py calibre-2.9.0/src/calibre
parser.add_option('--ignore-plugins', default=False, action='store_true',
help=_('Ignore custom plugins, useful if you installed a plugin'
' that is preventing calibre from starting'))
diff -burN 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-09 20:09:54.082231864 +0800
+++ calibre-2.9.0/src/calibre/gui2/update.py 2014-11-09 20:17:49.954767115 +0800
@@ -154,6 +154,8 @@
self.update_checker.signal.update_found.connect(self.update_found,
type=Qt.QueuedConnection)
self.update_checker.start()
+ else:
+ self.update_checker = None
def recalc_update_label(self, number_of_plugin_updates):
self.update_found(self.last_newest_calibre_version, number_of_plugin_updates)