fixed gcc-4.5 compilation, thanks to Sergey Dulko for patch. bug #333345

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

4 files changed, 44 insertions, 4 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index 2ab5bbb9b2e7..b7e582f91327 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-client/chromium
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.161 2010/08/18 03:33:27 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.162 2010/08/19 20:03:17 wired Exp $
+
+  19 Aug 2010; Alex Alexander <wired@gentoo.org> chromium-6.0.495.0.ebuild,
+  +files/chromium-6.0.495.0-gcc-4.5.patch:
+  fixed gcc-4.5 compilation, thanks to Sergey Dulko for patch. bug #333345
 
   18 Aug 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org> chromium-9999.ebuild:
   Remove ffmpeg from dependencies now that we use the bundled one.
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index ac41d1f53f37..a4c9b2dc7086 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -1,4 +1,8 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX chromium-20100122-ubuntu-html5-video-mimetypes.patch 1228 RMD160 69157e703e14138cc838ae26191ef42116f3f614 SHA1 f9bac7a6840c060c921119051cd724b7b53ff2fd SHA256 d6f8e5dabf8b55c3fb9ae58920807758e5d1aa76f536efc6f53949208a567566
+AUX chromium-6.0.495.0-gcc-4.5.patch 712 RMD160 6d0bd53822dae083210c236954a0145df61f6cd4 SHA1 fd0c51ea339dbf3f7fe6e9dffd5e5883a9149812 SHA256 12b925658513b203ea660b3ad633fc40041ee2144dce5091e661d07820a3baed
 AUX chromium-disable-vp8-r1.patch 1204 RMD160 22264b89adf908149e5405c316e4666c4eda4ad8 SHA1 7e104772a645f50449432d4c970d52ffc3555c8a SHA256 ebb9031cd447aca0f3d7f9a2b4081f64dd8244ffd90564ecab06724e1dda63e8
 AUX chromium-drop_sse2-r0.patch 1387 RMD160 5be0a252d4e99064e2cc5ba3fce33a5f525ba785 SHA1 a356549db631a7b147bf0046be8ab09d88874f15 SHA256 f035f196eea72855cf37d269810f4f99a5f348b7b8d7aaf537e35a11d6e1f1df
 AUX chromium-ffmpeg-compatibility-r0.patch 2387 RMD160 ccd054aee8f96de2ec8ba1509677be36a5dfd309 SHA1 cbe463c614ad44f162efe799557baaf108d23ca4 SHA256 5de829cc288d1cd3b5b3f6c2e4839cfdfcb958fc09ef4bb60cf4aacb6becdd67
@@ -18,7 +22,24 @@ EBUILD chromium-5.0.375.125.ebuild 5387 RMD160 dd089fb5b4332c0503a45d260c3ae3f0a
 EBUILD chromium-6.0.472.33-r1.ebuild 7022 RMD160 ad000d011fe6e293d989db7e3f404ea55d81dea2 SHA1 20c9d6719081dd9e948c7b301ad732a901573097 SHA256 feac2e77bd76af2328a6b5226669a54ea32a94abfd0c25d49bb7bf70f53f0052
 EBUILD chromium-6.0.472.36.ebuild 6888 RMD160 347fd77b66fab3fa35357846fa5c2159520d62ba SHA1 2dc964de8cdcfab36e4d8ef7b04ad4a20f237e85 SHA256 5cfc664a5dfb931a603998d92b7606c4a23d4ad3ac146527842d9e77d0aeba44
 EBUILD chromium-6.0.490.1.ebuild 6908 RMD160 8b572dbeac33e5a5bb2f19459c5d6319aa251912 SHA1 8bb48040ae22168583c8c121e5757494ebe02d99 SHA256 dacac79aac966c3b6ad2831945830ffaf590b73200d3e6f8847adfaeebb96fad
-EBUILD chromium-6.0.495.0.ebuild 6645 RMD160 57864cd821f12d1a0c018428aa74feb414074ba4 SHA1 0aa04f9a69ea752c0610fea93f51dcbb9f81bb22 SHA256 28d064a1c070148fc715775837c3812816e19f598db7ef10a53be44dd062ac8b
+EBUILD chromium-6.0.495.0.ebuild 6715 RMD160 e980073c1d1c11fb076f680f6fbfb094950646cf SHA1 a1ee76e2c78cfd196ed6da8615193c904a9673ff SHA256 52403d829e262fcd917dae28b97f945535e1546b0af5ed5a6f6671a7cfc90068
 EBUILD chromium-9999.ebuild 8402 RMD160 a28b12ebf20f203a74a3b476e873bb2d3979a84b SHA1 a0df83f5982216565a208dfe221c4b8b5f551a2a SHA256 0bdcdb2aaa33403d2892b27a09adc41851d3fbd60f82548e5375809710dca2e8
