diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2009-05-25 23:23:37 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-05-25 23:23:37 +0000 |
| commit | 0f99d13c83d73ec4e9a1307551ea6d341094abde (patch) | |
| tree | cfa4ee24ddd1b21b6923da0ec963f88563141eed /app-text | |
| parent | Fix use of broken intltool. (diff) | |
| download | gentoo-2-0f99d13c83d73ec4e9a1307551ea6d341094abde.tar.gz gentoo-2-0f99d13c83d73ec4e9a1307551ea6d341094abde.tar.bz2 gentoo-2-0f99d13c83d73ec4e9a1307551ea6d341094abde.zip | |
25 May 2009; Zac Medico <zmedico@gentoo.org>
files/bug_270746_UnicodeEncodeError.patch, -calibre-0.5.13-r1.ebuild,
+calibre-0.5.13-r2.ebuild:
Bug #270746 - Update patch to solve another UnicodeDecodeError.
(Portage version: 2.2_rc33_p13615/cvs/Linux i686)
Diffstat (limited to 'app-text')
| -rw-r--r-- | app-text/calibre/ChangeLog | 9 | ||||
| -rw-r--r-- | app-text/calibre/calibre-0.5.13-r2.ebuild (renamed from app-text/calibre/calibre-0.5.13-r1.ebuild) | 2 | ||||
| -rw-r--r-- | app-text/calibre/files/bug_270746_UnicodeEncodeError.patch | 2 |
3 files changed, 10 insertions, 3 deletions
diff --git a/app-text/calibre/ChangeLog b/app-text/calibre/ChangeLog index 4c659c4eaa36..6a1dcaf10d0e 100644 --- a/app-text/calibre/ChangeLog +++ b/app-text/calibre/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for app-text/calibre # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.24 2009/05/22 02:13:32 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.25 2009/05/25 23:23:36 zmedico Exp $ + +*calibre-0.5.13-r2 (25 May 2009) + + 25 May 2009; Zac Medico <zmedico@gentoo.org> + files/bug_270746_UnicodeEncodeError.patch, -calibre-0.5.13-r1.ebuild, + +calibre-0.5.13-r2.ebuild: + Bug #270746 - Update patch to solve another UnicodeDecodeError. *calibre-0.5.13-r1 (22 May 2009) diff --git a/app-text/calibre/calibre-0.5.13-r1.ebuild b/app-text/calibre/calibre-0.5.13-r2.ebuild index bdbe89f4016a..ba26c2cf3685 100644 --- a/app-text/calibre/calibre-0.5.13-r1.ebuild +++ b/app-text/calibre/calibre-0.5.13-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.5.13-r1.ebuild,v 1.1 2009/05/22 02:13:32 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.5.13-r2.ebuild,v 1.1 2009/05/25 23:23:36 zmedico Exp $ EAPI=2 NEED_PYTHON=2.6 diff --git a/app-text/calibre/files/bug_270746_UnicodeEncodeError.patch b/app-text/calibre/files/bug_270746_UnicodeEncodeError.patch index d5302fd252fc..bd5559110096 100644 --- a/app-text/calibre/files/bug_270746_UnicodeEncodeError.patch +++ b/app-text/calibre/files/bug_270746_UnicodeEncodeError.patch @@ -5,6 +5,6 @@ '.PP', '.B Created by '+__author__] - return bz2.compress('\n'.join(lines)) -+ return bz2.compress(u'\n'.join(lines).encode('utf_8')) ++ return bz2.compress(u'\n'.join(isinstance(x, unicode) and x or unicode(x, 'utf_8', 'replace') for x in lines).encode('utf_8', 'replace')) |