diff options
Diffstat (limited to 'www-client')
| -rw-r--r-- | www-client/chromium/ChangeLog | 8 | ||||
| -rw-r--r-- | www-client/chromium/Manifest | 21 | ||||
| -rw-r--r-- | www-client/chromium/chromium-42.0.2288.6.ebuild | 622 | ||||
| -rw-r--r-- | www-client/chromium/files/chromium-libsecret-r0.patch | 14 |
4 files changed, 660 insertions, 5 deletions
diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog index f3f09655df08..167045e7158f 100644 --- a/www-client/chromium/ChangeLog +++ b/www-client/chromium/ChangeLog @@ -1,6 +1,12 @@ # 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.1190 2015/01/29 01:44:45 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.1191 2015/01/29 21:19:52 phajdan.jr Exp $ + +*chromium-42.0.2288.6 (29 Jan 2015) + + 29 Jan 2015; Pawel Hajdan jr <phajdan.jr@gentoo.org> + +chromium-42.0.2288.6.ebuild, +files/chromium-libsecret-r0.patch: + Dev channel bump. *chromium-40.0.2214.93 (29 Jan 2015) diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest index b3e7a48fbe3c..a8e795e5d613 100644 --- a/www-client/chromium/Manifest +++ b/www-client/chromium/Manifest @@ -6,6 +6,7 @@ AUX chromium-cups-r0.patch 2122 SHA256 1ea8a1fd5d4ad7ed61d23864cb57e9b69ab8e2814 AUX chromium-gcc-4.7-r0.patch 634 SHA256 6732e9f8cef0def250ed397ae77050812b08f28ac20e2928fb46f456800b974d SHA512 7998bbe57e8cfc948f5e441307e3cb5df6f07c401196c09644b107d78e3c41d0f557c5c23aff33f8aec618cd1c87747da687764574f902259debe1c336ad0e14 WHIRLPOOL f88609044b61fd1ce10c1745074e0d84baaa82447952a41be394f32b6d85b6b60d9893b3b1a9dce56134a4588b16ad1953474b0b3b213b001f37975490769621 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 AUX chromium-system-jinja-r6.patch 2637 SHA256 4d91a5404ee5deff2b9d334cb19a14b977f4a81bc5cd7209be8b2cac02ab711a SHA512 50528e99e8121bb5bdccbdc5e5d4bd39745f8068f3e211dc3e86531a610a6b77e0d7445d3a27ee1d24b478c1809b5042a7f6dad54f031df28c5ac29a8a2beeec WHIRLPOOL a6d8cab91712e0c532960010531732594baba30444e7bffaa9b8e0d2058b4a6e277aa13d489c877dce220e1ffe8a92ec4afc0ba6b7ef55ff0c2504bbd2e374ea AUX chromium-system-jinja-r7.patch 1611 SHA256 ff06a869615dd10ed3b26946b6a3113b3866c4d72183037be30996857e56ce32 SHA512 689cee917bd8a81edb4e640d551eca8bbbca9fa7c8d0afbca513cd911880773e7bfa0e3d558ca770afb418c6e0b42c28edb08b4792de900df1fb0b58afba22ee WHIRLPOOL 340253d54a041a1cb607ba5048ac83bf5f4ac1d691ecc69f09d0fbcdf4207db8b665f7f467b2632ead988736c4779f33fd749d91b0d5f2ecf16caff09725d444 AUX chromium.default 148 SHA256 bdac1d32025d53158f96c8ad5bd71a58abdcf02f3a8759a43154e97e812fcdd1 SHA512 0d4849e03592fb58b05e62a43021eca7e61615616c8907c3b2e445402e03adaf9e8fa25b0a745d6c31eb037456215cc02b59e345a3a06d932e76cf990c92d739 WHIRLPOOL 2e51e864134426668cc73fc5081c35288677d8ce855b07dfbd3413397f9c43148a6d6096a9b7a617511388f87623a3ce7f3387103202db53876a74bccb9dbe6c @@ -14,18 +15,30 @@ DIST chromium-40.0.2214.91.tar.xz 284982556 SHA256 f72fda9ff1ea256ab911610ee532e DIST chromium-40.0.2214.93-lite.tar.xz 227546924 SHA256 401fb6a4497d87cde645718af56b6f5abc7db8f5e8afce1f9913fb13355ca844 SHA512 d965826163126eaa1b21dc239fb7c645accae6979bab6a020e5d20bebff3ca7ee450dcd78c3397312129f80d29dd44124623f067432053718e9c093f03451413 WHIRLPOOL 5bf9888da4aba6acca995dbdbf732caa68a74b0d2d611f7c7f217d5b1c5f398e998f2e14ca305bfb2407a62994f991ef6786816d0acce5cc3c9412f9b8278701 DIST chromium-41.0.2272.12-lite.tar.xz 237786236 SHA256 7093674377a99a4c8f64e18521a3973bdb74cc5ae75463a355a5bc44c783ddf4 SHA512 77be9cf563ccc690364d11d6be0b8cc7ca4baf3a74f996f8e2dadee236ab25daf06b7c8409ecafea6595e1bdf5c50eaeec09496164740495d398664ea6b36a3e WHIRLPOOL ac45b98be51db3539e511a53c162b81da72da4f2449354c867bae14c5c90dc3f62fe898604cb06782c54a50d786525bb82d94a546fde9d53d4bcceb13ea3002c DIST chromium-41.0.2272.16-lite.tar.xz 237800940 SHA256 f90eaac9d316829f78069cc28f679bff31187026ba12e9910110829127743141 SHA512 b112dd131a0fedad761057b9e103f866ee72c8a199c2e489f1615f23eccb1502b7c54a59c8c2226d62f3f3dc9d9273b9546956a83d13e66e8005797e46ed63a2 WHIRLPOOL c5279b7cd15a73216f1de61fe960fc99dcae9c966ed01f08af3d8c3e7d4daa3e8882c16b6770b74f14c7e28f2d0d246b0230488de58d27d022c27d62db0eb6a6 +DIST chromium-42.0.2288.6.tar.xz 300774976 SHA256 f5295d0f00c5aca27bdbaf909e8c7cd7fff06b7a02c8d87ba2d77440e595fd16 SHA512 624cc4c358edfb7dd57de7ab22c901270ae0d0687a8ee54954fc675bb1927f54fe26348cae813ac6ce6a55b2939a4a650e258ea92cf798459c5ca96682f693f5 WHIRLPOOL 6838cb22b4a042e911abc4853bbfe8340157dbf1a9f45e9f0fb655c96a5e1f7a342263ba8007c7b93f97e50990708ddc8af3257a5a7a5db5cbf25f898faab69d EBUILD chromium-40.0.2214.91.ebuild 18987 SHA256 412de225f4ce8ab5fded91bf7b748c3b94b361f31784e6567f3ba7ba097d87e6 SHA512 a8bd787d7d5d66b7ff236a7add9fcb34c4b44e3cf6b4f46df7f04ed4c5bfccbe18b59e3f4fd5fa3aa5652bfb824fc804fa160ed8a4195486c29d09f2f9fba193 WHIRLPOOL b5cb389332aab54e7dc945b75343701689a8d8974dac704bd2a267560732a317a8e6753aa96847d6eac5730a879386a109fe5d50a3f4a1a405df773cc2808ce1 EBUILD chromium-40.0.2214.93.ebuild 18998 SHA256 9586d20a9b16d7c61759d38d3e8449b1bdb8a0ff523b9485a4b29d83be070e81 SHA512 e0d444f960faa954c880f9b94f167aa3ca20d297d93aa67e3b2ed21fb485efd4e66de7e529def7bbb3591e57b0c5f82a762b68e7cd19edb389311291764dd77f WHIRLPOOL 2a0f74e8312a5cba36d06a2c57fbe1ec5baaa411fa52e4e3e740c5a343af1dc8095959613a11a53487af3dea27d3ed8927feb149e388a43bcad87d84599a1661 EBUILD chromium-41.0.2272.12-r1.ebuild 19164 SHA256 171ca6b38f8e8038cd73f1facaab4a0ca007da7179b331eb1f6873e5a72ce5f3 SHA512 6f807aad0dff0fd33e2cd7f9753efe94687770d6756db2e2f1703fcf35d90610df64fa5aa9dd0530e1f53036923bbdda4f587e980f2e727e23743fbdceae35a7 WHIRLPOOL bea2e52f145ccd554a33bcf3980f866888271eaa024ea2806e70f53cdb3127162ec00c2c9dbfaf2d6af26c8a06417e32cf557bfce94ba91330441d41a494b265 EBUILD chromium-41.0.2272.16.ebuild 19158 SHA256 66f7216d5e4b2fbb17922c3e150fe2882a127a309ae9ad571fdcaca798250f3b SHA512 9bd0735fb1f21f55ddf82964ccebc2a2adf50b0568f08963ce038d57b5b6cf9c4c5c8f5835b7c18af3edb03914d36b988b5e70909f50d36068d7108727fc85ac WHIRLPOOL 2cbe4cc20c3eefb93c0cee9176556e75d2ca59515acceef3e763ee04452f7792b782176bb75ba79e76adc6c8ec2384a580e7bd4b35126280948ea8bcd12bdbe1 -MISC ChangeLog 3004 SHA256 dd5e042040981d45fbe120f69e0bb7dac8b7c50d477baf243fe807a1be81c650 SHA512 4d102af4815e405a852d4ec34d28aec954fd234c94fcf57973792ea3cb7dce69d0c61b6b2a0bdcc6c0167ec00cc3039860ee6121a48d26864501d58a6883c4e0 WHIRLPOOL 160f386546836155764e5972ce5c0b0867c50e826d27cca78637d7690802da293c2ba9e68f50d59d50848950a57b7fd822525eb8712570807c044d09e3423d9e +EBUILD chromium-42.0.2288.6.ebuild 19206 SHA256 24017039b2c33309324531e2bba00791d46bf4d53802cf5e92e93e105958078a SHA512 f98d2fa38f04c80fb5dec60f924dd5a06c1b5143d2ec6dc0788a870c09c38d14733d40f386e2ded4e89d0863c76b5368f0d362194d02832a97bdb816bfb7158b WHIRLPOOL 2c62201da9a4035e682eff14978fdedd51ff89ce96cf7b555a64a962866a6a5afa36b4b51896c16501babd56bb4c67cc1d579d54d2af408cffa03790ce1d6252 +MISC ChangeLog 3188 SHA256 29592ff57d226663929a2a921fff81cacbde301ab1ea919c4dd1905820978136 SHA512 5ed0e4c2dc79f225f0452a9cd20fd64f9e2698da20aa93c048f205dd479156372da2bc91576f279c116b8a84edb45ee600226bd8ad65e4102cc649afb802d7c1 WHIRLPOOL 1e42106b9189a5f4cff221fe12d868bb604efd8a62114c19ab510c1422c160e22956abb7df2dda7c2edbcad659327499ec662d3845405c217ce54feee49fc737 MISC ChangeLog-2011 114031 SHA256 e2c2c75785c5eaf78b6efe01e357279cbb7be0c89d00b4053f475e963916fa54 SHA512 8e14759348333bdbd7c338080472789d7bbb1ece1ca5817bac6306bdcb33dda1e23bf3055cbb3b7bcee9362b6900bba1ace7ba73f353570a74d3ed761c9198cc WHIRLPOOL 810b6423c53f892a4b0964380b8190dec2a8783d560a9cb0baec93a77d879186201055382ca05975ae242e16728529ae85445db003fdd425355292d17817157b MISC ChangeLog-2014 123105 SHA256 f67108708d3d21b4acfca327aca42ceb4cc31201772dff496babfacb50acc4eb SHA512 bf6464e7e6ccdee81a4c26949176ebfb705f99e85a0120eea77f52b862fa3b8142abb006462f31e5a9053777836d4d9fdb69926d2b01b49463553740aecdbc43 WHIRLPOOL 114181b4c8e700a56bdf76b4de2e94998436b1b27df9182348ab88afd352085938686359369ffa4af929936e9ad88305efc97e22afd3b4c50b0dcf9669286fea MISC metadata.xml 610 SHA256 fab56e56102853f58a4078b6812b4af31aed0069921ce51200d40c88d813b9ac SHA512 37dcf9426553269dd961565bfb3ff23793b19a5ba12d1909f6392a9514cdaae39c4a8d4d450a7be757425a0deb67f63e81ace513716bf9960f2e64fd373c8986 WHIRLPOOL a2f576b167d68fbf0ca658ecd7ef957ae41823493624b903198505a506ccec27ffbccd4db3a609d7ad2e72b98ad81ff79b2ddd60137821cbf155af4b8b650cd5 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iF4EAREIAAYFAlTJkI4ACgkQC77qH+pIQ6THcQD/enfm0dsIyO+j7ROkjjvlFzzQ -URgqvKOl1uyTw2r1t+YA/jyrtMLHDMHxXyH7y0TuGmiDQEghA6siA2mB8PL8hAaP -=NziS +iQIcBAEBCAAGBQJUyqQaAAoJEE8aJVXqcZkdctAQAKeATQ+OTx7tekVMcQjDMTfW +hLSk8YC/Oziwc8ulaXT3ykx2ME0+mL8V1m6HFgBAGSeKvLLze9fK6seMgd2zohsG +RsHZ38R+2dl3as+CTqoJMRH3g0IESqfC8Wl1pK/J9ZX/K6ShYTWx+umhni8N/GZY +dJZKX0/uNuIHvm1PpbZlNlaMoazlQK3gy32GWetQ4H8iGbZZhiAvSLf5nrFY8AZD +kOxi5mjwBUcZg6HAKUWnsF6eTPF4RjnMDKpu6vk3wOygWJ6Kean0eFgLi5fwg9AM +5Y6bJBcT5DPe9WSKw5jDfBMQVujSUahKesSn02i0dkK/iPn1UQdgwh3U12u3Ix0f +WCEvAATuaqTNIpJoz+ud8vu8uJXLDFQzsTF7FQ/iOvIhPnmUyoxWwH+2dLeF0oAf +CJHVvSZjI4TdHgzvGZ/W5ssdVKJsR37zmx6S96lMNVZ7flg/oNVL6E6KT6eG0NYs +Klkc4I67fFnKtN6ZeNYyNeVFg6xrYRiefGhSfrydwriUaeAAstmo6Ph0o1QeZP37 +mr9DQ2r7L2PflOOjE8qG4rirmKeN91IFIBde7jmH6LOdNaVFakbwjHK4ftcgnWQ2 +GDaDTnJJwT2eDHFcCorrw4kOHh3gIbpCKu4wvZl070lQ3NY9q1xF4H7GWls3UJrv +WzZul+/O2srvmRf3Pa9V +=OihV -----END PGP SIGNATURE----- diff --git a/www-client/chromium/chromium-42.0.2288.6.ebuild b/www-client/chromium/chromium-42.0.2288.6.ebuild new file mode 100644 index 000000000000..19f185a04c9e --- /dev/null +++ b/www-client/chromium/chromium-42.0.2288.6.ebuild @@ -0,0 +1,622 @@ +# 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-42.0.2288.6.ebuild,v 1.1 2015/01/29 21:19:52 phajdan.jr Exp $ + +EAPI="5" +PYTHON_COMPAT=( python{2_6,2_7} ) + +CHROMIUM_LANGS="am ar bg bn ca cs da de el en_GB es es_LA et fa fi fil fr gu he + hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt_BR pt_PT ro ru sk sl sr + sv sw ta te th tr uk vi zh_CN zh_TW" + +inherit chromium eutils flag-o-matic multilib multiprocessing pax-utils \ + portability python-any-r1 readme.gentoo toolchain-funcs versionator virtualx + +DESCRIPTION="Open-source version of Google Chrome web browser" +HOMEPAGE="http://chromium.org/" +SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="bindist cups gnome gnome-keyring hidpi kerberos neon pic pulseaudio selinux +tcmalloc" +RESTRICT="!bindist? ( bindist )" + +# Native Client binaries are compiled with different set of flags, bug #452066. +QA_FLAGS_IGNORED=".*\.nexe" + +# Native Client binaries may be stripped by the build system, which uses the +# right tools for it, bug #469144 . +QA_PRESTRIPPED=".*\.nexe" + +RDEPEND=">=app-accessibility/speech-dispatcher-0.8:= + app-arch/bzip2:= + app-arch/snappy:= + app-crypt/libsecret:= + cups? ( + dev-libs/libgcrypt:0= + >=net-print/cups-1.3.11:= + ) + >=dev-libs/elfutils-0.149 + dev-libs/expat:= + dev-libs/glib:= + dev-libs/icu:= + >=dev-libs/jsoncpp-0.5.0-r1:= + >=dev-libs/libevent-1.4.13:= + dev-libs/libxml2:=[icu] + dev-libs/libxslt:= + dev-libs/nspr:= + >=dev-libs/nss-3.14.3:= + dev-libs/re2:= + gnome? ( >=gnome-base/gconf-2.24.0:= ) + gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) + >=media-libs/alsa-lib-1.0.19:= + media-libs/flac:= + media-libs/fontconfig:= + media-libs/freetype:= + media-libs/harfbuzz:=[icu(+)] + media-libs/libexif:= + >=media-libs/libjpeg-turbo-1.2.0-r1:= + media-libs/libpng:0= + >=media-libs/libwebp-0.4.0:= + media-libs/speex:= + pulseaudio? ( media-sound/pulseaudio:= ) + sys-apps/dbus:= + sys-apps/pciutils:= + >=sys-libs/libcap-2.22:= + sys-libs/zlib:=[minizip] + virtual/udev + x11-libs/cairo:= + x11-libs/gdk-pixbuf:= + x11-libs/gtk+:2= + x11-libs/libdrm + x11-libs/libX11:= + x11-libs/libXcomposite:= + x11-libs/libXcursor:= + x11-libs/libXdamage:= + x11-libs/libXext:= + x11-libs/libXfixes:= + >=x11-libs/libXi-1.6.0:= + x11-libs/libXinerama:= + x11-libs/libXrandr:= + x11-libs/libXrender:= + x11-libs/libXScrnSaver:= + x11-libs/libXtst:= + x11-libs/pango:= + kerberos? ( virtual/krb5 )" +DEPEND="${RDEPEND} + !arm? ( + dev-lang/yasm + ) + dev-lang/perl + dev-perl/JSON + >=dev-util/gperf-3.0.3 + dev-util/ninja + sys-apps/hwids[usb(+)] + >=sys-devel/bison-2.4.3 + sys-devel/flex + virtual/pkgconfig" +# For nvidia-drivers blocker, see bug #413637 . +RDEPEND+=" + !=www-client/chromium-9999 + !<www-plugins/chrome-binary-plugins-37 + x11-misc/xdg-utils + virtual/opengl + virtual/ttf-fonts + selinux? ( sec-policy/selinux-chromium ) + tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )" + +# Python dependencies. The DEPEND part needs to be kept in sync +# with python_check_deps. +DEPEND+=" $(python_gen_any_dep ' + dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}] + dev-python/jinja[${PYTHON_USEDEP}] + dev-python/ply[${PYTHON_USEDEP}] + dev-python/simplejson[${PYTHON_USEDEP}] +')" +python_check_deps() { + has_version "dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]" && \ + has_version "dev-python/jinja[${PYTHON_USEDEP}]" && \ + has_version "dev-python/ply[${PYTHON_USEDEP}]" && \ + has_version "dev-python/simplejson[${PYTHON_USEDEP}]" +} + +if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then + EBUILD_DEATH_HOOKS+=" chromium_pkg_die"; +fi + +DISABLE_AUTOFORMATTING="yes" +DOC_CONTENTS=" +Some web pages may require additional fonts to display properly. +Try installing some of the following packages if some characters +are not displayed properly: +- media-fonts/arphicfonts +- media-fonts/bitstream-cyberbit +- media-fonts/droid +- media-fonts/ipamonafont +- media-fonts/ja-ipafonts +- media-fonts/takao-fonts +- media-fonts/wqy-microhei +- media-fonts/wqy-zenhei + +Depending on your desktop environment, you may need +to install additional packages to get icons on the Downloads page. + +For KDE, the required package is kde-base/oxygen-icons. + +For other desktop environments, try one of the following: +- x11-themes/gnome-icon-theme +- x11-themes/tango-icon-theme +" + +pkg_pretend() { + if [[ $(tc-getCC)$ == *gcc* ]] && \ + [[ $(gcc-major-version)$(gcc-minor-version) -lt 48 ]]; then + die 'At least gcc 4.8 is required, see bugs: #535730, #525374, #518668.' + fi +} + +pkg_setup() { + if [[ "${SLOT}" == "0" ]]; then + CHROMIUM_SUFFIX="" + else + CHROMIUM_SUFFIX="-${SLOT}" + fi + CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser${CHROMIUM_SUFFIX}" + + # Make sure the build system will use the right python, bug #344367. + python-any-r1_pkg_setup + + chromium_suid_sandbox_check_kernel_config + + if use bindist; then + elog "bindist enabled: H.264 video support will be disabled." + else + elog "bindist disabled: Resulting binaries may not be legal to re-distribute." + fi +} + +src_prepare() { + # if ! use arm; then + # mkdir -p out/Release/gen/sdk/toolchain || die + # # Do not preserve SELinux context, bug #460892 . + # cp -a --no-preserve=context /usr/$(get_libdir)/nacl-toolchain-newlib \ + # out/Release/gen/sdk/toolchain/linux_x86_newlib || die + # touch out/Release/gen/sdk/toolchain/linux_x86_newlib/stamp.untar || die + # fi + + epatch "${FILESDIR}/${PN}-system-jinja-r7.patch" + epatch "${FILESDIR}/${PN}-libsecret-r0.patch" + + epatch_user + + # Remove most bundled libraries. Some are still needed. + build/linux/unbundle/remove_bundled_libraries.py \ + 'base/third_party/dmg_fp' \ + 'base/third_party/dynamic_annotations' \ + 'base/third_party/icu' \ + 'base/third_party/nspr' \ + 'base/third_party/superfasthash' \ + 'base/third_party/symbolize' \ + 'base/third_party/valgrind' \ + 'base/third_party/xdg_mime' \ + 'base/third_party/xdg_user_dirs' \ + 'breakpad/src/third_party/curl' \ + 'chrome/third_party/mozilla_security_manager' \ + 'courgette/third_party' \ + 'crypto/third_party/nss' \ + 'net/third_party/mozilla_security_manager' \ + 'net/third_party/nss' \ + 'third_party/WebKit' \ + 'third_party/angle' \ + 'third_party/angle/src/third_party/compiler' \ + 'third_party/brotli' \ + 'third_party/cacheinvalidation' \ + 'third_party/cld_2' \ + '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/ffmpeg' \ + 'third_party/fips181' \ + 'third_party/flot' \ + 'third_party/google_input_tools' \ + 'third_party/google_input_tools/third_party/closure_library' \ + 'third_party/google_input_tools/third_party/closure_library/third_party/closure' \ + 'third_party/hunspell' \ + 'third_party/iccjpeg' \ + 'third_party/jstemplate' \ + 'third_party/khronos' \ + 'third_party/leveldatabase' \ + 'third_party/libaddressinput' \ + 'third_party/libjingle' \ + 'third_party/libphonenumber' \ + 'third_party/libsrtp' \ + 'third_party/libudev' \ + 'third_party/libusb' \ + 'third_party/libvpx' \ + 'third_party/libvpx/source/libvpx/third_party/x86inc' \ + 'third_party/libxml/chromium' \ + 'third_party/libXNVCtrl' \ + 'third_party/libyuv' \ + 'third_party/lss' \ + 'third_party/lzma_sdk' \ + 'third_party/mesa' \ + 'third_party/modp_b64' \ + 'third_party/mojo' \ + 'third_party/mt19937ar' \ + 'third_party/npapi' \ + 'third_party/openmax_dl' \ + 'third_party/opus' \ + 'third_party/ots' \ + 'third_party/pdfium' \ + 'third_party/pdfium/third_party/bigint' \ + 'third_party/pdfium/third_party/freetype' \ + 'third_party/pdfium/third_party/logging.h' \ + 'third_party/pdfium/third_party/macros.h' \ + 'third_party/pdfium/third_party/numerics' \ + 'third_party/pdfium/third_party/template_util.h' \ + 'third_party/polymer' \ + 'third_party/protobuf' \ + 'third_party/qcms' \ + 'third_party/readability' \ + 'third_party/sfntly' \ + 'third_party/skia' \ + 'third_party/smhasher' \ + 'third_party/sqlite' \ + 'third_party/tcmalloc' \ + 'third_party/tlslite' \ + 'third_party/trace-viewer' \ + 'third_party/trace-viewer/third_party/components/polymer' \ + 'third_party/trace-viewer/third_party/d3' \ + 'third_party/trace-viewer/third_party/gl-matrix' \ + 'third_party/trace-viewer/third_party/jszip' \ + 'third_party/trace-viewer/third_party/tvcm' \ + 'third_party/trace-viewer/third_party/tvcm/third_party/beautifulsoup/polymer_soup.py' \ + 'third_party/undoview' \ + 'third_party/usrsctp' \ + 'third_party/webdriver' \ + 'third_party/webrtc' \ + 'third_party/widevine' \ + 'third_party/x86inc' \ + 'third_party/zlib/google' \ + 'url/third_party/mozilla' \ + 'v8/src/third_party/fdlibm' \ + 'v8/src/third_party/kernel' \ + 'v8/src/third_party/valgrind' \ + --do-remove || die +} + +src_configure() { + local myconf="" + + # Never tell the build system to "enable" SSE2, it has a few unexpected + # additions, bug #336871. + myconf+=" -Ddisable_sse2=1" + + # Disable nacl, we can't build without pnacl (http://crbug.com/269560). + myconf+=" -Ddisable_nacl=1" + + # Disable glibc Native Client toolchain, we don't need it (bug #417019). + # myconf+=" -Ddisable_glibc=1" + + # TODO: also build with pnacl + # myconf+=" -Ddisable_pnacl=1" + + # It would be awkward for us to tar the toolchain and get it untarred again + # during the build. + # myconf+=" -Ddisable_newlib_untar=1" + + # Make it possible to remove third_party/adobe. + echo > "${T}/flapper_version.h" || die + myconf+=" -Dflapper_version_h_file=${T}/flapper_version.h" + + # Use system-provided libraries. + # TODO: use_system_hunspell (upstream changes needed). + # TODO: use_system_libsrtp (bug #459932). + # TODO: use_system_libvpx (http://crbug.com/347823). + # TODO: use_system_libusb (http://crbug.com/266149). + # TODO: use_system_opus (https://code.google.com/p/webrtc/issues/detail?id=3077). + # TODO: use_system_protobuf (bug #525560). + # TODO: use_system_ssl (http://crbug.com/58087). + # TODO: use_system_sqlite (http://crbug.com/22208). + myconf+=" + -Duse_system_bzip2=1 + -Duse_system_flac=1 + -Duse_system_harfbuzz=1 + -Duse_system_icu=1 + -Duse_system_jsoncpp=1 + -Duse_system_libevent=1 + -Duse_system_libjpeg=1 + -Duse_system_libpng=1 + -Duse_system_libwebp=1 + -Duse_system_libxml=1 + -Duse_system_libxslt=1 + -Duse_system_minizip=1 + -Duse_system_nspr=1 + -Duse_system_re2=1 + -Duse_system_snappy=1 + -Duse_system_speex=1 + -Duse_system_xdg_utils=1 + -Duse_system_zlib=1" + + # Needed for system icu - we don't need additional data files. + myconf+=" -Dicu_use_data_file_flag=0" + + # TODO: patch gyp so that this arm conditional is not needed. + if ! use arm; then + myconf+=" + -Duse_system_yasm=1" + fi + + # Optional dependencies. + # TODO: linux_link_kerberos, bug #381289. + myconf+=" + $(gyp_use cups) + $(gyp_use gnome use_gconf) + $(gyp_use gnome-keyring use_gnome_keyring) + $(gyp_use gnome-keyring linux_link_gnome_keyring) + $(gyp_use hidpi enable_hidpi) + $(gyp_use kerberos) + $(gyp_use pulseaudio) + $(gyp_use tcmalloc use_allocator tcmalloc none)" + + # Use explicit library dependencies instead of dlopen. + # This makes breakages easier to detect by revdep-rebuild. + myconf+=" + -Dlinux_link_gsettings=1 + -Dlinux_link_libpci=1 + -Dlinux_link_libspeechd=1 + -Dlibspeechd_h_prefix=speech-dispatcher/" + + # TODO: use the file at run time instead of effectively compiling it in. + myconf+=" + -Dusb_ids_path=/usr/share/misc/usb.ids" + + # Save space by removing DLOG and DCHECK messages (about 6% reduction). + myconf+=" + -Dlogging_like_official_build=1" + + # Never use bundled gold binary. Disable gold linker flags for now. + # Do not use bundled clang. + myconf+=" + -Dclang=0 + -Dhost_clang=0 + -Dlinux_use_bundled_binutils=0 + -Dlinux_use_bundled_gold=0 + -Dlinux_use_gold_flags=0" + + # Always support proprietary codecs. + myconf+=" -Dproprietary_codecs=1" + + ffmpeg_branding="Chromium" + if ! use bindist; then + # Enable H.264 support in bundled ffmpeg. + ffmpeg_branding="Chrome" + fi + myconf+=" -Dffmpeg_branding=${ffmpeg_branding}" + + # Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys . + # Note: these are for Gentoo use ONLY. For your own distribution, + # please get your own set of keys. Feel free to contact chromium@gentoo.org + # for more info. + myconf+=" -Dgoogle_api_key=AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc + -Dgoogle_default_client_id=329227923882.apps.googleusercontent.com + -Dgoogle_default_client_secret=vgKG0NNv7GoDpbtoFNLxCUXu" + + local myarch="$(tc-arch)" + if [[ $myarch = amd64 ]] ; then + target_arch=x64 + ffmpeg_target_arch=x64 + elif [[ $myarch = x86 ]] ; then + target_arch=ia32 + ffmpeg_target_arch=ia32 + elif [[ $myarch = arm ]] ; then + target_arch=arm + ffmpeg_target_arch=$(usex neon arm-neon arm) + # TODO: re-enable NaCl (NativeClient). + local CTARGET=${CTARGET:-${CHOST}} + if [[ $(tc-is-softfloat) == "no" ]]; then + + myconf+=" -Darm_float_abi=hard" + fi + filter-flags "-mfpu=*" + use neon || myconf+=" -Darm_fpu=${ARM_FPU:-vfpv3-d16}" + + if [[ ${CTARGET} == armv[78]* ]]; then + myconf+=" -Darmv7=1" + else + myconf+=" -Darmv7=0" + fi + myconf+=" -Dsysroot= + $(gyp_use neon arm_neon) + -Ddisable_nacl=1" + else + die "Failed to determine target arch, got '$myarch'." + fi + + myconf+=" -Dtarget_arch=${target_arch}" + + # Make sure that -Werror doesn't get added to CFLAGS by the build system. + # Depending on GCC version the warnings are different and we don't want + # the build to fail because of that. + myconf+=" -Dwerror=" + + # Disable fatal linker warnings, bug 506268. + myconf+=" -Ddisable_fatal_linker_warnings=1" + + # Avoid CFLAGS problems, bug #352457, bug #390147. + if ! use custom-cflags; then + replace-flags "-Os" "-O2" + strip-flags + + # Prevent linker from running out of address space, bug #471810 . + if use x86; then + filter-flags "-g*" + fi + fi + + # Make sure the build system will use the right tools, bug #340795. + tc-export AR CC CXX RANLIB + + # Tools for building programs to be executed on the build system, bug #410883. + export AR_host=$(tc-getBUILD_AR) + export CC_host=$(tc-getBUILD_CC) + export CXX_host=$(tc-getBUILD_CXX) + export LD_host=${CXX_host} + + # Bug 491582. + export TMPDIR="${WORKDIR}/temp" + mkdir -m 755 "${TMPDIR}" || die + + local build_ffmpeg_args="" + if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then + build_ffmpeg_args+=" --disable-asm" + fi + + # Re-configure bundled ffmpeg. See bug #491378 for example reasons. + einfo "Configuring bundled ffmpeg..." + pushd third_party/ffmpeg > /dev/null || die + chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \ + --branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die + chromium/scripts/copy_config.sh || die + chromium/scripts/generate_gyp.py || die + popd > /dev/null || die + + third_party/libaddressinput/chromium/tools/update-strings.py || die + + einfo "Configuring Chromium..." + build/linux/unbundle/replace_gyp_files.py ${myconf} || die + egyp_chromium ${myconf} || die +} + +eninja() { + if [[ -z ${NINJAOPTS+set} ]]; then + local jobs=$(makeopts_jobs) + local loadavg=$(makeopts_loadavg) + + if [[ ${MAKEOPTS} == *-j* && ${jobs} != 999 ]]; then + NINJAOPTS+=" -j ${jobs}" + fi + if [[ ${MAKEOPTS} == *-l* && ${loadavg} != 999 ]]; then + NINJAOPTS+=" -l ${loadavg}" + fi + fi + set -- ninja -v ${NINJAOPTS} "$@" + echo "$@" + "$@" +} + +src_compile() { + local ninja_targets="chrome chrome_sandbox chromedriver" + + # Build mksnapshot and pax-mark it. + eninja -C out/Release mksnapshot || die + pax-mark m out/Release/mksnapshot + + # Even though ninja autodetects number of CPUs, we respect + # user's options, for debugging with -j 1 or any other reason. + eninja -C out/Release ${ninja_targets} || die + + pax-mark m out/Release/chrome +} + +src_install() { + exeinto "${CHROMIUM_HOME}" + doexe out/Release/chrome || die + + newexe out/Release/chrome_sandbox chrome-sandbox || die + fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox" + + doexe out/Release/chromedriver || die + + # if ! use arm; then + # doexe out/Release/nacl_helper{,_bootstrap} || die + # insinto "${CHROMIUM_HOME}" + # doins out/Release/nacl_irt_*.nexe || die + # doins out/Release/libppGoogleNaClPluginChrome.so || die + # fi + + local sedargs=( -e "s:/usr/lib/:/usr/$(get_libdir)/:g" ) + if [[ -n ${CHROMIUM_SUFFIX} ]]; then + sedargs+=( + -e "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g" + -e "s:chromium.desktop:chromium${CHROMIUM_SUFFIX}.desktop:g" + -e "s:plugins:plugins --user-data-dir=\${HOME}/.config/chromium${CHROMIUM_SUFFIX}:" + ) + fi + sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r3.sh" > chromium-launcher.sh || die + doexe chromium-launcher.sh + + # It is important that we name the target "chromium-browser", + # xdg-utils expect it; bug #355517. + dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser${CHROMIUM_SUFFIX} || die + # keep the old symlink around for consistency + dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium${CHROMIUM_SUFFIX} || die + + dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver${CHROMIUM_SUFFIX} || die + + # Allow users to override command-line options, bug #357629. + dodir /etc/chromium || die + insinto /etc/chromium + newins "${FILESDIR}/chromium.default" "default" || die + + pushd out/Release/locales > /dev/null || die + chromium_remove_language_paks + popd + + insinto "${CHROMIUM_HOME}" + doins out/Release/*.bin || die + doins out/Release/*.pak || die + + doins -r out/Release/locales || die + doins -r out/Release/resources || die + + newman out/Release/chrome.1 chromium${CHROMIUM_SUFFIX}.1 || die + newman out/Release/chrome.1 chromium-browser${CHROMIUM_SUFFIX}.1 || die + + doexe out/Release/libffmpegsumo.so || die + doexe out/Release/libpdf.so || die + + # Install icons and desktop entry. + local branding size + for size in 16 22 24 32 48 64 128 256 ; do + case ${size} in + 16|32) branding="chrome/app/theme/default_100_percent/chromium" ;; + *) branding="chrome/app/theme/chromium" ;; + esac + newicon -s ${size} "${branding}/product_logo_${size}.png" \ + chromium-browser${CHROMIUM_SUFFIX}.png + done + + local mime_types="text/html;text/xml;application/xhtml+xml;" + mime_types+="x-scheme-handler/http;x-scheme-handler/https;" # bug #360797 + mime_types+="x-scheme-handler/ftp;" # bug #412185 + mime_types+="x-scheme-handler/mailto;x-scheme-handler/webcal;" # bug #416393 + make_desktop_entry \ + chromium-browser${CHROMIUM_SUFFIX} \ + "Chromium${CHROMIUM_SUFFIX}" \ + chromium-browser${CHROMIUM_SUFFIX} \ + "Network;WebBrowser" \ + "MimeType=${mime_types}\nStartupWMClass=chromium-browser" + sed -e "/^Exec/s/$/ %U/" -i "${ED}"/usr/share/applications/*.desktop || die + + # Install GNOME default application entry (bug #303100). + if use gnome; then + dodir /usr/share/gnome-control-center/default-apps || die + insinto /usr/share/gnome-control-center/default-apps + newins "${FILESDIR}"/chromium-browser.xml chromium-browser${CHROMIUM_SUFFIX}.xml || die + if [[ "${CHROMIUM_SUFFIX}" != "" ]]; then + sed "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g" -i \ + "${ED}"/usr/share/gnome-control-center/default-apps/chromium-browser${CHROMIUM_SUFFIX}.xml + fi + fi + + readme.gentoo_create_doc +} + +pkg_postinst() { + fdo-mime_desktop_database_update + gnome2_icon_cache_update + readme.gentoo_print_elog +} diff --git a/www-client/chromium/files/chromium-libsecret-r0.patch b/www-client/chromium/files/chromium-libsecret-r0.patch new file mode 100644 index 000000000000..e55b0f725643 --- /dev/null +++ b/www-client/chromium/files/chromium-libsecret-r0.patch @@ -0,0 +1,14 @@ +diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi +index af7c775..e32fd13 100644 +--- a/chrome/chrome_browser.gypi ++++ b/chrome/chrome_browser.gypi +@@ -3246,6 +3246,9 @@ + 'defines': [ + 'USE_LIBSECRET', + ], ++ 'cflags': [ ++ '<!@(pkg-config --cflags libsecret-1)', ++ ], + }], + ['use_aura==1', { + 'sources': [ '<@(chrome_browser_aura_sources)' ], |