GCC 4.5 patch for beta channel by truedfx in bug #317155

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

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index c6e3a2e5fbe34346e84437cdc70e3e6d048c980a..248afe4ac5b6a28f4ab2e14129e5c4c277ea5e3e 100644 (file)
--- 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.89 2010/04/20 07:55:14 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.90 2010/04/26 11:43:49 voyageur Exp $
+
+  26 Apr 2010; Bernard Cafarelli <voyageur@gentoo.org>
+  +files/chromium-gcc45.patch, chromium-5.0.342.9.ebuild:
+  GCC 4.5 patch for beta channel by truedfx in bug #317155
 
   20 Apr 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
   chromium-5.0.375.9.ebuild, chromium-9999.ebuild:

diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index e637fe769f359c49ecae3df7b924bc6d03ca8b49..fe1c5d99d5b45100ddcf5c61649008195e6fa52a 100644 (file)
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -3,6 +3,7 @@ AUX chromium-drop_sse2-r0.patch 1387 RMD160 5be0a252d4e99064e2cc5ba3fce33a5f525b
 AUX chromium-drop_sse2-r1.patch 1593 RMD160 5ebe750acbb90c3c3f314330256cdc36f1cfa8d6 SHA1 e48733964d663ff332609e23b11563187df7a4a5 SHA256 bfce9e286fd2fbb66034243ade492607dac605e6593fd02fd5f1be508b9a944e
 AUX chromium-drop_sse2.patch 1560 RMD160 285a13c5a0d73b8cdadf8012adfb182a85392af8 SHA1 1aa9701b329d970db00726ba883d7dd5448ba372 SHA256 2da9ffbbaff5d00045b49ae75658df3c9f536543d388caff7a18ff093a0b1cd6
 AUX chromium-fix-make-build.patch 677 RMD160 b0dd0057d6f28e5d79b0bd9fd45b8e7cb79cbfcf SHA1 c7a7bf5fe81349f077a15458d66d53e1aa523f33 SHA256 8de8636ceedcbf0dc4f8494f48fd78baf261ef9334efe359d7e99bc668193c9e
+AUX chromium-gcc45.patch 655 RMD160 6d5ac8895dda520c5d1cc364a60a80b7576b1fa7 SHA1 fff6afa5c013b5c5efdb43c10262a4a09f024518 SHA256 b66ee24f118ef760c5279837897e3d2af5230b779543248466bf7c4f77cc5357
 AUX chromium-launcher.sh 602 RMD160 e01a871fbe36224aa24b6c448cdad8eb3c3b3f22 SHA1 b35dae7032a2967a1be5814cb442a245a9a166e7 SHA256 a9aa84e924e592b85e58a3ce5b245f34637180000f52ef3b615dd4e9a56a602b
 AUX chromium-libpng-1.4.patch 749 RMD160 1c024286ea635e393d12ed7a04c0412f8a47506b SHA1 e96283b523a14e8fb369838b35051c8ba0cc6f96 SHA256 b92ba935589f01b28a4ddeb5fd7fd42f8f643eaf1e24cafc2458d97fa1489d8e
 AUX chromium-supported-media-mime-types.patch 1016 RMD160 9b3fad22b90e4bea62e343c807349b1a7fce66f5 SHA1 5308bf7b3d0a0743031b089f4931c75c6696e46b SHA256 b396a3104d2dd3cfa8b9489072b565429d11634c0fce453861455b6b829c3ea3
@@ -10,9 +11,9 @@ AUX chromium.xml 390 RMD160 6b2f901da76555a7112f71a6f9dae6e2e3307324 SHA1 81148a
 DIST chromium-5.0.342.9.tar.bz2 155586284 RMD160 5ab3df8b19383c21d6279a96aa2e0c20074d58a2 SHA1 1823e1932fd68414042a3b5fc4537107ed3998bc SHA256 89a8072fc738afb7d6c5136f91deeeaa39de3d5285f3f471014af95038681903
 DIST chromium-5.0.371.0.tar.bz2 165863288 RMD160 9b0e195db6049fbca1fd9f3ebd64846bb3978984 SHA1 6f188628ff55519eea4b644afc5f7c4e24716e33 SHA256 92f21bcc8adf2e2136727188aa170530467004d073fbad8ab8e4dcb1f1ea226d
 DIST chromium-5.0.375.9.tar.bz2 248611435 RMD160 5fdf9ed277f0464ec4b925b3047658cca4d2120a SHA1 3277a872eb8ffe04b61f301136c9600671be15e7 SHA256 13cf5a64a414c2b3cec33735efbac0c23131607fcd37d5b9bb9ec1c9ec8481bd
