diff options
Diffstat (limited to 'www-client')
-rw-r--r-- | www-client/chromium/ChangeLog | 9 | ||||
-rw-r--r-- | www-client/chromium/Manifest | 20 | ||||
-rw-r--r-- | www-client/chromium/chromium-10.0.648.126.ebuild (renamed from www-client/chromium/chromium-10.0.648.82.ebuild) | 6 | ||||
-rw-r--r-- | www-client/chromium/chromium-9.0.597.94.ebuild | 297 | ||||
-rw-r--r-- | www-client/chromium/chromium-9.0.597.98.ebuild | 297 |
5 files changed, 14 insertions, 615 deletions
diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog index 76ba98544147..668ce01a03cf 100644 --- a/www-client/chromium/ChangeLog +++ b/www-client/chromium/ChangeLog @@ -1,6 +1,13 @@ # 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.297 2011/03/02 10:49:13 tomka Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.298 2011/03/03 11:20:12 phajdan.jr Exp $ + +*chromium-10.0.648.126 (03 Mar 2011) + + 03 Mar 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org> + -chromium-9.0.597.94.ebuild, -chromium-9.0.597.98.ebuild, + -chromium-10.0.648.82.ebuild, +chromium-10.0.648.126.ebuild: + Version bump for beta channel release. Remove old. 02 Mar 2011; Thomas Kahle <tomka@gentoo.org> chromium-9.0.597.107.ebuild: x86 stable per bug 356933 diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest index 398ade1a5d9d..2dbcbc35b878 100644 --- a/www-client/chromium/Manifest +++ b/www-client/chromium/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX chromium-browser.xml 407 RMD160 457374ff72561648d9777ffb3270ad10d864a6be SHA1 65543bfff7d0350d40ba258e61061b0c5579e1f2 SHA256 bc039012f8677468e9ce5df825f9d8096be6deb5813031c86a087c88105096ff AUX chromium-gecko-mediaplayer-r0.patch 590 RMD160 8b01e801ef4a8d3aaa842ab217929e71ebb70a87 SHA1 916ecd1c7a405fc12de579538c07c42cd9e84ecc SHA256 491cfaa353ad965a0cbfe2fc6370e4df5d1cd55398698b838996053f9e46f12c AUX chromium-gecko-mediaplayer-r1.patch 591 RMD160 fbfa62e79687fb1d3939d34a21f1b6d4ac4a7d0a SHA1 145d3e50933e14e9213002bebf4a4b2c8d39b177 SHA256 8d822835c1f3b39ce77ad920003bc509e7e1ef85f03b4123a71ac1a00224fce0 @@ -20,26 +17,15 @@ AUX flac.gyp 416 RMD160 5af2709cae77ba139b32b0f22bca347a87170e0b SHA1 cdb2f5404c AUX speex.gyp 434 RMD160 6111f912450ece1cb016f3800e1a22f135cc68ff SHA1 23c1917b8bc7a4b395a8b5c1b91b6661d73f3df3 SHA256 34b977ccf3092a3af963c6ec1dc79a1f26bf5114571e3dfd2e94c2a6633537b9 AUX v8.gyp 2602 RMD160 2949c9e2d8e2297182130e5984fb5f114c260a81 SHA1 7d32a04a7a921f30b0c3ed33a5593f1059832c96 SHA256 bc5342501d71754f23bd87914bb11841a7487330ba2f0462611dd1b0f99a2a43 DIST chromium-10.0.648.114.tar.bz2 143575680 RMD160 ead3f76fbeb52d20040d40568d91d5a79ec0338d SHA1 b9e791d35ec7fd69870aeb51f274736ecd352ff3 SHA256 ced4b65225d6cde105901db6702029d3ca11b8eff1ea03fb289d1898682cd4f3 -DIST chromium-10.0.648.82.tar.bz2 144519973 RMD160 91560d901c81a2ba23bba24bdf2a17011fc6c1c6 SHA1 02c61847f3a765cf54e1d67d019fe84ed04d577d SHA256 6dd79f9571f37fce63e3a2e17fe219898f0fb3b2b5ebea665fb5744bbfe41ffd +DIST chromium-10.0.648.126.tar.bz2 144072062 RMD160 9a68de8d14abbe23776553bddfad7341c3bfe6b4 SHA1 f7d0a33c94b839c8ffa39bd76e73b1ef68ad59d1 SHA256 8c128ea6bca6d62fe1905bce485fc2a2c62617b46802ddf49a61aafe32cf70f8 DIST chromium-11.0.686.0.tar.bz2 143222426 RMD160 681442606cb1dcf1033b05bc6f63ada7a2db39bf SHA1 67611be2032858018040f6102362b845d529b82a SHA256 5329b82caaf27042c1c4d129e2f6f75d199785bfa610e37339a4fc5bec2cf237 DIST chromium-11.0.686.1.tar.bz2 143217656 RMD160 8f1c519b9a8634f1c9d8f57015fb0f8db676e80b SHA1 616b160ae1a581cecd76715bce1261c8270744c7 SHA256 f6f0c6c18eec3fa7d431a0bce2514f84c36c6dd7d6eda4b8c85b9b4088a2bdc8 DIST chromium-9.0.597.107.tar.bz2 141198237 RMD160 7eec80b363fcc47b460e9a54c21940d309cc079d SHA1 4ebc93e202f87f724effb174459c3f5c2a10c9cd SHA256 1fde635017cd278e09242478de3469166dd89f93c95ce67acf8dfc67dddf8159 -DIST chromium-9.0.597.94.tar.bz2 140800844 RMD160 5816c28ddfaeb31c5b8aa882de2248c780f8cb0c SHA1 4a870da41ae25781e4806ec2c95703282fccc4d8 SHA256 7194d999a03bb54813cc49f978dd88f5b08cdd40cee4dcbe4ff5639c0ca3e8d5 -DIST chromium-9.0.597.98.tar.bz2 141115336 RMD160 5d0f3b83048363533919932a84a95fefd278cd42 SHA1 ea129fd68d78e84a573e25aef94a1f8697a22476 SHA256 48f7d849d3bfec40d6f7e5c76a964a36e9203127bafcb8068bcd63817c706d5f EBUILD chromium-10.0.648.114.ebuild 10031 RMD160 b29572b822da7cec0dac5a73b8d32926816cd9f8 SHA1 38cfe7ee7e24901f2e19df70a302d156770358f3 SHA256 bd271c9215cf615c4753aad60a32abce3ebc1e6036d5d2a1638d7d30df44df23 -EBUILD chromium-10.0.648.82.ebuild 10037 RMD160 e88e2ee92669c5b8e0304eed35925f37bad781c1 SHA1 9d93878122e190a693dbf0d5c4ce62d95052a237 SHA256 5647ce435a464d3f876d4bacce3a8e7c7406ae18fa095f6b26b1440e365941c7 +EBUILD chromium-10.0.648.126.ebuild 10031 RMD160 45cb54b98982455df0a0b7766ab1cc5f4c29572e SHA1 f1a7685f935ad56b482b0db700521817aa09a0d1 SHA256 f1bbab2be8f59f897093677412be8b23a2e9d974d006ad6aba635ec454adfe3b EBUILD chromium-11.0.686.0.ebuild 9983 RMD160 a48e08d0e614da764073a0ec97ce1daf7f12bfa5 SHA1 c9a14b99dc8397ffbc69995c48795687f6e67c94 SHA256 bb77cf5e4d3e05389cc96b4325a45fd671927545cc90629f445cacb52691ffc1 EBUILD chromium-11.0.686.1.ebuild 9983 RMD160 2ccb0b46e85b37470b6d3d99b456887e8f8342a9 SHA1 e68ad068c5385f76827e6a789ea2e390b3ab5e6b SHA256 b2c7ba0d9107f81250cfd7e45b58bed41a571afa0a64a882e677d35f9f4d844d EBUILD chromium-9.0.597.107.ebuild 9095 RMD160 2d7c9cba8475050d2a30fb699f16c6b1c0023b7c SHA1 93b1f4f2acc5839eb70ddbba8348143da1d12763 SHA256 09b4b0cccb794d5db7df3c5df0ca62a6f7f3e8831d5823cda2270bfd49ce08fb -EBUILD chromium-9.0.597.94.ebuild 9115 RMD160 2256e35af13b40686d634b586e091f60337942b5 SHA1 020d7ad4422ac6c6368a6bbda4046c774164007e SHA256 3d772bd92e13f79112a67196743dff420ad2bcaac1371c7dfcb448d2e87ba234 -EBUILD chromium-9.0.597.98.ebuild 9108 RMD160 6941b2d97130441aa454d4b75d281ef1b06eb843 SHA1 0881ab232a67e4645946acd4f75d31c3333f65c1 SHA256 dca284a5cd96af522542ce0eb493f23ab80097f28d0c0fc9292e5262c00478e5 EBUILD chromium-9999-r1.ebuild 12541 RMD160 83ea6b55722c84fcd20d0f39c2c60d4b7e12f611 SHA1 e04a66096c509eb87a5f708264653ed7080c8dea SHA256 799a8129c3da8d01cab2de6579a3a763b68d9c8845ab7c46242623c51f205168 -MISC ChangeLog 65758 RMD160 b67a4941fccdb4be77cb6fd3637921771991a6aa SHA1 4172ee0e762861704dec7d2e909e66648d96c3f9 SHA256 d683c7d57164dce2747ef0b4503e3d04c298a978a82275b511f0461460fd0f1c +MISC ChangeLog 66033 RMD160 02f3444ae687b1754a84dfd31a8eca7a261296f5 SHA1 21145074bb452af1e7b1521d2970dff059c4509c SHA256 e0f99e790ccb4053981ee52d25f60de26aeb3d0f7a766baf496c4171395b869a MISC metadata.xml 483 RMD160 f460db8d828791caa3496ad57a3c059a89912cf8 SHA1 2de8750f401b4e1f427545b5310a98716d719638 SHA256 ebc3ca0074799466d0f7485e6afca1dcd0a0ecf5768b3c2f9aabe64a1ec52759 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) - -iEYEARECAAYFAk1uIL0ACgkQnZsgo/h8kNYBaACfQhmCLaAPbyLMKaWW1CV+l1OB -xe0An0rTnEbb+YE+foG5tRtBUu86Dhqt -=LoDt ------END PGP SIGNATURE----- diff --git a/www-client/chromium/chromium-10.0.648.82.ebuild b/www-client/chromium/chromium-10.0.648.126.ebuild index ee5463fd16e0..d3dd96597562 100644 --- a/www-client/chromium/chromium-10.0.648.82.ebuild +++ b/www-client/chromium/chromium-10.0.648.126.ebuild @@ -1,10 +1,10 @@ # 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-10.0.648.82.ebuild,v 1.4 2011/02/22 18:24:22 phajdan.jr Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-10.0.648.126.ebuild,v 1.1 2011/03/03 11:20:12 phajdan.jr Exp $ EAPI="3" PYTHON_DEPEND="2:2.6" -V8_DEPEND="3.0.12.18" +V8_DEPEND="3.0.12.29" inherit eutils flag-o-matic multilib pax-utils portability python \ toolchain-funcs versionator virtualx @@ -37,7 +37,7 @@ RDEPEND="app-arch/bzip2 >=media-video/ffmpeg-0.6_p25767[threads] cups? ( >=net-print/cups-1.3.11 ) sys-libs/zlib - >=x11-libs/gtk+-2.14.7 + x11-libs/gtk+:2 x11-libs/libXScrnSaver x11-libs/libXtst" DEPEND="${RDEPEND} diff --git a/www-client/chromium/chromium-9.0.597.94.ebuild b/www-client/chromium/chromium-9.0.597.94.ebuild deleted file mode 100644 index 13d9808e8d3d..000000000000 --- a/www-client/chromium/chromium-9.0.597.94.ebuild +++ /dev/null @@ -1,297 +0,0 @@ -# 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-9.0.597.94.ebuild,v 1.5 2011/02/18 10:46:51 phajdan.jr Exp $ - -EAPI="3" -PYTHON_DEPEND="2:2.6" - -inherit eutils flag-o-matic multilib pax-utils portability python \ - toolchain-funcs versionator - -DESCRIPTION="Open-source version of Google Chrome web browser" -HOMEPAGE="http://chromium.org/" -SRC_URI="http://build.chromium.org/buildbot/official/${P}.tar.bz2" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ~arm x86" -IUSE="cups +gecko-mediaplayer gnome gnome-keyring system-v8" - -RDEPEND="app-arch/bzip2 - system-v8? ( >=dev-lang/v8-2.5.9.15 ) - dev-libs/dbus-glib - >=dev-libs/icu-4.4.1 - >=dev-libs/libevent-1.4.13 - dev-libs/libxml2[icu] - dev-libs/libxslt - >=dev-libs/nss-3.12.3 - gnome? ( >=gnome-base/gconf-2.24.0 ) - gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 ) - >=media-libs/alsa-lib-1.0.19 - virtual/jpeg - media-libs/libpng - media-libs/libvpx - >=media-video/ffmpeg-0.6_p25767[threads] - cups? ( >=net-print/cups-1.3.11 ) - sys-libs/zlib - >=x11-libs/gtk+-2.14.7 - x11-libs/libXScrnSaver - x11-libs/libXtst" -DEPEND="${RDEPEND} - dev-lang/perl - >=dev-util/chromium-tools-0.1.4 - >=dev-util/gperf-3.0.3 - >=dev-util/pkgconfig-0.23 - sys-devel/flex - >=sys-devel/make-3.81-r2" -RDEPEND+=" - || ( - x11-themes/gnome-icon-theme - x11-themes/oxygen-molecule - x11-themes/tango-icon-theme - x11-themes/xfce4-icon-theme - ) - x11-misc/xdg-utils - virtual/ttf-fonts - gecko-mediaplayer? ( !www-plugins/gecko-mediaplayer[gnome] )" - -egyp() { - set -- build/gyp_chromium --depth=. "${@}" - echo "${@}" >&2 - "${@}" -} - -get_installed_v8_version() { - best_version dev-lang/v8 | sed -e 's@dev-lang/v8-@@g' -} - -remove_bundled_lib() { - local out - out="$(find $1 -type f \! -iname '*.gyp' -print -delete)" \ - || die "failed to remove bundled library $1" - if [[ -z $out ]]; then - die "no files matched when removing bundled library $1" - fi -} - -pkg_setup() { - CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser" - - # Make sure the build system will use the right tools, bug #340795. - tc-export AR CC CXX RANLIB - - # Make sure the build system will use the right python, bug #344367. - python_set_active_version 2 - python_pkg_setup - - # Prevent user problems like bug #299777. - if ! grep -q /dev/shm <<< $(get_mounts); then - ewarn "You don't have tmpfs mounted at /dev/shm." - ewarn "${PN} may fail to start in that configuration." - ewarn "Please uncomment the /dev/shm entry in /etc/fstab," - ewarn "and run 'mount /dev/shm'." - fi - if [ `stat -c %a /dev/shm` -ne 1777 ]; then - ewarn "/dev/shm does not have correct permissions." - ewarn "${PN} may fail to start in that configuration." - ewarn "Please run 'chmod 1777 /dev/shm'." - fi -} - -src_prepare() { - # Enable optional support for gecko-mediaplayer. - epatch "${FILESDIR}"/${PN}-gecko-mediaplayer-r0.patch - - # Make sure we don't use bundled libvpx headers. - epatch "${FILESDIR}"/${PN}-system-vpx-r1.patch - - # Small fixes to make tests compile, to be upstreamed. - epatch "${FILESDIR}"/${PN}-tests-r0.patch - - remove_bundled_lib "third_party/bzip2" - remove_bundled_lib "third_party/codesighs" - remove_bundled_lib "third_party/icu" - remove_bundled_lib "third_party/jemalloc" - remove_bundled_lib "third_party/lcov" - remove_bundled_lib "third_party/libevent" - remove_bundled_lib "third_party/libjpeg" - remove_bundled_lib "third_party/libpng" - remove_bundled_lib "third_party/libvpx" - remove_bundled_lib "third_party/libxml" - remove_bundled_lib "third_party/libxslt" - remove_bundled_lib "third_party/lzma_sdk" - remove_bundled_lib "third_party/molokocacao" - remove_bundled_lib "third_party/ocmock" - remove_bundled_lib "third_party/yasm" - # TODO: also remove third_party/ffmpeg (needs to be compile-tested). - # TODO: also remove third_party/zlib. For now the compilation fails if we - # remove it (minizip-related). - - local v8_bundled="$(v8-extract-version v8/src/version.cc)" - if use system-v8; then - local v8_installed="$(get_installed_v8_version)" - einfo "V8 version: bundled - ${v8_bundled}; installed - ${v8_installed}" - version_is_at_least "${v8_bundled}" "${v8_installed}" || die - else - einfo "Bundled V8 version: ${v8_bundled}" - fi - - if use system-v8; then - # Provide our own gyp file that links with the system v8. - # TODO: move this upstream. - cp "${FILESDIR}"/v8.gyp v8/tools/gyp || die - - remove_bundled_lib "v8" - - # The implementation files include v8 headers with full path, - # like #include "v8/include/v8.h". Make sure the system headers - # will be used. - # TODO: find a solution that can be upstreamed. - rmdir v8/include || die - ln -s /usr/include v8/include || die - fi - - # Make sure the build system will use the right python, bug #344367. - # Only convert directories that need it, to save time. - python_convert_shebangs -q -r 2 build tools -} - -src_configure() { - local myconf="" - - # Never tell the build system to "enable" SSE2, it has a few unexpected - # additions, bug #336871. - myconf+=" -Ddisable_sse2=1" - - # Use system-provided libraries. - # TODO: use_system_hunspell (upstream changes needed). - # TODO: use_system_ssl (need to consult upstream). - myconf+=" - -Duse_system_bzip2=1 - -Duse_system_ffmpeg=1 - -Duse_system_icu=1 - -Duse_system_libevent=1 - -Duse_system_libjpeg=1 - -Duse_system_libpng=1 - -Duse_system_libxml=1 - -Duse_system_vpx=1 - -Duse_system_zlib=1" - - # The dependency on cups is optional, see bug #324105. - if use cups; then - myconf+=" -Duse_cups=1" - else - myconf+=" -Duse_cups=0" - fi - - # Make GConf dependency optional, http://crbug.com/13322. - if use gnome; then - myconf+=" -Duse_gconf=1" - else - myconf+=" -Duse_gconf=0" - fi - - if use "gnome-keyring"; then - myconf+=" -Duse_gnome_keyring=1 -Dlinux_link_gnome_keyring=1" - else - # TODO: we should also disable code trying to dlopen - # gnome-keyring in that case. - myconf+=" -Duse_gnome_keyring=0 -Dlinux_link_gnome_keyring=0" - fi - - # Enable sandbox. - myconf+=" - -Dlinux_sandbox_path=${CHROMIUM_HOME}/chrome_sandbox - -Dlinux_sandbox_chrome_path=${CHROMIUM_HOME}/chrome" - - if host-is-pax; then - # Prevent the build from failing (bug #301880). The performance - # difference is very small. - myconf+=" -Dv8_use_snapshot=0" - fi - - if use gecko-mediaplayer; then - # Disable hardcoded blacklist for gecko-mediaplayer. - # When www-plugins/gecko-mediaplayer is compiled with USE=gnome, it causes - # the browser to hang. We can handle the situation via dependencies, - # thus making it possible to use gecko-mediaplayer. - append-flags -DGENTOO_CHROMIUM_ENABLE_GECKO_MEDIAPLAYER - fi - - # Our system ffmpeg should support more codecs than the bundled one - # for Chromium. - myconf+=" -Dproprietary_codecs=1" - - # Use target arch detection logic from bug #296917. - local myarch="$ABI" - [[ $myarch = "" ]] && myarch="$ARCH" - - if [[ $myarch = amd64 ]] ; then - myconf+=" -Dtarget_arch=x64" - elif [[ $myarch = x86 ]] ; then - myconf+=" -Dtarget_arch=ia32" - elif [[ $myarch = arm ]] ; then - # TODO: check this again after - # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=39509 is fixed. - append-flags -fno-tree-sink - - myconf+=" -Dtarget_arch=arm -Ddisable_nacl=1 -Dlinux_use_tcmalloc=0" - else - die "Failed to determine target arch, got '$myarch'." - fi - - # 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=" - - # Avoid a build error with -Os, bug #352457. - replace-flags "-Os" "-O2" - - egyp ${myconf} || die -} - -src_compile() { - emake chrome chrome_sandbox BUILDTYPE=Release V=1 || die - pax-mark m out/Release/chrome -} - -src_install() { - exeinto "${CHROMIUM_HOME}" - doexe out/Release/chrome - doexe out/Release/chrome_sandbox || die - fperms 4755 "${CHROMIUM_HOME}/chrome_sandbox" - doexe out/Release/xdg-settings || die - doexe "${FILESDIR}"/chromium-launcher.sh || die - - insinto "${CHROMIUM_HOME}" - doins out/Release/chrome.pak || die - doins out/Release/resources.pak || die - - doins -r out/Release/locales || die - doins -r out/Release/resources || die - - # chrome.1 is for chromium --help - newman out/Release/chrome.1 chrome.1 || die - newman out/Release/chrome.1 chromium.1 || die - - # Chromium looks for these in its folder - # See media_posix.cc and base_paths_linux.cc - dosym /usr/$(get_libdir)/libavcodec.so.52 "${CHROMIUM_HOME}" || die - dosym /usr/$(get_libdir)/libavformat.so.52 "${CHROMIUM_HOME}" || die - dosym /usr/$(get_libdir)/libavutil.so.50 "${CHROMIUM_HOME}" || die - - # Install icon and desktop entry. - newicon out/Release/product_logo_48.png ${PN}-browser.png || die - dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium || die - make_desktop_entry chromium "Chromium" ${PN}-browser "Network;WebBrowser" \ - "MimeType=text/html;text/xml;application/xhtml+xml;" - sed -e "/^Exec/s/$/ %U/" -i "${D}"/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 - doins "${FILESDIR}"/chromium.xml || die - fi -} diff --git a/www-client/chromium/chromium-9.0.597.98.ebuild b/www-client/chromium/chromium-9.0.597.98.ebuild deleted file mode 100644 index cda31fadc197..000000000000 --- a/www-client/chromium/chromium-9.0.597.98.ebuild +++ /dev/null @@ -1,297 +0,0 @@ -# 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-9.0.597.98.ebuild,v 1.2 2011/02/18 10:46:51 phajdan.jr Exp $ - -EAPI="3" -PYTHON_DEPEND="2:2.6" - -inherit eutils flag-o-matic multilib pax-utils portability python \ - toolchain-funcs versionator - -DESCRIPTION="Open-source version of Google Chrome web browser" -HOMEPAGE="http://chromium.org/" -SRC_URI="http://build.chromium.org/official/${P}.tar.bz2" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="cups +gecko-mediaplayer gnome gnome-keyring system-v8" - -RDEPEND="app-arch/bzip2 - system-v8? ( >=dev-lang/v8-2.5.9.15 ) - dev-libs/dbus-glib - >=dev-libs/icu-4.4.1 - >=dev-libs/libevent-1.4.13 - dev-libs/libxml2[icu] - dev-libs/libxslt - >=dev-libs/nss-3.12.3 - gnome? ( >=gnome-base/gconf-2.24.0 ) - gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 ) - >=media-libs/alsa-lib-1.0.19 - virtual/jpeg - media-libs/libpng - media-libs/libvpx - >=media-video/ffmpeg-0.6_p25767[threads] - cups? ( >=net-print/cups-1.3.11 ) - sys-libs/zlib - >=x11-libs/gtk+-2.14.7 - x11-libs/libXScrnSaver - x11-libs/libXtst" -DEPEND="${RDEPEND} - dev-lang/perl - >=dev-util/chromium-tools-0.1.4 - >=dev-util/gperf-3.0.3 - >=dev-util/pkgconfig-0.23 - sys-devel/flex - >=sys-devel/make-3.81-r2" -RDEPEND+=" - || ( - x11-themes/gnome-icon-theme - x11-themes/oxygen-molecule - x11-themes/tango-icon-theme - x11-themes/xfce4-icon-theme - ) - x11-misc/xdg-utils - virtual/ttf-fonts - gecko-mediaplayer? ( !www-plugins/gecko-mediaplayer[gnome] )" - -egyp() { - set -- build/gyp_chromium --depth=. "${@}" - echo "${@}" >&2 - "${@}" -} - -get_installed_v8_version() { - best_version dev-lang/v8 | sed -e 's@dev-lang/v8-@@g' -} - -remove_bundled_lib() { - local out - out="$(find $1 -type f \! -iname '*.gyp' -print -delete)" \ - || die "failed to remove bundled library $1" - if [[ -z $out ]]; then - die "no files matched when removing bundled library $1" - fi -} - -pkg_setup() { - CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser" - - # Make sure the build system will use the right tools, bug #340795. - tc-export AR CC CXX RANLIB - - # Make sure the build system will use the right python, bug #344367. - python_set_active_version 2 - python_pkg_setup - - # Prevent user problems like bug #299777. - if ! grep -q /dev/shm <<< $(get_mounts); then - ewarn "You don't have tmpfs mounted at /dev/shm." - ewarn "${PN} may fail to start in that configuration." - ewarn "Please uncomment the /dev/shm entry in /etc/fstab," - ewarn "and run 'mount /dev/shm'." - fi - if [ `stat -c %a /dev/shm` -ne 1777 ]; then - ewarn "/dev/shm does not have correct permissions." - ewarn "${PN} may fail to start in that configuration." - ewarn "Please run 'chmod 1777 /dev/shm'." - fi -} - -src_prepare() { - # Enable optional support for gecko-mediaplayer. - epatch "${FILESDIR}"/${PN}-gecko-mediaplayer-r0.patch - - # Make sure we don't use bundled libvpx headers. - epatch "${FILESDIR}"/${PN}-system-vpx-r1.patch - - # Small fixes to make tests compile, to be upstreamed. - epatch "${FILESDIR}"/${PN}-tests-r0.patch - - remove_bundled_lib "third_party/bzip2" - remove_bundled_lib "third_party/codesighs" - remove_bundled_lib "third_party/icu" - remove_bundled_lib "third_party/jemalloc" - remove_bundled_lib "third_party/lcov" - remove_bundled_lib "third_party/libevent" - remove_bundled_lib "third_party/libjpeg" - remove_bundled_lib "third_party/libpng" - remove_bundled_lib "third_party/libvpx" - remove_bundled_lib "third_party/libxml" - remove_bundled_lib "third_party/libxslt" - remove_bundled_lib "third_party/lzma_sdk" - remove_bundled_lib "third_party/molokocacao" - remove_bundled_lib "third_party/ocmock" - remove_bundled_lib "third_party/yasm" - # TODO: also remove third_party/ffmpeg (needs to be compile-tested). - # TODO: also remove third_party/zlib. For now the compilation fails if we - # remove it (minizip-related). - - local v8_bundled="$(v8-extract-version v8/src/version.cc)" - if use system-v8; then - local v8_installed="$(get_installed_v8_version)" - einfo "V8 version: bundled - ${v8_bundled}; installed - ${v8_installed}" - version_is_at_least "${v8_bundled}" "${v8_installed}" || die - else - einfo "Bundled V8 version: ${v8_bundled}" - fi - - if use system-v8; then - # Provide our own gyp file that links with the system v8. - # TODO: move this upstream. - cp "${FILESDIR}"/v8.gyp v8/tools/gyp || die - - remove_bundled_lib "v8" - - # The implementation files include v8 headers with full path, - # like #include "v8/include/v8.h". Make sure the system headers - # will be used. - # TODO: find a solution that can be upstreamed. - rmdir v8/include || die - ln -s /usr/include v8/include || die - fi - - # Make sure the build system will use the right python, bug #344367. - # Only convert directories that need it, to save time. - python_convert_shebangs -q -r 2 build tools -} - -src_configure() { - local myconf="" - - # Never tell the build system to "enable" SSE2, it has a few unexpected - # additions, bug #336871. - myconf+=" -Ddisable_sse2=1" - - # Use system-provided libraries. - # TODO: use_system_hunspell (upstream changes needed). - # TODO: use_system_ssl (need to consult upstream). - myconf+=" - -Duse_system_bzip2=1 - -Duse_system_ffmpeg=1 - -Duse_system_icu=1 - -Duse_system_libevent=1 - -Duse_system_libjpeg=1 - -Duse_system_libpng=1 - -Duse_system_libxml=1 - -Duse_system_vpx=1 - -Duse_system_zlib=1" - - # The dependency on cups is optional, see bug #324105. - if use cups; then - myconf+=" -Duse_cups=1" - else - myconf+=" -Duse_cups=0" - fi - - # Make GConf dependency optional, http://crbug.com/13322. - if use gnome; then - myconf+=" -Duse_gconf=1" - else - myconf+=" -Duse_gconf=0" - fi - - if use "gnome-keyring"; then - myconf+=" -Duse_gnome_keyring=1 -Dlinux_link_gnome_keyring=1" - else - # TODO: we should also disable code trying to dlopen - # gnome-keyring in that case. - myconf+=" -Duse_gnome_keyring=0 -Dlinux_link_gnome_keyring=0" - fi - - # Enable sandbox. - myconf+=" - -Dlinux_sandbox_path=${CHROMIUM_HOME}/chrome_sandbox - -Dlinux_sandbox_chrome_path=${CHROMIUM_HOME}/chrome" - - if host-is-pax; then - # Prevent the build from failing (bug #301880). The performance - # difference is very small. - myconf+=" -Dv8_use_snapshot=0" - fi - - if use gecko-mediaplayer; then - # Disable hardcoded blacklist for gecko-mediaplayer. - # When www-plugins/gecko-mediaplayer is compiled with USE=gnome, it causes - # the browser to hang. We can handle the situation via dependencies, - # thus making it possible to use gecko-mediaplayer. - append-flags -DGENTOO_CHROMIUM_ENABLE_GECKO_MEDIAPLAYER - fi - - # Our system ffmpeg should support more codecs than the bundled one - # for Chromium. - myconf+=" -Dproprietary_codecs=1" - - # Use target arch detection logic from bug #296917. - local myarch="$ABI" - [[ $myarch = "" ]] && myarch="$ARCH" - - if [[ $myarch = amd64 ]] ; then - myconf+=" -Dtarget_arch=x64" - elif [[ $myarch = x86 ]] ; then - myconf+=" -Dtarget_arch=ia32" - elif [[ $myarch = arm ]] ; then - # TODO: check this again after - # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=39509 is fixed. - append-flags -fno-tree-sink - - myconf+=" -Dtarget_arch=arm -Ddisable_nacl=1 -Dlinux_use_tcmalloc=0" - else - die "Failed to determine target arch, got '$myarch'." - fi - - # 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=" - - # Avoid a build error with -Os, bug #352457. - replace-flags "-Os" "-O2" - - egyp ${myconf} || die -} - -src_compile() { - emake chrome chrome_sandbox BUILDTYPE=Release V=1 || die - pax-mark m out/Release/chrome -} - -src_install() { - exeinto "${CHROMIUM_HOME}" - doexe out/Release/chrome - doexe out/Release/chrome_sandbox || die - fperms 4755 "${CHROMIUM_HOME}/chrome_sandbox" - doexe out/Release/xdg-settings || die - doexe "${FILESDIR}"/chromium-launcher.sh || die - - insinto "${CHROMIUM_HOME}" - doins out/Release/chrome.pak || die - doins out/Release/resources.pak || die - - doins -r out/Release/locales || die - doins -r out/Release/resources || die - - # chrome.1 is for chromium --help - newman out/Release/chrome.1 chrome.1 || die - newman out/Release/chrome.1 chromium.1 || die - - # Chromium looks for these in its folder - # See media_posix.cc and base_paths_linux.cc - dosym /usr/$(get_libdir)/libavcodec.so.52 "${CHROMIUM_HOME}" || die - dosym /usr/$(get_libdir)/libavformat.so.52 "${CHROMIUM_HOME}" || die - dosym /usr/$(get_libdir)/libavutil.so.50 "${CHROMIUM_HOME}" || die - - # Install icon and desktop entry. - newicon out/Release/product_logo_48.png ${PN}-browser.png || die - dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium || die - make_desktop_entry chromium "Chromium" ${PN}-browser "Network;WebBrowser" \ - "MimeType=text/html;text/xml;application/xhtml+xml;" - sed -e "/^Exec/s/$/ %U/" -i "${D}"/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 - doins "${FILESDIR}"/chromium.xml || die - fi -} |