-MISC ChangeLog 35574 RMD160 bd3c9b54edad7bd0f127eb6239ee9a6c515db620 SHA1 d6e17510339fd96da17772f1c460c4b9eec51d32 SHA256 45a018b9d67a6bde6410e414665c86f964b556ee679b96bf6871e3614172c11e
+MISC ChangeLog 35764 RMD160 4fca8bfb55e6527e6617a2efa2b5eaff47e2a777 SHA1 7f135e5a6a1b7563f29f1f79dc4701b07e677b3f SHA256 ae93bb3200e4ad987df21bb33e25f4c96c90955100c865952a80fc4c65f0e823
 MISC metadata.xml 378 RMD160 3309b2d1fb60157d0da1e22070ba3c448bd46b74 SHA1 0a8d13bb94e9836a14255b724b738c5df1f8ed7e SHA256 7d02fdca1b3c68d1202c720f1987713c28e38b1f9f3e30cbc3138c000572f08e
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.12 (GNU/Linux)
+
+iQIcBAEBCAAGBQJMbY4NAAoJEDZF8K7rm0r6H/0P/3base2kJhRWaBIvAeaEN3Go
+2UUjyeUkqXmqIdIBdwsiywFp2///1iZU2edrStgTXzlb7kpLL3EK5aktu1C6vA7O
+uIFGrMeClIgrrbjRHU0rf9uUNNFtYnI132Q3/WJBYl/pdVGpapaI+F3RqpP0w/Qv
+DwfjebQh8TfJUDnCHyJd2mu2waVdRZex/L7x17YdskmucXYptnsuaPXj5pwAv1R+
+qDO2qdeRWo2MWNScwApFrT8JbGugN8YBGPm08N38vsg7RGy2MhxxuW8CWXDUUuTk
+UrewhMq+fBcBbCcpZXlyFi/Vu3CunertqxS/nqrTqaBWGczpu2nwhJ/IMN4y5enm
+7IlsUq+wi7upE00Tn9AVI9rYvJChPs40TAg0LH1nl+dtICuG7cXOzKI0AZFvfj0e
+/4ScdypqGL+zdLzc1xfghtkm52zTM1nZDKtH3awV423moVmrE/l/FjYyoBpcZwF7
+rGAglBPEKprFgi/8vgzAisb/k5VpNMdSuDi5z5ohtpcV7JWm4TavNw6msxLp0V6J
+E4Ki8zjcnEGjVcfCjDwsA+iAjdH9LIeVp3IhwAQjJyy0PYNUTgI3XEfaq2PJDoTE
+DfNbgmCDeJmwg3SNnz/1fkg7NM40cBf1Xr2c17ZbM4ZaLBQZe1IUP/wMnk1fXP4u
+4C9+g7E4h3dyLjE9xbVY
+=DWRb
+-----END PGP SIGNATURE-----
diff --git a/www-client/chromium/chromium-6.0.495.0.ebuild b/www-client/chromium/chromium-6.0.495.0.ebuild
index 6b2bc89676e3..00ac8344d51c 100644
--- a/www-client/chromium/chromium-6.0.495.0.ebuild
+++ b/www-client/chromium/chromium-6.0.495.0.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/www-client/chromium/chromium-6.0.495.0.ebuild,v 1.1 2010/08/18 01:04:37 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-6.0.495.0.ebuild,v 1.2 2010/08/19 20:03:17 wired Exp $
 
 EAPI="2"
 
@@ -62,6 +62,9 @@ src_prepare() {
 	# Add Gentoo plugin paths.
 	epatch "${FILESDIR}"/${PN}-plugins-path-r0.patch
 
+	# gcc 4.5 patch - bug #333345
+	epatch "${FILESDIR}"/"${P}"-gcc-4.5.patch
+
 	remove_bundled_lib "third_party/bzip2"
 	remove_bundled_lib "third_party/codesighs"
 	remove_bundled_lib "third_party/cros"
diff --git a/www-client/chromium/files/chromium-6.0.495.0-gcc-4.5.patch b/www-client/chromium/files/chromium-6.0.495.0-gcc-4.5.patch
new file mode 100644
index 000000000000..6b63d8f70a2b
--- /dev/null
+++ b/www-client/chromium/files/chromium-6.0.495.0-gcc-4.5.patch
@@ -0,0 +1,12 @@
+diff -Naur chromium-6.0.495.0_old/ipc/ipc_message_utils.h chromium-6.0.495.0/ipc/ipc_message_utils.h
+--- chromium-6.0.495.0_old/ipc/ipc_message_utils.h	2010-08-15 11:41:25.000000000 +0300
++++ chromium-6.0.495.0/ipc/ipc_message_utils.h	2010-08-18 21:38:48.000000000 +0300
+@@ -27,7 +27,7 @@
+ // ipc_message_utils_impl.h in those files) and exported, instead of expanded
+ // at every call site. Special note: GCC happily accepts the attribute before
+ // the method declaration, but only acts on it if it is after.
+-#define IPC_MSG_NOINLINE  __attribute__((noinline));
++#define IPC_MSG_NOINLINE  __attribute__((noinline, noclone));
+ #elif defined(COMPILER_MSVC)
+ // MSVC++ doesn't do this.
+ #define IPC_MSG_NOINLINE