From ec79a9033e98ebcdc0632ed2703b6881d716918d Mon Sep 17 00:00:00 2001 From: Jesús Eduardo Date: Mon, 15 May 2017 17:30:38 -0500 Subject: Calibre: Update v2.85.1 + fixed patch --- .../calibre/0001-Remove-new_version_notification.patch | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'libre/calibre/0001-Remove-new_version_notification.patch') diff --git a/libre/calibre/0001-Remove-new_version_notification.patch b/libre/calibre/0001-Remove-new_version_notification.patch index 432b3ae8d..a11c04323 100644 --- a/libre/calibre/0001-Remove-new_version_notification.patch +++ b/libre/calibre/0001-Remove-new_version_notification.patch @@ -1,8 +1,8 @@ diff --git a/src/calibre/gui2/__init__.py b/src/calibre/gui2/__init__.py -index a1cf1849d..6daa2e705 100644 +index 7238c97..1d4491f 100644 --- a/src/calibre/gui2/__init__.py +++ b/src/calibre/gui2/__init__.py -@@ -169,8 +169,6 @@ def _config(): # {{{ +@@ -168,8 +168,6 @@ def _config(): # {{{ help=_('Confirm before deleting')) c.add_opt('main_window_geometry', default=None, help=_('Main window geometry')) @@ -12,7 +12,7 @@ index a1cf1849d..6daa2e705 100644 help=_('Use Roman numerals for series number')) c.add_opt('sort_tags_by', default='name', diff --git a/src/calibre/gui2/preferences/behavior.py b/src/calibre/gui2/preferences/behavior.py -index 6db4cb1f3..51b7ed0a8 100644 +index 6db4cb1..51b7ed0 100644 --- a/src/calibre/gui2/preferences/behavior.py +++ b/src/calibre/gui2/preferences/behavior.py @@ -40,7 +40,6 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form): @@ -24,7 +24,7 @@ index 6db4cb1f3..51b7ed0a8 100644 r('delete_news_from_library_on_upload', config) diff --git a/src/calibre/gui2/preferences/behavior.ui b/src/calibre/gui2/preferences/behavior.ui -index 2926f767b..0ad998884 100644 +index ae4c20d..4bdfa6d 100644 --- a/src/calibre/gui2/preferences/behavior.ui +++ b/src/calibre/gui2/preferences/behavior.ui @@ -14,13 +14,6 @@ @@ -42,10 +42,10 @@ index 2926f767b..0ad998884 100644 diff --git a/src/calibre/gui2/update.py b/src/calibre/gui2/update.py -index 3e294cac3..d1ba09137 100644 +index 9ce55d0..ca68eb8 100644 --- a/src/calibre/gui2/update.py +++ b/src/calibre/gui2/update.py -@@ -125,11 +125,7 @@ class UpdateNotification(QDialog): +@@ -125,11 +125,6 @@ class UpdateNotification(QDialog): self.setWindowIcon(QIcon(I('lt.png'))) self.l.addWidget(self.logo, 0, 0) self.l.addWidget(self.label, 0, 1) @@ -54,11 +54,10 @@ index 3e294cac3..d1ba09137 100644 - self.l.addWidget(self.cb, 1, 0, 1, -1) - self.cb.setChecked(config.get('new_version_notification')) - self.cb.stateChanged.connect(self.show_future) -+ self.bb = QDialogButtonBox(self) b = self.bb.addButton(_('&Get update'), self.bb.AcceptRole) b.setDefault(True) -@@ -151,9 +147,6 @@ class UpdateNotification(QDialog): +@@ -151,9 +146,6 @@ class UpdateNotification(QDialog): initial_filter=FILTER_UPDATE_AVAILABLE) d.exec_() @@ -68,7 +67,7 @@ index 3e294cac3..d1ba09137 100644 def accept(self): open_url(QUrl(get_download_url())) -@@ -201,8 +194,7 @@ class UpdateMixin(object): +@@ -201,8 +193,7 @@ class UpdateMixin(object): self.status_bar.update_label.setVisible(True) if has_calibre_update: -- cgit v1.2.3