Add patch for building with gcc-4.5, bug 317189. Thanks to Azamat H. Hackimov for...

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/app-text/fbreader/ChangeLog b/app-text/fbreader/ChangeLog
index 2d66b3ee3ee08a1b51bf69f84ff41311c9a2a6f3..b56271c2ca83d3cd983ed914697bea69e483a7bc 100644 (file)
--- 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/Manifest b/app-text/fbreader/Manifest
index 49845ef787fe1e6dee5a3b9fedbd6757def444ec..718a5f8d91db233844267b2b707a39ef7293b126 100644 (file)
--- a/app-text/fbreader/Manifest
+++ b/app-text/fbreader/Manifest
@@ -1,20 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
+AUX fbreader-0.12.10-gcc45.patch 434 RMD160 bb38ae66203ea8459b40d9c955495bf668d718eb SHA1 4547fc9ce7f4f82e24c20a8781b828f66f9820a4 SHA256 d797728ea96f90e79dd28b57a58aafd8d469f67639947486ad380c3cd5bdc6cc
 DIST fbreader-sources-0.12.10.tgz 2337798 RMD160 63043c9b8e26b5511f4f7bc45637def723c9fef5 SHA1 982f526c9325fc4eaea3c01370580846c4cce7cc SHA256 328aec454db80e225aa0b5c31adef74bf62a14357482947e87e9731686b3c624
 DIST fbreader-sources-0.12.7.tgz 2335625 RMD160 791c0ddf77672f20b489145554379730cc7fcf59 SHA1 38bd4bbcb2fbe98fb57f5480798d4d3a2b35d01e SHA256 28aba11f5b5ac2b310e44ae9cdb1afe1faaeb5b4ca3d9af6349336ada8a30ac7
-EBUILD fbreader-0.12.10.ebuild 1906 RMD160 6cbf165e90a08c2c94c41ad8d8a91c717ac77d0c SHA1 15d2ebd099099fe6ccad94cd929224494c7a82ae SHA256 d94cf5330b883cc3a66376fb348762b0cedbb04d8d90c1d41108a6a5845be617
+EBUILD fbreader-0.12.10.ebuild 1959 RMD160 73b697ab729557d001ebd3c8e0d0e947fc48740b SHA1 b286b81045d5e59d6be0349d5383ab517b0cfe5c SHA256 48bac26179c6bc19458b29d354e9832b5da00fc29d545ecd449783c12acdb19f
 EBUILD fbreader-0.12.7.ebuild 1905 RMD160 e12de31a21a6d2fa4277dbf480cfcf6258553f0f SHA1 7f8acdd56133399f938f4d3e3df51d563134d5e4 SHA256 5ec85e5cab7be4a2cf0346624212c2ce7dfa4872a5a572c806f864a1a8c7d1df
-MISC ChangeLog 2735 RMD160 ee09677fcf38a75c204aac4761ea6c09113302f8 SHA1 77ec75e7b5bd94ce4f9f0d7336f1c00cb4aa48e9 SHA256 da643b23d2cb25e16157b87b5f9b089ec9fe90b5ff58acf5bbda9f270e3df735
+MISC ChangeLog 2942 RMD160 3c2b54d8840486aada31787b65fc0adbecd82d00 SHA1 a8ce2dcb60bee5aba9d30dffbe457b989fb5df30 SHA256 6752b857fba108a5ec70d4e187b5f38eadf0007d372fdc6251eaa7b7db24e185
 MISC metadata.xml 367 RMD160 a29770dbdf1951d724a3e9f4ff16be579f5748ea SHA1 6f8641392c21ed3963ef9bc96c4a1cc011995bda SHA256 ea449e9ab5b0604e10360c35f9646cf74e15a54bb6e937cea8b0479739e1a25f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
+Version: GnuPG v2.0.15 (GNU/Linux)
 
-iQEcBAEBCgAGBQJLvg6mAAoJEAWF714uGAc6NzcH/jPF+r5at95CmCPEJgWoRIY9
-DxhYOyMeUZ6xgH5hh4aNz0DcpDay/PX/iNciClbscGv4dipIhG44KKkuOrHhxZCf
-Q05XrYrZ+q4BkueYsdJo5zvIqyJYTNA6ogE4sxZxFUdAN4EPNMUcU6aj32Sc08DU
-qKPH6u8hyI2jdu3ca+WUF6r/Kb6CqusB19+xoRNuVb6GAwih+Eojbc2tndQKL0BD
-Sh5ab3jcTZq7v/aHnioI7p7SoXJnx7PZjtjdiCjD5TVrds0Ps5llBx6NJlol7Ueu
-Cd7jdq9dEBYjDtG87/nX5v9dDT4XyB5ITClqIOv6DqOE72t4n5eBQnoZ3ihVVYA=
-=OE18
+iQEcBAEBCgAGBQJL1gCQAAoJEAWF714uGAc6C2QIAJn0O0X00m4/pvOrJaV/I9Lw
+hGJsSYjsXfwBMIww90d1cV80cMAi5c0d14zpTRTXQ3PCW9yXLOOQg7coCqYCgLZN
+gsd7rxVrITMwtPpD4SUBnfXKlljvYUlztK2jVZBrtlvTEkZtuiuQgu2xKcROzqMi
+Br/MDRvCWfMM6Yei9bK9WbSJMJlI2jZ5PtbeHjy1SPoujY12AnxPvgiuILQfc6f6
+KukU1UNXXuOXlXB8yA4ikeUkl6xbsWAhmbGZaLytvF8EOUUx73Qt+V99ofMs3/qn
+IIL9NRtqYgz+ixXjr6KT3WmakRr+pz1bc9cz87GWJUxg9h+jwNUWPK1j3pkXEQU=
+=vlM+
 -----END PGP SIGNATURE-----

diff --git a/app-text/fbreader/fbreader-0.12.10.ebuild b/app-text/fbreader/fbreader-0.12.10.ebuild
index 70cffe1b774571a29bb4c2b2cfcc5fc63f3a8181..a1ad7df566146673173fc2afee1fccd685adc84c 100644 (file)
--- 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 (file)
index 0000000..ec32420
--- /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();
+       }