diff options
-rw-r--r-- | www-client/chromium/ChangeLog | 9 | ||||
-rw-r--r-- | www-client/chromium/Manifest | 16 | ||||
-rw-r--r-- | www-client/chromium/chromium-23.0.1271.10.ebuild (renamed from www-client/chromium/chromium-23.0.1271.1.ebuild) | 16 | ||||
-rw-r--r-- | www-client/chromium/chromium-9999-r1.ebuild | 9 | ||||
-rw-r--r-- | www-client/chromium/metadata.xml | 3 |
5 files changed, 35 insertions, 18 deletions
diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog index 3550cf435ec0..d2f67cd5660c 100644 --- a/www-client/chromium/ChangeLog +++ b/www-client/chromium/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for www-client/chromium # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.721 2012/09/27 11:24:50 phajdan.jr Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.722 2012/09/28 18:18:47 phajdan.jr Exp $ + +*chromium-23.0.1271.10 (28 Sep 2012) + + 28 Sep 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org> + -chromium-23.0.1271.1.ebuild, +chromium-23.0.1271.10.ebuild, + chromium-9999-r1.ebuild, metadata.xml: + Dev channel bump. Add experimental tcmalloc USE flag. Remove old. *chromium-23.0.1271.6 (27 Sep 2012) diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest index a5db15565a5d..51f491dcb81d 100644 --- a/www-client/chromium/Manifest +++ b/www-client/chromium/Manifest @@ -25,20 +25,20 @@ AUX chromium.default 147 SHA256 de16d72d77ac9fe04f781df4f50dfb714ba33574755932df AUX dot-gclient 253 SHA256 8c5750251ff681044cc584ef3768fe39c56c7877ade5fb9107298734126e62cf SHA512 96d4ffd01fec2773d7beaf2bc82b8eb969556f6e859e39136b4044521c5b8bfd36c13a7f2fcc64613935d4703d8ede8a56c7ce581a7732642cb8ee71039c801e WHIRLPOOL 6a65521487fa353a22f192c567b487c77a405e068c88898e0d8045b3de26bdd54ed736f104e495598e0cc8703d3f6abc80f8b2ea1e254007dfb18f50294e8c07 DIST chromium-22.0.1229.79.tar.bz2 210410507 SHA256 06cab1c48092def5bd94e9f4aa764f6ff5728ce35bbcdcc12fddbad3a0f0f738 SHA512 149666d8e185e4080c1cd7ab153edca2f4833be5beceef51b20e8cbd238030330ec1230cd3a9640bea2d02134683437bba7c809b2f5e13178d4a4e169321c717 WHIRLPOOL acf93160f2b096090a90e2718474477b40b67e8486a8ab7edca777268d4cd2799081cef8a73592302bd07248bdf831486f95873c6ac9b8e031587f3b1e5f739f DIST chromium-22.0.1229.91.tar.bz2 210386491 SHA256 dc375b6120352247bccc754863fe7c1d57b87abdb26e49187762020ecbca87ac SHA512 85d1f6f945ca906c7379f8c5933d3e6195853dfabe7e53b26ded32d68cdb55325c019b010c6b0c90ed7f7eca56b7108505114551ab876963c4c21574b0749016 WHIRLPOOL a23cc10ca767255d56b41cdfd0106cd0e294d6ede78d30ce49eebc55b106f8efba0bee8c48aceda6fe390ee428aa81703063733c221b0488907f2cc5e03477e8 -DIST chromium-23.0.1271.1.tar.bz2 217461161 SHA256 090a5002269d175325bca0573c4cbbd5e26d058a356c539d32a6facc82dc5aa6 SHA512 e5874538f027e1dc0cfeee97654af0fc7e4e99b38eae316912fd6fa6aa56dc0fa39b91d7d1828e5a6be16cb246f4161beea1d2cd436bd976e1c6a4575f2c4259 WHIRLPOOL a123ceefd9c18f5e250b3448a8c2fc6577a519d7db8a09a8cc9d7c288cc7e350b0fdf4077c2f885dcd6c9690dddd2f7438752d707fd8efb47692791f90b76922 +DIST chromium-23.0.1271.10.tar.bz2 217667194 SHA256 c31b047cd02a3196cfa7ddbe676357c20c2be87137e61e8475149d842d74a9ca SHA512 66e5c145e4af21fa0c611ca6bc029ba608bb0c70cca112a3b1b4aa8d5d162f04415e85a6ff9f6d6f079897c6edf88fa9e20ef1f3703392d899a2ac7186e20fac WHIRLPOOL 69369be5278d26868f27e988e205d5b68dda5aed2e92ed91519979e8ce4e84a9ede00b50a83e1778fff9f81d6b613e217f23d040aba2a4890f40df562f0e2d12 DIST chromium-23.0.1271.6.tar.bz2 217450125 SHA256 d8e4ac36745fecefe05b793a396129ad0c985ae4bb52ffa28362f1cd0b6160d3 SHA512 bbbd931da280d62fbc6076a5723b4b006fb7da033ba79f7284951841e06d21fe405b830e55066d739c53ff558135b3e7b354bfd55b2666b74734b807630725e3 WHIRLPOOL cff15211be1fd990eff55001cc4125ac5bce0aff155bee21bc0980c3688311bdd0158b406d6eef2238de3c562d83fc0ea43d775ae49f9796f4970e56332ca377 EBUILD chromium-22.0.1229.79.ebuild 14060 SHA256 6a2110467e314b8188127323a39e8461e62e13d38097de3359cd071065221bc6 SHA512 932ae897862acaf510c1f530367b2f81678ef246cc077e614cb0a6b8cd47f81f54d7a03a0975bd20b5c370aa7955dd86adfd6018314dcef88237fcc2619bf22f WHIRLPOOL f561d4316d29fbf4ec3959d44eed4b3cfd15706c944e7105ae0e6d8990b8c99a47f5b441d9a6f142d748b252a7e5d696be47352a6957d0bb0d75ac3aedf28ee0 EBUILD chromium-22.0.1229.91.ebuild 14059 SHA256 e84a71bef9cba30b9e65aa23264c7937adea47c500300925d1c7c5bb727e41ef SHA512 32a9cf899162cad4a341d02b5e0d5402e9277253e9de77e3ac7e41d56a4e93489bbe6bdf1626b07c753a6cd05aaad8d8bae1f97bf4f5c092eca67e38834064a9 WHIRLPOOL 84f4524175d4778f99c7adf6e31f1fa15f759be1c850fd5f174b398b414a9cc9fc8a7bc21eff3b2784ec5734726b74a2f92e6c37e23511801b8ae096f3913293 -EBUILD chromium-23.0.1271.1.ebuild 14934 SHA256 8798191ccb68d0d3c5071718f01416615eaad99a63ccbcfae7bd16090529668f SHA512 d215a1554ce960b9f249fc2cd3299b5c1fd3bd0c50613e8037b2e402ae3eec971193a16e3ac502e0ef193d857eb83f5bd3aea23056cc4374113ed73699566a30 WHIRLPOOL 704572a03502eada66186a78aa54fd7c293170f328d778de85ba2e0168861ccb602650d211f86e425aa28051ff9b3fe29afbefa653aff982236125a2488dfc92 +EBUILD chromium-23.0.1271.10.ebuild 15168 SHA256 995931d6c8fb0776dbfb49543ac51332df34a9be25275deba3d3bc52eb17f379 SHA512 3258cbde3791f26d0bf2455a787835955c7a1d23ddb6fe173405fbe0791304d1ccebfe162d3c7b0a7e17d46bcbe985bf1b639c77fdbc5b00b7e9042ec1f58f01 WHIRLPOOL 551c32aed9483bebf201b5cf886c74e80700c700ca8184b18feb49a17b424ccd3c25cf0c48bc95a269394146aacc09a3cdd0d3e6945784f51b415586bbe047a4 EBUILD chromium-23.0.1271.6.ebuild 15098 SHA256 1f74c94ae2ad043365a196198f60d21642276c688d8c4b15b88c2722a4e3ed3e SHA512 1c5de343570b5f52e22159ea2af8bed4d75419656dff732e9daa3951b07c02c575a6cf0ad2f60dbab144ac8f91f8ebb3092fa69fb324befa04071e4d893d6fd2 WHIRLPOOL ee8f6ca1197a30ed904a4b9b5c448ab2f57c985540d6cd8e02a61077287fce34bc4e0850d9e3a3406482934dd6099d00b9fa912a01804b7b3cf84bce94df0d8d -EBUILD chromium-9999-r1.ebuild 16054 SHA256 4de10c41276443677a0baa0cc0f70aa9d1207280ea9f8114dc780a9a91ac09c8 SHA512 da983d1a29ead840999679abb6c28e4a77ccfab4a860e776641490fc6a268fe7a73d976e4748ca724c06867bf8c8d35485c45aa24e7621e17adf8d30b028dd31 WHIRLPOOL b32c956bf3cd8cfd7c0386c54084018231b83132c3944be47a5d82cf1167998b725e907fda2b57d7074ad7280f97c3d102cd7fd056712b98b7c9e7f9970804a0 -MISC ChangeLog 38425 SHA256 ba6a48b64c0f186f191b852dfe78d3ef881c310f0db791d336591d4cab1ca2eb SHA512 5f9d7b21285d403fee02d5d262fbe5b615e1aba4058c2b22a43e35c225a606d4b5586473c5a119312006028dc2dd5ade9f6a2b700be9f1906a880ea23d4d6d5f WHIRLPOOL f8d8bea929fcd045ef452394144829dc75a7524afb40bc97ee0aaf32b9a50d8818e94fe9a4452ac2629e566d87aec70ff8bdc15b993b77b8290516cfdfcc17f8 +EBUILD chromium-9999-r1.ebuild 16123 SHA256 d3daa9b45fce747966ebcda3279f56e6025bb30f9c7fbc58fc11670ec0e7261c SHA512 0355d65c55e2b07d568db82fe8c24f33d8043d0543a12d31c0466cac4b8733707c45784d996f1e16cdb40332a873dca9ed095e6b172f538857c50df420be8c84 WHIRLPOOL 3cc40ee328b84995b8fd570edb2a08187d282f6e07bcc926e68f05c15035bca0692829b8f50db01138c25a5745fafe1a8961fdb215bc264cc5fcb6227681e8cc +MISC ChangeLog 38691 SHA256 5e639a5dea039bea07f06ecd67151c5ba50afa192b8221e9fd87a68569819cf2 SHA512 28161e00f9c5158958b7d9ac5da398abdbd1441ee189f8cefe27fe2a681a5f12e057c45416a7dcde301bd856d06833bfe6e51dbdf85818aa4fec00fe2c317bc5 WHIRLPOOL 2d32b07685401713d0bcb7a290b5788d259c9fa863e421e7996ace6ec0051b767c0059d0890bfc9c1f1a41184015360d32ca84c34c0c58bfe30c7685daaab57c MISC ChangeLog-2011 114031 SHA256 e2c2c75785c5eaf78b6efe01e357279cbb7be0c89d00b4053f475e963916fa54 SHA512 8e14759348333bdbd7c338080472789d7bbb1ece1ca5817bac6306bdcb33dda1e23bf3055cbb3b7bcee9362b6900bba1ace7ba73f353570a74d3ed761c9198cc WHIRLPOOL 810b6423c53f892a4b0964380b8190dec2a8783d560a9cb0baec93a77d879186201055382ca05975ae242e16728529ae85445db003fdd425355292d17817157b -MISC metadata.xml 267 SHA256 4e6afae33f60d6752cacf2785f7f9a396b8711cce605b73d0d752a4af7d01fc8 SHA512 f6d64d50bfbfad74db0ca0454fcba335a1744d11a44f921f19545c478219c507994cfcaba13160215cbb5a77d0bc82cdbf64a90a4b1b169184e404e404f9029e WHIRLPOOL 66a5cdeac3a86b910040d4c601fef50465fb0e0a0805e6b1c22cde2a83a63a2a1d441643af5454775becdfc65c71116d00b27703a7dd15ced183fb223c32f075 +MISC metadata.xml 360 SHA256 4c2cd208e61300491a73f23e90a6d1b447a4e0d16ad8f54ae68408eb94357e60 SHA512 f70a2eaefadf05baa375064fcc452982cbf6a5e775ba5b8fc49780ddc3910f8d18f9e5713b8ef083567f2d0bde53f8f9626afa4b4bed7b9b1ad30f444e42c14c WHIRLPOOL 6d7df2df36e34a6111c869f90636876cf30883c623d594e3a4830b156e2f14e938a739e5cf4089cd2ff7b4fb79d0e323725b984cbee9d466d735971ad2555f06 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iEYEAREIAAYFAlBkN44ACgkQuUQtlDBCeQKBKACcDQjY2G/CMmYWiOJKI1CnXwuZ -MikAoIKKTKI1yf0kOJGSdsp41JWN8ML/ -=Lu2I +iEYEAREIAAYFAlBl6hQACgkQuUQtlDBCeQLbKgCggnPyuX/T0DbLvSWx0YdMNAYv +nEkAnRiNk8yWKnusqX6EK3OHNLySH/TR +=DJS2 -----END PGP SIGNATURE----- diff --git a/www-client/chromium/chromium-23.0.1271.1.ebuild b/www-client/chromium/chromium-23.0.1271.10.ebuild index 079c79d600a8..383616ae3f05 100644 --- a/www-client/chromium/chromium-23.0.1271.1.ebuild +++ b/www-client/chromium/chromium-23.0.1271.10.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-23.0.1271.1.ebuild,v 1.1 2012/09/23 12:37:33 phajdan.jr Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-23.0.1271.10.ebuild,v 1.1 2012/09/28 18:18:47 phajdan.jr Exp $ EAPI="4" PYTHON_DEPEND="2:2.6" @@ -19,7 +19,7 @@ SRC_URI="http://commondatastorage.googleapis.com/chromium-browser-official/${P}. LICENSE="BSD" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="bindist cups gnome gnome-keyring kerberos pulseaudio selinux" +IUSE="bindist cups gnome gnome-keyring kerberos pulseaudio selinux tcmalloc" RDEPEND="app-arch/bzip2 cups? ( @@ -27,7 +27,6 @@ RDEPEND="app-arch/bzip2 >=net-print/cups-1.3.11 ) >=dev-lang/v8-3.11.10.6 - dev-libs/dbus-glib >=dev-libs/elfutils-0.149 dev-libs/expat >=dev-libs/icu-49.1.1-r1 @@ -110,6 +109,12 @@ src_prepare() { # Fix build without NaCl glibc toolchain. # epatch "${FILESDIR}/${PN}-ppapi-r0.patch" + # Fix unnecessary dependency on dbus-glib, bug #434346. + epatch "${FILESDIR}/${PN}-dbus-glib-r0.patch" + + # Fix build with system ICU. + epatch "${FILESDIR}/${PN}-system-icu-r0.patch" + # Missing gyp files in tarball. # https://code.google.com/p/chromium/issues/detail?id=144823 # if [[ -e chrome/test/data/nacl/nacl_test_data.gyp ]]; then @@ -174,6 +179,7 @@ src_prepare() { \! -path 'third_party/smhasher/*' \ \! -path 'third_party/speex/*' \ \! -path 'third_party/sqlite/*' \ + \! -path 'third_party/tcmalloc/*' \ \! -path 'third_party/tlslite/*' \ \! -path 'third_party/trace-viewer/*' \ \! -path 'third_party/undoview/*' \ @@ -210,9 +216,9 @@ src_configure() { # additions, bug #336871. myconf+=" -Ddisable_sse2=1" - # Disable tcmalloc, it causes problems with e.g. NVIDIA + # Optional tcmalloc. Note it causes problems with e.g. NVIDIA # drivers, bug #413637. - myconf+=" -Dlinux_use_tcmalloc=0" + myconf+=" $(gyp_use tcmalloc linux_use_tcmalloc)" # TODO: re-enable nacl after fixing build errors, see # http://forums.gentoo.org/viewtopic-t-937222-highlight-chromium.html diff --git a/www-client/chromium/chromium-9999-r1.ebuild b/www-client/chromium/chromium-9999-r1.ebuild index 2f9f213c1ec8..e46ab350f17e 100644 --- a/www-client/chromium/chromium-9999-r1.ebuild +++ b/www-client/chromium/chromium-9999-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 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.136 2012/09/27 11:24:50 phajdan.jr Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild,v 1.137 2012/09/28 18:18:47 phajdan.jr Exp $ EAPI="4" PYTHON_DEPEND="2:2.6" @@ -19,7 +19,7 @@ ESVN_REPO_URI="http://src.chromium.org/svn/trunk/src" LICENSE="BSD" SLOT="live" KEYWORDS="" -IUSE="bindist cups gnome gnome-keyring kerberos pulseaudio selinux" +IUSE="bindist cups gnome gnome-keyring kerberos pulseaudio selinux tcmalloc" RDEPEND="app-arch/bzip2 cups? ( @@ -210,6 +210,7 @@ src_prepare() { \! -path 'third_party/smhasher/*' \ \! -path 'third_party/speex/*' \ \! -path 'third_party/sqlite/*' \ + \! -path 'third_party/tcmalloc/*' \ \! -path 'third_party/tlslite/*' \ \! -path 'third_party/trace-viewer/*' \ \! -path 'third_party/undoview/*' \ @@ -246,9 +247,9 @@ src_configure() { # additions, bug #336871. myconf+=" -Ddisable_sse2=1" - # Disable tcmalloc, it causes problems with e.g. NVIDIA + # Optional tcmalloc. Note it causes problems with e.g. NVIDIA # drivers, bug #413637. - myconf+=" -Dlinux_use_tcmalloc=0" + myconf+=" $(gyp_use tcmalloc linux_use_tcmalloc)" # TODO: re-enable nacl after fixing build errors, see # http://forums.gentoo.org/viewtopic-t-937222-highlight-chromium.html diff --git a/www-client/chromium/metadata.xml b/www-client/chromium/metadata.xml index 47002a437f00..85980df243d7 100644 --- a/www-client/chromium/metadata.xml +++ b/www-client/chromium/metadata.xml @@ -3,4 +3,7 @@ <pkgmetadata> <herd>chromium</herd> <longdescription>Chromium is the open-source web browser project behind Google Chrome</longdescription> + <use> + <flag name="tcmalloc">Use bundled tcmalloc instead of system malloc.</flag> + </use> </pkgmetadata> |