-EBUILD chromium-5.0.342.9.ebuild 6477 RMD160 501a5608b94501dbea4124afccc18ddfff4009bd SHA1 0a6ebcfc916645985431f1392c0f70373bd3dd47 SHA256 ca181e9d8051eaec05efe26b0dc87fd30e00eb1bd8d3dc2252df6d8238a6cf43
+EBUILD chromium-5.0.342.9.ebuild 6548 RMD160 abb9d41541d252a60a61641ea76f6f7b1298bbcf SHA1 7f4e1c7f970b8f7a50247f27ca89bda3f064bb2a SHA256 6845b8905a1376ba8ec24ea09276d05b89d3b3c4da136d385260a4170b9e9d29
 EBUILD chromium-5.0.371.0.ebuild 6705 RMD160 4ecace29d830d36ea0eeca02272ba74258883f31 SHA1 f117fb77b34f0c7ccace47e04dfa06952f10e9f8 SHA256 df746bacaba24d923acd017f3f576b5c8775bfc72aae9cd9198bb4ef8152a12b
 EBUILD chromium-5.0.375.9.ebuild 6589 RMD160 1888aebc34e494b2bd640a970dbad4da615f4613 SHA1 3e1b189006d98fbfb677cad8db0da5743ff82180 SHA256 5bcc45d7f187ab3cc5ac247f4d2e6d604ce80f7069b71e2e0467a9fab7797f3a
 EBUILD chromium-9999.ebuild 8193 RMD160 49ca85aa7d1d01051cfd64a58c33aa270c5f88b1 SHA1 442c6f5a07e7666811ea05d4abd8b06b7e4ec7cd SHA256 778737030ac7d8a12597a71199ab7aaea6cae96f2939365002316590261f9e20
-MISC ChangeLog 20563 RMD160 666d74b715240388b6ac26bd488c7263ae2fe4a2 SHA1 b67f462cda0ed1f9ea038bcac44a4f081ac9d5b9 SHA256 8beda45a2202577127584d18367ba1d7c4a4ac24ea29cd04d74eed530db7e19d
+MISC ChangeLog 20734 RMD160 176422d23ec382b4c1da71d474e38e13c5eb1fcd SHA1 e1240e48dcca453f6e991ef99467330512e02816 SHA256 36f719ca6af371c1137fddb19f563ce32cafdd4cf6e7fea9f4cd14d276b67b24
 MISC metadata.xml 572 RMD160 458a635f4040d8552b46256c8437099608041b99 SHA1 6ed49919f57f709065cf06c148f1df68119a3b3f SHA256 4a433c3dadf06af7e3dca492ffaa3f26a6c4419de61a044609e2d528891e09a5

diff --git a/www-client/chromium/chromium-5.0.342.9.ebuild b/www-client/chromium/chromium-5.0.342.9.ebuild
index 0be03dd26fa88fbb4f99929ffacef86c21053fbd..1e7723b4a934b3022762d0fe871be1d0fe6b46ef 100644 (file)
--- a/www-client/chromium/chromium-5.0.342.9.ebuild
+++ b/www-client/chromium/chromium-5.0.342.9.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-5.0.342.9.ebuild,v 1.2 2010/04/14 13:05:53 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-5.0.342.9.ebuild,v 1.3 2010/04/26 11:43:49 voyageur Exp $
 
 EAPI="2"
 inherit eutils flag-o-matic multilib portability toolchain-funcs
@@ -94,6 +94,9 @@ src_prepare() {
        fi
        # Fix build failure with libpng-1.4, bug 310959.
        epatch "${FILESDIR}"/${PN}-libpng-1.4.patch
+       # GCC 4.5 support, bug #317155
+       epatch "${FILESDIR}"/${PN}-gcc45.patch
+
        # Prevent the make build from filling entire disk space on some systems,
        # bug 297273.
        epatch "${FILESDIR}"/${PN}-fix-make-build.patch

diff --git a/www-client/chromium/files/chromium-gcc45.patch b/www-client/chromium/files/chromium-gcc45.patch
new file mode 100644 (file)
index 0000000..2438a1b
--- /dev/null
+++ b/www-client/chromium/files/chromium-gcc45.patch
@@ -0,0 +1,13 @@
+--- chromium/sandbox/linux/seccomp/sandbox.cc
++++ chromium/sandbox/linux/seccomp/sandbox.cc
+@@ -444,8 +444,8 @@
+   }
+   processFdPub_                  = pair[0];
+   cloneFdPub_                    = pair[2];
+-  SecureMemArgs::Args* secureMem = createTrustedProcess(pair[0], pair[1],
+-                                                        pair[2], pair[3]);
++  SecureMemArgs* secureMem = createTrustedProcess(pair[0], pair[1],
++                                                  pair[2], pair[3]);
+ 
+   // We find all libraries that have system calls and redirect the system
+   // calls to the sandbox. If we miss any system calls, the application will be