From 9e3f52ed2fd92de6599b47dc1c1eeb1080361b23 Mon Sep 17 00:00:00 2001 From: Bernard Cafarelli Date: Wed, 27 Oct 2010 08:41:21 +0000 Subject: Version bump for dev channel release. Package-Manager: portage-2.2.0_alpha1/cvs/Linux x86_64 --- www-client/chromium/ChangeLog | 8 +- www-client/chromium/Manifest | 6 +- www-client/chromium/chromium-8.0.552.0.ebuild | 245 ------------------------- www-client/chromium/chromium-8.0.552.18.ebuild | 245 +++++++++++++++++++++++++ 4 files changed, 255 insertions(+), 249 deletions(-) delete mode 100644 www-client/chromium/chromium-8.0.552.0.ebuild create mode 100644 www-client/chromium/chromium-8.0.552.18.ebuild diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog index fe9369161f53..8430c8c977c5 100644 --- a/www-client/chromium/ChangeLog +++ b/www-client/chromium/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for www-client/chromium # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.207 2010/10/22 08:45:04 voyageur Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.208 2010/10/27 08:41:21 voyageur Exp $ + +*chromium-8.0.552.18 (27 Oct 2010) + + 27 Oct 2010; Bernard Cafarelli + -chromium-8.0.552.0.ebuild, +chromium-8.0.552.18.ebuild: + Version bump for dev channel release. *chromium-8.0.552.11 (22 Oct 2010) diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest index 584b933351c7..8415a0e367b2 100644 --- a/www-client/chromium/Manifest +++ b/www-client/chromium/Manifest @@ -13,16 +13,16 @@ DIST chromium-6.0.472.63.tar.bz2 123990097 RMD160 7931846fd581f76ba2039f82b64156 DIST chromium-7.0.517.36.tar.bz2 132903248 RMD160 df508769cdd50a061531f8d7387c03e7ad85ef04 SHA1 9fad31d9204e5530faad17a649c97e9ee56d2cbe SHA256 93e8d2982dc14eba6f1c6e5c851679ebbd562769443ce228eaa29f2e84d02248 DIST chromium-7.0.517.41.tar.bz2 132870680 RMD160 31d2588e4a7d7bc538903c28e0dc3d3de6a63315 SHA1 f8bbd74aaeec073c9eba29326d1316659dab5674 SHA256 0370176f61824f1f7bdb77adb921b91b1bb0213adda2edad34e59c7911a397dc DIST chromium-7.0.544.0.tar.bz2 148954341 RMD160 1a5dd420c42cf35f5982d35746a6b563c3f919c8 SHA1 03e3380da1a6e7bcbdfb71576334bd2100369d04 SHA256 a4d1753c44ba8bf898fb3ce7e52389333453c55b7e244c9f702088ff0a693672 -DIST chromium-8.0.552.0.tar.bz2 134766822 RMD160 ab65406596ea0d04547c41e9212497da07ddb1d0 SHA1 a6fe50ffb372daf13698ea85d8ae2f43d7ca3027 SHA256 643710a66640c6f393a217c2736a4ade882b3d6f3c69e1deb5b52b46eba92eeb DIST chromium-8.0.552.11.tar.bz2 135205023 RMD160 01fd17b221d6522ed09cd0491a8660feb950c014 SHA1 7ea5eae72c1e8afd8305a8624a8e57006d77dfea SHA256 fb29a8546753cee979c35a83354f2237d021ee9896fe1f3ecacd4ba8990a5390 +DIST chromium-8.0.552.18.tar.bz2 135393015 RMD160 2a2aed03d1e04ec8e4b27f2c1a917229ffa1f6be SHA1 235dc1bba137e58864160d3824cd0b75d503aae2 SHA256 908d3ad574509932d6797ea00fa9caa5c4a0f6aa36af2ae113bc18206239524a EBUILD chromium-6.0.472.62.ebuild 6869 RMD160 4f789a1c899d639aed4f69a831dcd932ec690903 SHA1 07c983a01ba282fe0f9684c3a264de81e4623a16 SHA256 14d395f2840efe6d81b5f4225284af9084087c4ac429fcdbb0ddd05a3a0f9ffd EBUILD chromium-6.0.472.63.ebuild 6875 RMD160 868088280a7e82a3016c6feee15c61ea8e4b3237 SHA1 9f2a03a0592b51530595f35f24eea41b48a3a275 SHA256 54b9433c933f4faa90e1057baa29dd461e639931d2cacdb963996ed28f7e995c EBUILD chromium-7.0.517.36.ebuild 6611 RMD160 11af550adfeb2e2dab6fb5ee2247bf52458ed43c SHA1 72a8bb8d6dd74de4290c3d08d4f0908969694f04 SHA256 dd32a37a19a669afcb5a669405aa004e92a20d5db8b09cd0aac0efac090adbe5 EBUILD chromium-7.0.517.41-r1.ebuild 6614 RMD160 2f5c691328c33965cdbfc257c8be5a98cbaf1903 SHA1 e8a10b032b98c4119c1a2b08c5dfe372535cc497 SHA256 d63ef76dc46a3881582a17f13db9ba8a3df598683bdc18ece3b70abfc3dcf31d EBUILD chromium-7.0.517.41.ebuild 6605 RMD160 3751c1f28930c71e442c7656ddede271e3230236 SHA1 a965c1c3d75831093b666b02b1d22d3847a73d4a SHA256 57c191137db6de2ab5ed0bd629524a060b71c936d37228bca41d8702ca11753b EBUILD chromium-7.0.544.0-r2.ebuild 7600 RMD160 4e30b02693752b828e51ac1783c45b3fd4a366b1 SHA1 e119fc2bc5c11e94ffd272fab5ba034c06940b45 SHA256 f888cf80d72f1e08a48400a157d94ada91444b2427dd9a19f298c764899b5aec -EBUILD chromium-8.0.552.0.ebuild 7529 RMD160 5fad47e8467adc0ff6670e335ccbf0d261086d75 SHA1 18f88c73f58f32c559afa6973bd6d36c31250189 SHA256 2236e24fb34e090e960edffe0bceac5373caeff607eded5b92dd1bf7eef71b9c EBUILD chromium-8.0.552.11.ebuild 7528 RMD160 7dbb495dd3113cf213a2cd37c750396b4e006997 SHA1 ec4c1ec8af81e1b19fcc578d857b917ae42a710c SHA256 a9d4d352f4606c31329f48da5c701b0f9104c83c6dd50a5d579267417fba4d2d +EBUILD chromium-8.0.552.18.ebuild 7528 RMD160 ce5f3687e5decd3a8a24658619874c3062fa5e45 SHA1 9b747f147d97145d1465c9fcb510e4ec39ee44bc SHA256 34bda0e225fa9deb3efe6b6e4c202c0ad4732ff5a0e26669bf0c5929ecaad5c3 EBUILD chromium-9999.ebuild 9237 RMD160 76903caf5b2038704282d80fdb5644752c2c5349 SHA1 eebfde64ac34592e502a097b5bc33de684694109 SHA256 8f8648bb1c5890896043e36fddee75ebf4377e94f61d00e330b747e708e41a9d -MISC ChangeLog 45542 RMD160 8f74da8278a35f198d4e5a2423a075cbce3f18d4 SHA1 6d6bcac04c02819699fa17e3cf8524a83d98b9ec SHA256 dce76f7de5e636ba204230f44a28144c67a774b1e665231b48cb9e4eb26bdd35 +MISC ChangeLog 45733 RMD160 3b06ede5abc8a765958f0b2627517d00b74354c3 SHA1 0bc7467f3b7d0efecb26c2848fe1db799463c004 SHA256 518ae58cc705bdaf0f13fd19395e80b41270a7db1de280cafa10be1a09aff0b9 MISC metadata.xml 516 RMD160 55abec043e516fad54cc6c9f5aff0d1ac6aba738 SHA1 9cb50bcd2f1e7f0dc6e257fcab3b24f0f0f90f0c SHA256 b2f497aa9d3ab3deb4cbd25eedc3037df449349a3506f1af7e3de9730c522b8b diff --git a/www-client/chromium/chromium-8.0.552.0.ebuild b/www-client/chromium/chromium-8.0.552.0.ebuild deleted file mode 100644 index cd2b43a9a1cb..000000000000 --- a/www-client/chromium/chromium-8.0.552.0.ebuild +++ /dev/null @@ -1,245 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-8.0.552.0.ebuild,v 1.2 2010/10/15 07:45:03 phajdan.jr Exp $ - -EAPI="2" - -inherit eutils flag-o-matic multilib pax-utils toolchain-funcs - -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-sqlite" - -RDEPEND="app-arch/bzip2 - system-sqlite? ( - >=dev-db/sqlite-3.6.23.1[fts3,icu,secure-delete,threadsafe] - ) - >=dev-libs/icu-4.4.1 - >=dev-libs/libevent-1.4.13 - dev-libs/libxml2 - dev-libs/libxslt - >=dev-libs/nss-3.12.3 - >=gnome-base/gconf-2.24.0 - gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 ) - >=media-libs/alsa-lib-1.0.19 - media-libs/jpeg:0 - media-libs/libpng - >=media-video/ffmpeg-0.6_p25423[threads] - cups? ( >=net-print/cups-1.4.4 ) - sys-libs/zlib - >=x11-libs/gtk+-2.14.7 - x11-libs/libXScrnSaver" -DEPEND="${RDEPEND} - dev-lang/perl - >=dev-util/gperf-3.0.3 - >=dev-util/pkgconfig-0.23 - sys-devel/flex" -RDEPEND+=" - || ( - x11-themes/gnome-icon-theme - x11-themes/oxygen-molecule - x11-themes/tango-icon-theme - x11-themes/xfce4-icon-theme - ) - x11-apps/xmessage - x11-misc/xdg-utils - virtual/ttf-fonts - gecko-mediaplayer? ( !www-plugins/gecko-mediaplayer[gnome] )" - -remove_bundled_lib() { - einfo "Removing bundled library $1 ..." - local out - out="$(find $1 -mindepth 1 \! -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 -} - -src_prepare() { - # Small fix to the system-provided icu support, - # to be upstreamed. - epatch "${FILESDIR}"/${PN}-system-icu-r1.patch - - # Enable optional support for gecko-mediaplayer. - epatch "${FILESDIR}"/${PN}-gecko-mediaplayer-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/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/pyftpdlib" - remove_bundled_lib "third_party/simplejson" - remove_bundled_lib "third_party/tlslite" - # 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). - - if use system-sqlite; then - remove_bundled_lib "third_party/sqlite/src" - remove_bundled_lib "third_party/sqlite/preprocessed" - fi -} - -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_zlib=1" - - if use system-sqlite; then - myconf+=" -Duse_system_sqlite=1" - fi - - # The dependency on cups is optional, see bug #324105. - if use cups; then - myconf+=" -Duse_cups=1" - else - myconf+=" -Duse_cups=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 - - if [[ "$(gcc-major-version)$(gcc-minor-version)" == "44" ]]; then - myconf+=" -Dno_strict_aliasing=1 -Dgcc_version=44" - fi - - # Work around a likely GCC bug, see bug #331945. - if [[ "$(gcc-major-version)$(gcc-minor-version)" == "45" ]]; then - append-flags -fno-ipa-cp - 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=" - - build/gyp_chromium --depth=. ${myconf} || die -} - -src_compile() { - emake chrome chrome_sandbox BUILDTYPE=Release V=1 || die -} - -src_install() { - exeinto "${CHROMIUM_HOME}" - pax-mark m out/Release/chrome - 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-8.0.552.18.ebuild b/www-client/chromium/chromium-8.0.552.18.ebuild new file mode 100644 index 000000000000..c36030f10cc4 --- /dev/null +++ b/www-client/chromium/chromium-8.0.552.18.ebuild @@ -0,0 +1,245 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-8.0.552.18.ebuild,v 1.1 2010/10/27 08:41:21 voyageur Exp $ + +EAPI="2" + +inherit eutils flag-o-matic multilib pax-utils toolchain-funcs + +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-sqlite" + +RDEPEND="app-arch/bzip2 + system-sqlite? ( + >=dev-db/sqlite-3.6.23.1[fts3,icu,secure-delete,threadsafe] + ) + >=dev-libs/icu-4.4.1 + >=dev-libs/libevent-1.4.13 + dev-libs/libxml2 + dev-libs/libxslt + >=dev-libs/nss-3.12.3 + >=gnome-base/gconf-2.24.0 + gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 ) + >=media-libs/alsa-lib-1.0.19 + media-libs/jpeg:0 + media-libs/libpng + >=media-video/ffmpeg-0.6_p25423[threads] + cups? ( >=net-print/cups-1.4.4 ) + sys-libs/zlib + >=x11-libs/gtk+-2.14.7 + x11-libs/libXScrnSaver" +DEPEND="${RDEPEND} + dev-lang/perl + >=dev-util/gperf-3.0.3 + >=dev-util/pkgconfig-0.23 + sys-devel/flex" +RDEPEND+=" + || ( + x11-themes/gnome-icon-theme + x11-themes/oxygen-molecule + x11-themes/tango-icon-theme + x11-themes/xfce4-icon-theme + ) + x11-apps/xmessage + x11-misc/xdg-utils + virtual/ttf-fonts + gecko-mediaplayer? ( !www-plugins/gecko-mediaplayer[gnome] )" + +remove_bundled_lib() { + einfo "Removing bundled library $1 ..." + local out + out="$(find $1 -mindepth 1 \! -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 +} + +src_prepare() { + # Small fix to the system-provided icu support, + # to be upstreamed. + epatch "${FILESDIR}"/${PN}-system-icu-r1.patch + + # Enable optional support for gecko-mediaplayer. + epatch "${FILESDIR}"/${PN}-gecko-mediaplayer-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/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/pyftpdlib" + remove_bundled_lib "third_party/simplejson" + remove_bundled_lib "third_party/tlslite" + # 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). + + if use system-sqlite; then + remove_bundled_lib "third_party/sqlite/src" + remove_bundled_lib "third_party/sqlite/preprocessed" + fi +} + +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_zlib=1" + + if use system-sqlite; then + myconf+=" -Duse_system_sqlite=1" + fi + + # The dependency on cups is optional, see bug #324105. + if use cups; then + myconf+=" -Duse_cups=1" + else + myconf+=" -Duse_cups=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 + + if [[ "$(gcc-major-version)$(gcc-minor-version)" == "44" ]]; then + myconf+=" -Dno_strict_aliasing=1 -Dgcc_version=44" + fi + + # Work around a likely GCC bug, see bug #331945. + if [[ "$(gcc-major-version)$(gcc-minor-version)" == "45" ]]; then + append-flags -fno-ipa-cp + 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=" + + build/gyp_chromium --depth=. ${myconf} || die +} + +src_compile() { + emake chrome chrome_sandbox BUILDTYPE=Release V=1 || die +} + +src_install() { + exeinto "${CHROMIUM_HOME}" + pax-mark m out/Release/chrome + 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 +} -- cgit v1.2.3-65-gdbad