From: Mike Gilbert Date: Sun, 18 Sep 2011 03:08:19 +0000 (+0000) Subject: Add workaround for build failure with zlib-1.2.5.1-r1. Bug 383371 by Chris Smith. X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=39d31eecbaeee03f796dfae75d0307ecf88ab70b;p=gentoo.git Add workaround for build failure with zlib-1.2.5.1-r1. Bug 383371 by Chris Smith. Package-Manager: portage-2.2.0_alpha58_p6/cvs/Linux x86_64 --- diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog index 8093560caf94..104a2952a767 100644 --- a/www-client/chromium/ChangeLog +++ b/www-client/chromium/ChangeLog @@ -1,6 +1,11 @@ # 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.445 2011/09/16 18:18:37 phajdan.jr Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.446 2011/09/18 03:08:19 floppym Exp $ + + 18 Sep 2011; Mike Gilbert chromium-14.0.835.163.ebuild, + chromium-15.0.874.15.ebuild, chromium-9999-r1.ebuild: + Add workaround for build failure with zlib-1.2.5.1-r1. Bug 383371 by Chris + Smith. *chromium-15.0.874.15 (16 Sep 2011) diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest index 123328a424f4..cc727b5c29a7 100644 --- a/www-client/chromium/Manifest +++ b/www-client/chromium/Manifest @@ -1,5 +1,5 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA512 +Hash: SHA256 AUX chromium-browser.xml 407 RMD160 457374ff72561648d9777ffb3270ad10d864a6be SHA1 65543bfff7d0350d40ba258e61061b0c5579e1f2 SHA256 bc039012f8677468e9ce5df825f9d8096be6deb5813031c86a087c88105096ff AUX chromium-cups-r0.patch 1237 RMD160 601fc9a46027580a1817a77abfb47b2b59e212ca SHA1 9826e90746229c7c12d767bb3b6cbdbc5c300041 SHA256 594af80456d977a19949909a7c79cae706964f7ced47634c9c9b19478dc089a2 @@ -30,17 +30,16 @@ DIST chromium-15.0.874.15.tar.bz2 151033498 RMD160 0aafe1e3c62262c6d76efdd8d5753 EBUILD chromium-13.0.782.215.ebuild 13227 RMD160 12c182f7a8075fd11f178e3453554c2ec622531a SHA1 e8b346b5fb66361d46226192bdbdffdc601498f5 SHA256 254756e4d874889efb4d46d712dd821d28fb816b117cf574031fa3ebd3dc66a0 EBUILD chromium-13.0.782.220.ebuild 13227 RMD160 4a50e648c6d826f76e75d97e8422a771f2f77b68 SHA1 d08d6027fa2f381d9e7b6507831e5a836c708835 SHA256 d4f3703ee8ad6c814fc2648fdc649442875b7c85b6ebf4f1b7c371fd06aa40a5 EBUILD chromium-14.0.835.162.ebuild 13179 RMD160 953ee6bd24599f27194859050fe65ad34211a347 SHA1 1d1afeee082a5eeac1ecc5104cf5720f0d58742d SHA256 dd2330d7a2befef68637810bdbc1549d04e890a35118416fa801d6a3fab4ed88 -EBUILD chromium-14.0.835.163.ebuild 13513 RMD160 cede77da61eb15c2b1b5bd4a6ed923fc7a75dc14 SHA1 14be5c0ed2c85b49c0b7a9a9dfbd5d03bf11fbc6 SHA256 7dfe3ede6cc7abfc7826a5ca888427f082a968d48539f28622997436b66e6708 +EBUILD chromium-14.0.835.163.ebuild 13694 RMD160 92284ba701e7c5864bf3072cf9ecf4ff627a8ee3 SHA1 ae8e065d7e88e19187b35fb830c72324a99d48bb SHA256 099b3226e545934d162f2194f5ea3815a65656cf16f08ceff149876314afa048 EBUILD chromium-15.0.874.12.ebuild 13884 RMD160 b97d6ab78ad3feeb2f9dd6ae13f70fe33f43f3c0 SHA1 fc0f75346af9931e533f009511239e6e12eb7606 SHA256 5d9b16edc4a89b5b277e84466e06e3b47c9ef24025a415a1d04d46a3e21ac810 -EBUILD chromium-15.0.874.15.ebuild 13888 RMD160 b9ce3ae57b01df804995125b90bea14a132980d9 SHA1 315d01cb6ecf5aab80cbe48ff5e71878b20d0015 SHA256 90c2ab023002fc94877b9504ffd309304b5f67e670a4cf6a6f02436abd850b1d -EBUILD chromium-9999-r1.ebuild 16473 RMD160 ab7639c0ffb5cc27c060e31a52cd5af38e6bfea0 SHA1 8654c727a534fb4f379d98aad897afdd696cf2ba SHA256 f9533b8dd81e0c34143d5ec0600751cae50263c8345e39959314104ab87dfb9b -MISC ChangeLog 98674 RMD160 cde90e81e4f03278e69ec76246bfed1ae4f766c8 SHA1 010b170face32800d7c66e39bab8f8415f2f373d SHA256 7b429782291b7d9d76f5af1e7f65ed42cb2c9b808972cf6702467cc8119d2e7c -MISC chromium-9999-r1.ebuild.orig 16469 RMD160 b1aaf4e721b8a9bc567c11a81cae62debe04f46d SHA1 6bb6113f799761a8176849c84740950e8649cdcb SHA256 4904a9f49fd9311e2b3f6c94451a649f734737377dff256b89c550f813d2752c +EBUILD chromium-15.0.874.15.ebuild 14066 RMD160 a9a633e0c69d10def0e4fa9b5b24b243a83e7a5d SHA1 20b313a3bc24f143a387a8cc45c169ad7366a5a9 SHA256 a983db355f72d76b9396df8a4751c1b0d94fb548f1f8e2f8d94ba015b1fd02fb +EBUILD chromium-9999-r1.ebuild 16651 RMD160 77d0c708ea3729d78f3344be783d79bd2dee46d8 SHA1 b707a400622bf548e3d883eb5c0e4e55b5da47a7 SHA256 6ff63c2455a1ee708c76ba30f448e08c38f97d61572ea3b9a3430422ddeab867 +MISC ChangeLog 98893 RMD160 b7836ad7eb42722b1fab1c8b6018707cfb1fa6e0 SHA1 36d11456e09f92b80a7d4f068d23bbc55d3dcb15 SHA256 6916f7294d253be6cb9595c64183f8e05b264c8f2ed2fe00e9e3fad060ac23f2 MISC metadata.xml 495 RMD160 91f2c4344cde85374523c8c16f5987ad0320b607 SHA1 5e97c7979fac0de374958532e38fcbca1191963b SHA256 375fb24d5d647728a58b3a7d0d552bf7d8eb5f26eef3c249dcf9a2dcb9e5bb37 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEAREKAAYFAk5zkwoACgkQuUQtlDBCeQI+MwCeIPCIHpRWPEzLlMTBTjb6Pfx3 -9A0AnjOhTHu7bQ38f4U8g0jtPYZUL/tk -=zofv +iF4EAREIAAYFAk51YK0ACgkQC77qH+pIQ6RekQD+KzvmdMd+7AOOqQbHDf7kO3Pz +gh4aJKnlEbawZ+rzeB4A/jVc+7X7gG+jZ+U4pZVMB7o0MBGMnUBFc5EnDPU5kcqg +=hU0S -----END PGP SIGNATURE----- diff --git a/www-client/chromium/chromium-14.0.835.163.ebuild b/www-client/chromium/chromium-14.0.835.163.ebuild index 1880636344ac..12455e63771d 100644 --- a/www-client/chromium/chromium-14.0.835.163.ebuild +++ b/www-client/chromium/chromium-14.0.835.163.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-14.0.835.163.ebuild,v 1.3 2011/09/15 21:33:59 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-14.0.835.163.ebuild,v 1.4 2011/09/18 03:08:19 floppym Exp $ EAPI="3" PYTHON_DEPEND="2:2.6" @@ -128,6 +128,11 @@ src_prepare() { # Fix build with system libevent, to be upstreamed. epatch "${FILESDIR}/${PN}-system-libevent-r0.patch" + # 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 + epatch_user # Remove most bundled libraries. Some are still needed. diff --git a/www-client/chromium/chromium-15.0.874.15.ebuild b/www-client/chromium/chromium-15.0.874.15.ebuild index c244964a6a27..95b444912a90 100644 --- a/www-client/chromium/chromium-15.0.874.15.ebuild +++ b/www-client/chromium/chromium-15.0.874.15.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-15.0.874.15.ebuild,v 1.1 2011/09/16 18:18:37 phajdan.jr Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-15.0.874.15.ebuild,v 1.2 2011/09/18 03:08:18 floppym Exp $ EAPI="3" PYTHON_DEPEND="2:2.6" @@ -124,6 +124,11 @@ pkg_setup() { src_prepare() { cp "${FILESDIR}/nacl.gypi" chrome/ || die + # 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 + epatch_user # Remove most bundled libraries. Some are still needed. diff --git a/www-client/chromium/chromium-9999-r1.ebuild b/www-client/chromium/chromium-9999-r1.ebuild index ab7bc828e557..45cc26e74281 100644 --- 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.54 2011/09/16 18:18:37 phajdan.jr Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild,v 1.55 2011/09/18 03:08:19 floppym Exp $ EAPI="3" PYTHON_DEPEND="2:2.6" @@ -174,6 +174,11 @@ pkg_setup() { } 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 + epatch_user # Remove most bundled libraries. Some are still needed.