| 1 |
axs 14/05/01 16:14:31 |
| 2 |
|
| 3 |
Added: calibre-1.34-no_updates_dialog.patch |
| 4 |
calibre-1.34-C-locale.patch |
| 5 |
Log: |
| 6 |
added conditional to not throw exception when locale is 'C', bug 508834; cleaned up no-dialog patch |
| 7 |
|
| 8 |
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 2B6559ED) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 app-text/calibre/files/calibre-1.34-no_updates_dialog.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/calibre/files/calibre-1.34-no_updates_dialog.patch?rev=1.1&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/calibre/files/calibre-1.34-no_updates_dialog.patch?rev=1.1&content-type=text/plain |
| 15 |
|
| 16 |
Index: calibre-1.34-no_updates_dialog.patch |
| 17 |
=================================================================== |
| 18 |
--- a/src/calibre/gui2/main.py 2014-01-17 11:49:16.000000000 +0800 |
| 19 |
+++ b/src/calibre/gui2/main.py 2014-01-18 18:28:53.322911344 +0800 |
| 20 |
@@ -37,8 +37,9 @@ |
| 21 |
help=_('Start minimized to system tray.')) |
| 22 |
parser.add_option('-v', '--verbose', default=0, action='count', |
| 23 |
help=_('Ignored, do not use. Present only for legacy reasons')) |
| 24 |
- parser.add_option('--no-update-check', default=False, action='store_true', |
| 25 |
- help=_('Do not check for updates')) |
| 26 |
+ parser.add_option('--update-check', dest='no_update_check', default=True, |
| 27 |
+ action='store_false', |
| 28 |
+ help=_('Check for updates')) |
| 29 |
parser.add_option('--ignore-plugins', default=False, action='store_true', |
| 30 |
help=_('Ignore custom plugins, useful if you installed a plugin' |
| 31 |
' that is preventing calibre from starting')) |
| 32 |
--- a/src/calibre/gui2/update.py 2014-04-24 22:02:21.000000000 -0400 |
| 33 |
+++ b/src/calibre/gui2/update.py 2014-05-01 12:02:27.631316967 -0400 |
| 34 |
@@ -139,6 +139,8 @@ |
| 35 |
self.update_checker.update_found.connect(self.update_found, |
| 36 |
type=Qt.QueuedConnection) |
| 37 |
self.update_checker.start() |
| 38 |
+ else: |
| 39 |
+ self.update_checker = None |
| 40 |
|
| 41 |
def recalc_update_label(self, number_of_plugin_updates): |
| 42 |
self.update_found('%s%s%d'%(self.last_newest_calibre_version, VSEP, |
| 43 |
--- a/src/calibre/gui2/ui.py 2014-04-24 22:02:21.000000000 -0400 |
| 44 |
+++ b/src/calibre/gui2/ui.py 2014-05-01 11:53:58.371307671 -0400 |
| 45 |
@@ -858,7 +858,8 @@ |
| 46 |
if write_settings: |
| 47 |
self.write_settings() |
| 48 |
self.check_messages_timer.stop() |
| 49 |
- self.update_checker.terminate() |
| 50 |
+ if self.update_checker is not None: |
| 51 |
+ self.update_checker.terminate() |
| 52 |
self.listener.close() |
| 53 |
self.job_manager.server.close() |
| 54 |
self.job_manager.threaded_server.close() |
| 55 |
|
| 56 |
|
| 57 |
|
| 58 |
1.1 app-text/calibre/files/calibre-1.34-C-locale.patch |
| 59 |
|
| 60 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/calibre/files/calibre-1.34-C-locale.patch?rev=1.1&view=markup |
| 61 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/calibre/files/calibre-1.34-C-locale.patch?rev=1.1&content-type=text/plain |
| 62 |
|
| 63 |
Index: calibre-1.34-C-locale.patch |
| 64 |
=================================================================== |
| 65 |
--- a/src/calibre/spell/dictionary.py 2014-05-01 11:38:04.051290252 -0400 |
| 66 |
+++ b/src/calibre/spell/dictionary.py 2014-05-01 11:37:55.061290088 -0400 |
| 67 |
@@ -52,7 +52,7 @@ |
| 68 |
raw = raw or '' |
| 69 |
parts = raw.replace('_', '-').split('-') |
| 70 |
lc = canonicalize_lang(parts[0]) |
| 71 |
- if lc is None: |
| 72 |
+ if lc is None and raw != 'C': |
| 73 |
raise ValueError('Invalid language code: %r' % raw) |
| 74 |
cc = None |
| 75 |
if len(parts) > 1: |
Archives