diff options
| author |   Dror Levin <spatz@gentoo.org> | 2010-04-26 21:07:19 +0000 |
|---|---|---|
| committer | Dror Levin <spatz@gentoo.org> | 2010-04-26 21:07:19 +0000 |
| commit | 96ba51ddae4440a13f8917a9637c369b385f3b58 (patch) | |
| tree | 528f37151ba9f3bacb660f9f971b799a7ec50ed4 /app-text/fbreader | |
| parent | stable x86, bug 315147 (diff) | |
| download | gentoo-2-96ba51ddae4440a13f8917a9637c369b385f3b58.tar.gz gentoo-2-96ba51ddae4440a13f8917a9637c369b385f3b58.tar.bz2 gentoo-2-96ba51ddae4440a13f8917a9637c369b385f3b58.zip | |
Add patch for building with gcc-4.5, bug 317189. Thanks to Azamat H. Hackimov for the patch.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'app-text/fbreader')
| -rw-r--r-- | app-text/fbreader/ChangeLog | 7 | ||||
| -rw-r--r-- | app-text/fbreader/fbreader-0.12.10.ebuild | 4 | ||||
| -rw-r--r-- | app-text/fbreader/files/fbreader-0.12.10-gcc45.patch | 11 |
3 files changed, 20 insertions, 2 deletions
diff --git a/app-text/fbreader/ChangeLog b/app-text/fbreader/ChangeLog index 2d66b3ee3ee0..b56271c2ca83 100644 --- a/app-text/fbreader/ChangeLog +++ b/app-text/fbreader/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-text/fbreader # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/fbreader/ChangeLog,v 1.16 2010/04/08 17:13:01 spatz Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/fbreader/ChangeLog,v 1.17 2010/04/26 21:07:19 spatz Exp $ + + 26 Apr 2010; Dror Levin <spatz@gentoo.org> fbreader-0.12.10.ebuild, + +files/fbreader-0.12.10-gcc45.patch: + Add patch for building with gcc-4.5, bug 317189. Thanks to Azamat H. + Hackimov for the patch. *fbreader-0.12.10 (08 Apr 2010) diff --git a/app-text/fbreader/fbreader-0.12.10.ebuild b/app-text/fbreader/fbreader-0.12.10.ebuild index 70cffe1b7745..a1ad7df56614 100644 --- a/app-text/fbreader/fbreader-0.12.10.ebuild +++ b/app-text/fbreader/fbreader-0.12.10.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/fbreader/fbreader-0.12.10.ebuild,v 1.1 2010/04/08 17:13:01 spatz Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/fbreader/fbreader-0.12.10.ebuild,v 1.2 2010/04/26 21:07:19 spatz Exp $ EAPI=2 @@ -31,6 +31,8 @@ pkg_setup() { } src_prepare() { + epatch "${FILESDIR}/${P}-gcc45.patch" # bug 317189 + #Tidy up the .desktop file sed -i "s:^Name=E-book reader:Name=FBReader:" fbreader/desktop/desktop || die "sed failed" sed -i "s:^Name\[ru\]=.*$:Name\[ru\]=FBReader:" fbreader/desktop/desktop || die "sed failed" diff --git a/app-text/fbreader/files/fbreader-0.12.10-gcc45.patch b/app-text/fbreader/files/fbreader-0.12.10-gcc45.patch new file mode 100644 index 000000000000..ec32420fc70e --- /dev/null +++ b/app-text/fbreader/files/fbreader-0.12.10-gcc45.patch @@ -0,0 +1,11 @@ +--- fbreader-0.12.10-orig/fbreader/src/library/Library.cpp 2010-04-01 15:14:24.000000000 +0200 ++++ fbreader-0.12.10/fbreader/src/library/Library.cpp 2010-04-13 13:34:06.000000000 +0200 +@@ -39,7 +39,7 @@ + shared_ptr<Library> Library::ourInstance; + const size_t Library::MaxRecentListSize = 10; + +-Library::Library &Library::Instance() { ++Library &Library::Instance() { + if (ourInstance.isNull()) { + ourInstance = new Library(); + } |