Apply workaround for bug 383371 to zip_internal.cc. Reported by godmachine-x6.

Package-Manager: portage-2.2.0_alpha72/cvs/Linux x86_64

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index ac7b29c97be4b7a96b3235fd76554608e6744d72..39c2c95f7cc622c8f9da70d06b2ea6a607ba90fb 100644 (file)
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for www-client/chromium
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.496 2011/11/10 22:08:08 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.497 2011/11/10 23:49:09 floppym Exp $
+
+  10 Nov 2011; Mike Gilbert <floppym@gentoo.org> chromium-9999-r1.ebuild:
+  Apply workaround for bug 383371 to zip_internal.cc. Reported by godmachine-x6.
 
   10 Nov 2011; Mike Gilbert <floppym@gentoo.org> chromium-15.0.874.120.ebuild:
   Stable on amd64 based on testing by ago. Security bug 390113.

diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 1ffa4d8794e83b208ceac65bbedf4c99f6d4c4e1..2dce81707b985d85a7a6857d0fca41fe3607abb0 100644 (file)
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -25,13 +25,13 @@ EBUILD chromium-16.0.912.21.ebuild 16515 RMD160 d728f26b57f2dd94066e64a8d0f3d90a
 EBUILD chromium-16.0.912.32.ebuild 16586 RMD160 e29d4dc7be00d58d41d94a255248150b5cfd06c3 SHA1 1bb5ab45a737b1e591ccc3d96ec31045f229a1eb SHA256 ce270592808902eea3aa9808f3f66c7c50f764d6df7ad47879dac4142f3b90ff
 EBUILD chromium-17.0.928.0.ebuild 16551 RMD160 49104ce7304db68e7dca90f9610dd48ed3d8a5d4 SHA1 a002a02641d3b39054073f1dba7dbd64a989f4f2 SHA256 ebef48e9a561c86ed67ee9d36480e04baad3c50f76f85a1fbfb79334ac65cf92
 EBUILD chromium-17.0.932.0.ebuild 17029 RMD160 686813435c19fba1aefc15f44b29bb0a08cc8ee6 SHA1 09c3d043305adf69fdab67534d150fc333fd00af SHA256 13cd9efe528714bf9d463204a57f4d57c800cb44dc971dc939c03a1ac20e9826
-EBUILD chromium-9999-r1.ebuild 19014 RMD160 881b2e165e5826c722600f91b61c9add4da2fe92 SHA1 c0c2367afeea38b5d65535d1e05988580f81142b SHA256 c81768ddfae6e6ebaff831a189fd47f1b501935a5efdc6c12639b84b7ea40e61
-MISC ChangeLog 108647 RMD160 52b6e736b4a767f17c1eddd9ead0359e758011b3 SHA1 edb9010ac6e1e38702fd8b4289b57491ca39ce77 SHA256 ea4d37a509e7c4e00bfb9dd2dc09a926cf4275314c1ee3110b46525c6ef628d5
+EBUILD chromium-9999-r1.ebuild 19023 RMD160 aa10c7121e489d5fa3bfd6bc6d5e855d1a72fd34 SHA1 43a56e4e329257f2277d2261327b0e81fc8bd48e SHA256 eb5b2bcc7c65ac0ecb89bddd7cad7469c14e2a592c9669293421af97fcb2f692
+MISC ChangeLog 108803 RMD160 51818681b75d6ce8385844ec0fbf0bbed3d88b19 SHA1 19c2a294f089c9b8bb6f1818b73cf7b82815ce06 SHA256 de2eaa99e482a752a35f773c67efd186e95495f2ed0ac854ded5b0f72b148d9b
 MISC metadata.xml 267 RMD160 3a166415fec415d539c1b7c32ed40b188488b9fb SHA1 5c3d71a9cea27175cbe8c98369b42b79c8643c6c SHA256 4e6afae33f60d6752cacf2785f7f9a396b8711cce605b73d0d752a4af7d01fc8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk68S04ACgkQC77qH+pIQ6QScwEAkz8SVJczzZwR46w/0R7ZtOv0
-8uJP325Q4fSMytBWVqQBAK5FSiLlKRCU7jtWwbTK5S28L8rMmODip8nD0/Fp1GDW
-=yfL+
+iF4EAREIAAYFAk68YwIACgkQC77qH+pIQ6SAYwD/Tiy+6WmVdZ2+2VAxqZw5I9Vd
+GleGcGKW9DECLBtWAksBALFdbWJkOKvzW/puPKZ+qSWURBm50Ulu6PMRcXePjC+m
+=NusF
 -----END PGP SIGNATURE-----

diff --git a/www-client/chromium/chromium-9999-r1.ebuild b/www-client/chromium/chromium-9999-r1.ebuild
index eac7c5b7154f781ca5e021bcd317016f443997b6..030f4c6ad6685c8d8534dc7f24b320bd8ecf6f29 100644 (file)
--- a/www-client/chromium/chromium-9999-r1.ebuild
+++ b/www-client/chromium/chromium-9999-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild,v 1.74 2011/11/10 16:02:32 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild,v 1.75 2011/11/10 23:49:09 floppym Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2:2.6"
@@ -228,7 +228,7 @@ src_prepare() {
        # zlib-1.2.5.1-r1 renames the OF macro in zconf.h, bug 383371.
        sed -i '1i#define OF(x) x' \
                third_party/zlib/contrib/minizip/{ioapi,{,un}zip}.c \
-               chrome/common/zip.cc || die
+               chrome/common/zip{,_internal}.cc || die
 
        epatch_user