From: Paweł Hajdan Date: Thu, 2 Apr 2015 07:04:48 +0000 (+0000) Subject: Dev channel bump. Fix compile without gconf, bug #544528 by Andrew Waters. Remove... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5af9cc0047e647c3942cc071cac0c5f4c2cdd5a6;p=gentoo.git Dev channel bump. Fix compile without gconf, bug #544528 by Andrew Waters. Remove old. Package-Manager: portage-2.2.14/cvs/Linux i686 Manifest-Sign-Key: 0x4F1A2555EA71991D! --- diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog index 75ddcaec2a64..09a2b8cf79eb 100644 --- a/www-client/chromium/ChangeLog +++ b/www-client/chromium/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for www-client/chromium # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.1214 2015/03/27 22:47:16 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.1215 2015/04/02 07:04:17 phajdan.jr Exp $ + +*chromium-43.0.2351.3 (02 Apr 2015) + + 02 Apr 2015; Pawel Hajdan jr + -chromium-43.0.2334.0.ebuild, +chromium-43.0.2351.3.ebuild, + +files/chromium-gnome-r0.patch: + Dev channel bump. Fix compile without gconf, bug #544528 by Andrew Waters. + Remove old. *chromium-42.0.2311.60 (27 Mar 2015) diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest index 8c5f4f401fb3..836b2f74009d 100644 --- a/www-client/chromium/Manifest +++ b/www-client/chromium/Manifest @@ -4,6 +4,7 @@ Hash: SHA256 AUX chromium-browser.xml 407 SHA256 bc039012f8677468e9ce5df825f9d8096be6deb5813031c86a087c88105096ff SHA512 b767fb4fd1925029d95560fc14cb7ab12ae43b2fe923e92d75e733b9723cbe1dcdf6df041a2b62554e98b79b47ef3f6028c773e72e6fd53166a021d49657aeca WHIRLPOOL be37cd2e7d02c510e84c484f32ab6ab2e1f38a2a03c0cdbc9b6b485d64feaf79944d8ce097f0838ae9bc71c42401b633350b847ad316b8e23cf5614e3913e7ec AUX chromium-cups-r0.patch 2122 SHA256 1ea8a1fd5d4ad7ed61d23864cb57e9b69ab8e2814f6da53598ccfbb596c01c93 SHA512 43aadb71adafe9bc8253b8085e2c8ecce963b97af2efc08f20f7224cc63b60aa756fa3e082c1753d3bcdfa71d2c7338a9fdcad9be292a0b1dfd7b078e706d70a WHIRLPOOL 0da59643edb7d246625115192cf3c2283c2351b89278606c8c0175e68db6e5b04476865c1c319deb57393a358df28f695c081b3e9e37745c8ea992e3661a32f4 AUX chromium-gcc-4.7-r0.patch 634 SHA256 6732e9f8cef0def250ed397ae77050812b08f28ac20e2928fb46f456800b974d SHA512 7998bbe57e8cfc948f5e441307e3cb5df6f07c401196c09644b107d78e3c41d0f557c5c23aff33f8aec618cd1c87747da687764574f902259debe1c336ad0e14 WHIRLPOOL f88609044b61fd1ce10c1745074e0d84baaa82447952a41be394f32b6d85b6b60d9893b3b1a9dce56134a4588b16ad1953474b0b3b213b001f37975490769621 +AUX chromium-gnome-r0.patch 1024 SHA256 bc78058e24210e56975ae89d30d5d4d45d9e2e2a8fdf0938c304858f34389e32 SHA512 8a3a6d418970994c0f356302e419dd11b42c0b008c40f79a3137e01f4005ed010b31c9291150e9c4befda3864cad69c209c90fa23eadd159ad0f8b2715773bfd WHIRLPOOL 59e2f32e4571c7ce4c14746abccb3d44e243cec74691862b64f4c2f6bf5ef18abeb98c47efe25999ad4db599b79d3ab6e23d2d9bbeae542f7577d6696f7e64e8 AUX chromium-launcher-r2.sh 940 SHA256 842e121bbfa33513ca964744f0ba8401401946e672cd6a0a95bc80a28212e87e SHA512 64ec5e0a4f524bd6164fe33a022419d6cf54822754b172e85ea003c47f9bfe6ed996353af707a4e16369a68d2f2e7d51f186397a48da42f13eb3dccb7e4ae4f8 WHIRLPOOL 4a2284957bb462ded600f14b1aaa7e29389181cda149b9090cb7b6fe8303dc5692519da6281769925b2122578ba2ea0ef8a1563077a62d7cdf7ca243c165805a AUX chromium-launcher-r3.sh 1199 SHA256 9bceb14a6c171754b77bcc7e6095285fcb58a9ca10e2e4a9c9e13dc561fc0c01 SHA512 f1909314ae74985c85740d26c9bfab694f3202de8ccc392a1c4ec5c8760db21b6cc46146c78a9abebd09e6d24f37e19466f0c4d2d61815400b48d859f8ce154d WHIRLPOOL faa7eb72a4a5902299925ab4c13308299fccfbdf34a417ce89fa800cfcd6ebf0a3a456db1e8625e205be445d4ad2718db6cf6d581b266bb9227fb03506a67220 AUX chromium-libsecret-r0.patch 446 SHA256 92be0adb7373a471ec5ade7e38b044b7f00629f24c2c9ccbc44f850014fc4643 SHA512 455e690c1eb885315a1a78cef35510d7fd75155400ba86b5de021641c21671f49fbbb72bf1d1b0c80b2c9c6723058a9ce8b5a66ebac0f3ba06b91600807af411 WHIRLPOOL 2add62c2ac8386e44e0872f6a6ed695154cf18f95deb6ce50e9668ea097f8bbd9c323aae483250fc56b7255fa653f36987e96b3e120349d068f0e9c30a5fb335 @@ -15,21 +16,31 @@ AUX dot-gclient 174 SHA256 0ae6d69323d1d286de7ef1fa62c330536ada7280bda7564fefb5d DIST chromium-41.0.2272.76.tar.xz 301532460 SHA256 31e2ae88ad4604e79dbcf7258f66106bd51e88413ebda6a1b1d181967535cd8a SHA512 5a616183817fda9b0c403a648f6265f0ce2743e61af6bc0a848a7471a40ecf777693e527388259dcea86340f98b6021366bef7a0ce33717b063d2eaf1fa94bc0 WHIRLPOOL a7d7bfc320f3528fcd4934629f53e10252a217f3c8b9966621bd5adf6c2ba25a5a0ffe0ba1a87f49990671386aa0926e1b0eea696a6ec8c6ef2efb45e002e3e2 DIST chromium-42.0.2311.50.tar.xz 306054284 SHA256 ad87ec1ed650fe9f6eb8cb8eb276cf6be96aa70911753bca1f2e36e6fa28294f SHA512 f70b6a36619cce10118d487178426c0b5f00d76870ed626e37c7a047bb7788391b43084e9fcb10ce6427186955e9e572da9ed13ce220c469b92160793d1f454a WHIRLPOOL 80c2ea673403322ee22e1fac7cd64799bb105b166ca593795910002840c2ba3d0091099dd67cc8c4604beb256195f3ae191d0a19a9e5f5537407b06d4e493efc DIST chromium-42.0.2311.60.tar.xz 306422228 SHA256 11381e5a3ae9be3d5af79fef7857cdae6873967c1b86b7e1f97eb545f0898288 SHA512 404ed607969b7082109ff2d84464d688da4095c0b7b989e005c117357cd219f504e97b27d74994e34725639f43579c9d6309985283afcb7bf732d467a393d360 WHIRLPOOL 3ed605365517c76389dee09d8df07f6819d29ca8ff283d8eaf395cd789758b9b82cdad3d0beefac0b10ba040d2b8a6de8a4232293ead90582b41d8c00c6b7193 -DIST chromium-43.0.2334.0.tar.xz 307525440 SHA256 895b43d4ae72a3122f344f9f57ead2016c621ee84395eae96fa7c8cb8562da67 SHA512 c5a4aa3cbef35264382fb3c37cef67f23eb7521e12cf4254c1661014e46c6add327265e20cc5206e5b277b94981a85c7a4b73e37117a68c569d7bf8c7419faf8 WHIRLPOOL 42b8a0589b3ac9cbf758212a717fc83dd64437e002f268b89ce939ce9602bfe35db7f71d82147152755e593eb17c1ac950ca69f2d429bb5178c2eaaa2f71d5b6 DIST chromium-43.0.2342.2.tar.xz 307953856 SHA256 d7353f22c298d095e84493b6e5c31091b3f80e4acbdd7cb8572907797ff29dee SHA512 ae66ed9e520adc0dd1e85c454daf074123d7f0297a8c4ddd5ecaa374eeb58f67173fc90b89996981a7b0cb3e80dafc050a57f84cad8599bef07121cef57180ea WHIRLPOOL 9a1bde81d48aa9a967db222ab7c8fe9c42b1e2cb868a25be590e847276f006670542aa60275885ef9b9721c24a2de3b163164aa1a7abd00bad761557d3b1e438 +DIST chromium-43.0.2351.3.tar.xz 309259204 SHA256 ae126df4b09ba97020994f4398c051e51604705c9468a2bd571e917af7bb5715 SHA512 d4fe0204a52d4dfac8a1ccedb3c83a635ebb68f85a937c658ae9cce85f425a2f53e18f46ba7e104d2561c532d22982840d98c7ffe07abb7017d933b82ef3133c WHIRLPOOL 71ede23afe5b353d88ce7e8328236b106dcc9cb6a91122f645b0dd7abcbfff87d43258bd3c7c729ef2031d4f82a0a57ea009d4fe2baad92f6ed598b9338da179 EBUILD chromium-41.0.2272.76.ebuild 20137 SHA256 3bade947aee25e6f0935867f384399b55c0385b2044fd7ca6ddc8dd924dc63ad SHA512 e934b80809f410b6538e998cf03713378030c06611b29965673f1257c1013921860e342818812f90f73a902a53c6bcc2e7c57b419662f1017fbaa2b8dfecd9dd WHIRLPOOL 3479d4c37cbb8e23929040e173e0615c6566757a51ee6f3937b67cfdb8d68630b3b6cc97b873bc4c655f7669096902c0ab53ddf2861f47ff463aa1878f84b2e6 EBUILD chromium-42.0.2311.50.ebuild 20379 SHA256 0d075f30938cc0e975f4924738a869f8e5cf5866f1d5b291640ab80ff09177f6 SHA512 dea529a133c4586a0f79ae56fe9aaa3ae684d2cfe08715e6e98c2ad12f9c7e7171e49c33e249623a0404c7b663ec6e767b5c3a5e55461ea7dc2d03b3322e69f2 WHIRLPOOL 455f64e5521670263b25d4f69f55c910488c1d1e55d7432eb9c3286d498b330bc4620e7d00d3453d87551fb1505bedbc4c98d2a0b07b5498dd33c7f3de330809 EBUILD chromium-42.0.2311.60.ebuild 20376 SHA256 9f2db0b466982a4a3ad6b0989b5e37317370e37011d5bcddc3d44eff2429cbe6 SHA512 905e144eada76c210c665985d46a2f7da3f323686c4ed345468b87f9d91d9bff15fcbe3e5265a470d31dcbc091cb1a71ae430ea9613159224210c168a82494cc WHIRLPOOL 80fad07aaf208849bbeb996603cf7ff03c7b08d1a56f44a1d31369dc233b8bb4a0b1dc957a8c6e20931e1ce9e2ce3d85d8bd65a80448814b067329e0d690eb5a -EBUILD chromium-43.0.2334.0.ebuild 20105 SHA256 252ef24872a2f9b193b1c762d95cf37f88ec972e041d54294185852f321d586a SHA512 fa0486d42aaf41e578f2d0924328bb7961f5a7af475af99bd85845127c96a6f7fa41435d90edeb2ce22fdcd17b35004c5a44c0a4fcad39089a487590c11620fb WHIRLPOOL 23406a72e42482ca0fcfe0faa584fdb6ae101685ca5d4a0b8d42e31c933234a55bbe7d9fc8959ee568a66b79f4d215032729a80fdb9d827255b827c750cb38ad EBUILD chromium-43.0.2342.2.ebuild 20102 SHA256 993d1f874c70293fed51fdb8cc93087ac429b1acb182e86a449214a4c1f29668 SHA512 3c5e0b5d1394efe0bd3fa4cd8760694cf8627c172b03d70989f94023e82aac55e541979cc5d8ce49c83f0e49761cf684217b13bac7d4d19b3c8537c69d88177f WHIRLPOOL 3885f0b489ec8fa377c978c30e455071b6dfc506460e9676eb7bc3558011eae26b018c80da5a32118970e817f2ddaaefbfa78f5c43088d8d7dc126e8440a4000 -MISC ChangeLog 7462 SHA256 8f242a1f3cec05d2933671ad9b3c77f08397fbadf0586834bcdf9f694002ae05 SHA512 5b98d621e10acbc4948c12500092f104b8191c29f0f128bf54820c7274171a405c502c8246c9ba519952b2c99a183f07a5029e56310b1ff8d211adf1d1687450 WHIRLPOOL 456b3f03007981525b1dd8227b7818ef34e3b76501ed0a64a557d6d15115abf9aeebfa5c87599f2cf884a0dac00f11119f80f7c6cb29907c4e6fb9a18af19286 +EBUILD chromium-43.0.2351.3.ebuild 20145 SHA256 3023fae9ebb9415f43fd2d9d0703ba93f28d991d44dafca0e828848312ab2e05 SHA512 8df590f0ac7a76d29ecd6dd231ff2699e47cbd0b22782eb47825d6c53fe1c58df889ce1f3eb8364919c8f3f44304197b5d5149e264fa628c53ef91994c5bbf1d WHIRLPOOL 16ed4a33508f7a0b3cf7983696f969070800790db1f5bd963679e3ba508b6dccd43d255dad103abb3d7a6c68802594ddbe08120468730b975930e9a6945e8f49 +MISC ChangeLog 7745 SHA256 30b67de1b8f13fcc888ded6379820e2c9c63d0583f50fb5f5cd18efb75c5f285 SHA512 34d0aa9fc20ff6f1f918f5baae9a4e547a1b45e253aad2b3e95d34ec2ff7ddcdf4c367f6fbd5ae70c06063f4892f2cc75ee652dbc367d6812609bdd02932574c WHIRLPOOL 87f65c2632726352054012214b136efab40b83a6fa9b82d260ab79cc5ec1175875e384ac350f7a2d708c98c55cef6c551974d96a61a82f9c4d70b5baab8095af MISC ChangeLog-2011 114031 SHA256 e2c2c75785c5eaf78b6efe01e357279cbb7be0c89d00b4053f475e963916fa54 SHA512 8e14759348333bdbd7c338080472789d7bbb1ece1ca5817bac6306bdcb33dda1e23bf3055cbb3b7bcee9362b6900bba1ace7ba73f353570a74d3ed761c9198cc WHIRLPOOL 810b6423c53f892a4b0964380b8190dec2a8783d560a9cb0baec93a77d879186201055382ca05975ae242e16728529ae85445db003fdd425355292d17817157b MISC ChangeLog-2014 123105 SHA256 f67108708d3d21b4acfca327aca42ceb4cc31201772dff496babfacb50acc4eb SHA512 bf6464e7e6ccdee81a4c26949176ebfb705f99e85a0120eea77f52b862fa3b8142abb006462f31e5a9053777836d4d9fdb69926d2b01b49463553740aecdbc43 WHIRLPOOL 114181b4c8e700a56bdf76b4de2e94998436b1b27df9182348ab88afd352085938686359369ffa4af929936e9ad88305efc97e22afd3b4c50b0dcf9669286fea MISC metadata.xml 794 SHA256 325b937cabfd7753347c3c911fb8be689b4a7b021430fca37a92c26e7af35433 SHA512 079c7985283d160b85a8dcd53fd54538ee83b9b36fb99327f03aeff16eb3c6dcbb399a01a381094a67be901d970f3c8fa649b2ac156522df3156db2853b6566f WHIRLPOOL c110adec0f1dcb170e4ba52523109d340543d37027f4c6c9f6e6998744c2720177f03a963e7cd162512459c193e5107f0764b8e3dccf7278b008e7cb8a715b8f -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iF4EAREIAAYFAlUV3fYACgkQC77qH+pIQ6QjuwD/SpS/OmU2XBuMWHHn5so4hFNr -0HjZQm4JFTaP2gpAPSoBAKV+LePX1TZzbk8TjMQMlrVhGGT3IlteR7rZKSyNwfsu -=/bpZ +iQIcBAEBCAAGBQJVHOoKAAoJEE8aJVXqcZkdtIMQANXg0B1Rpf+TI6JfTrpfmurX +4lyb9nXHd7Qlu1ZxYmE3p7WUElcnPOliTgO3+cWIjMUDmQQ6MDloW72OE2aKH6to +xn7SLxFn09fJtgctZysbbPiy5a7hOaFRJaSt0q2/ZCWdvqQ7BRRjXSy5Ekt8K3E5 +slKmqPsBp1w0/O1I+YLklqLcQNYu+V3NTRp3RrWnuPthW5+G5dqUFJPKZOejNtPN +JSF4EoNgCY+N2N/ugh0cbuRyUY0uWDjkbzpdWQmwVyZr9d8DA+a8mtYz+Zmi/E/S +k3wsP0kyIPvHA37O81uHX55p89f4ceH2UJR1xP8FMt3gs6ybst/BW39noAyrhXWp +Bo6eBCXkbqSedZBDoczjxitKZVYZKdZ8cHChCMg5SMbMPRP8sjqGbuAiIMd/5Mth +pSlAal99xKCOroIusdMCKcNL5H+frfqG9wU6gZIQVoX0FAvFB9W0xvn5RWNYfRpc +ftU8AeBn3w4uhNz/DV7jOr0qH7wLtc+ClO0BwfGyLDpmx81vardJt45O/RRS5Mhb +0fnqK0BL3fgt8oT/hVUnxEddofeEHxVhdhdK9MOtEW0dWUFiUjqSfqKw1A7YiOSS +t0PF0CkDmXpDIVTrr8oT4U49n0hzayK+h55MwFOs2dg+5iJaPdGSGpThwQ/v9qG1 +DCOEkg6tgUcOQiZ5AYFK +=+vjQ -----END PGP SIGNATURE----- diff --git a/www-client/chromium/chromium-43.0.2334.0.ebuild b/www-client/chromium/chromium-43.0.2351.3.ebuild similarity index 99% rename from www-client/chromium/chromium-43.0.2334.0.ebuild rename to www-client/chromium/chromium-43.0.2351.3.ebuild index 273e2a21f309..e4d1ef3b020b 100644 --- a/www-client/chromium/chromium-43.0.2334.0.ebuild +++ b/www-client/chromium/chromium-43.0.2351.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-43.0.2334.0.ebuild,v 1.1 2015/03/18 19:47:38 phajdan.jr Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-43.0.2351.3.ebuild,v 1.1 2015/04/02 07:04:17 phajdan.jr Exp $ EAPI="5" PYTHON_COMPAT=( python{2_6,2_7} ) @@ -194,6 +194,7 @@ src_prepare() { epatch "${FILESDIR}/${PN}-system-jinja-r7.patch" epatch "${FILESDIR}/${PN}-libsecret-r0.patch" + epatch "${FILESDIR}/${PN}-gnome-r0.patch" if use widevine; then local WIDEVINE_VERSION="$(< "${ROOT}/usr/$(get_libdir)/chromium-browser/widevine.version")" @@ -237,7 +238,7 @@ src_prepare() { 'third_party/cros_system_api' \ 'third_party/cython/python_flags.py' \ 'third_party/dom_distiller_js' \ - 'third_party/dom_distiller_js/package/proto_gen/third_party/dom_distiller_js' \ + 'third_party/dom_distiller_js/dist/proto_gen/third_party/dom_distiller_js' \ 'third_party/ffmpeg' \ 'third_party/fips181' \ 'third_party/flot' \ diff --git a/www-client/chromium/files/chromium-gnome-r0.patch b/www-client/chromium/files/chromium-gnome-r0.patch new file mode 100644 index 000000000000..7a8c0a9a57bb --- /dev/null +++ b/www-client/chromium/files/chromium-gnome-r0.patch @@ -0,0 +1,40 @@ +Index: ui/accessibility/platform/atk_util_auralinux.cc +diff --git a/ui/accessibility/platform/atk_util_auralinux.cc b/ui/accessibility/platform/atk_util_auralinux.cc +index a15df08137d874609305f90a6bca6e5c15e5c213..7fcaf219351289fe7eba1f670d7a6743a8b40ddc 100644 +--- a/ui/accessibility/platform/atk_util_auralinux.cc ++++ b/ui/accessibility/platform/atk_util_auralinux.cc +@@ -3,7 +3,9 @@ + // found in the LICENSE file. + + #include ++#if defined(USE_GCONF) + #include ++#endif + #include + + #include "base/files/file_path.h" +@@ -14,6 +16,8 @@ + + namespace { + ++#if defined(USE_GCONF) ++ + const char kGnomeAccessibilityEnabledKey[] = + "/desktop/gnome/interface/accessibility"; + +@@ -39,6 +43,15 @@ bool ShouldEnableAccessibility() { + return value; + } + ++#else // !defined(USE_GCONF) ++ ++bool ShouldEnableAccessibility() { ++ // TODO(k.czech): implement this for non-GNOME desktops. ++ return false; ++} ++ ++#endif // defined(USE_GCONF) ++ + } // namespace + + G_BEGIN_DECLS