diff options
| author |   Paweł Hajdan <phajdan.jr@gentoo.org> | 2011-07-17 23:06:55 +0000 |
|---|---|---|
| committer | Paweł Hajdan <phajdan.jr@gentoo.org> | 2011-07-17 23:06:55 +0000 |
| commit | d54d9985618b7f1f2ce635f03e86c621b869a0f4 (patch) | |
| tree | 83912f63305ec5eacd8cd5a4a77dc28efeaad1b1 /www-client | |
| parent | Punt unused local desc. (diff) | |
| download | gentoo-2-d54d9985618b7f1f2ce635f03e86c621b869a0f4.tar.gz gentoo-2-d54d9985618b7f1f2ce635f03e86c621b869a0f4.tar.bz2 gentoo-2-d54d9985618b7f1f2ce635f03e86c621b869a0f4.zip | |
Backport fixes for bug #372561 and bug #366413. Remove old.
(Portage version: 2.1.10.3/cvs/Linux i686)
Diffstat (limited to 'www-client')
| -rw-r--r-- | www-client/chromium/ChangeLog | 8 | ||||
| -rw-r--r-- | www-client/chromium/chromium-13.0.782.41-r1.ebuild (renamed from www-client/chromium/chromium-13.0.782.32.ebuild) | 17 |
2 files changed, 21 insertions, 4 deletions
diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog index 5f8e08aab38c..06f08c72de81 100644 --- a/www-client/chromium/ChangeLog +++ b/www-client/chromium/ChangeLog @@ -1,6 +1,12 @@ # 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.397 2011/07/17 00:25:26 phajdan.jr Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.398 2011/07/17 23:06:55 phajdan.jr Exp $ + +*chromium-13.0.782.41-r1 (17 Jul 2011) + + 17 Jul 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org> + -chromium-13.0.782.32.ebuild, +chromium-13.0.782.41-r1.ebuild: + Backport fixes for bug #372561 and bug #366413. Remove old. *chromium-14.0.814.0 (17 Jul 2011) diff --git a/www-client/chromium/chromium-13.0.782.32.ebuild b/www-client/chromium/chromium-13.0.782.41-r1.ebuild index f08703233f20..7c1a314944db 100644 --- a/www-client/chromium/chromium-13.0.782.32.ebuild +++ b/www-client/chromium/chromium-13.0.782.41-r1.ebuild @@ -1,6 +1,6 @@ # 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-13.0.782.32.ebuild,v 1.2 2011/06/28 08:50:15 phajdan.jr Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-13.0.782.41-r1.ebuild,v 1.1 2011/07/17 23:06:55 phajdan.jr Exp $ EAPI="3" PYTHON_DEPEND="2:2.6" @@ -285,8 +285,18 @@ src_install() { doexe out/Release/chrome_sandbox || die fperms 4755 "${CHROMIUM_HOME}/chrome_sandbox" + # Install Native Client files on platforms that support it. insinto "${CHROMIUM_HOME}" - doins out/Release/libppGoogleNaClPluginChrome.so || die + case "$(tc-arch)" in + amd64) + doins native_client/irt_binaries/nacl_irt_x86_64.nexe || die + doins out/Release/libppGoogleNaClPluginChrome.so || die + ;; + x86) + doins native_client/irt_binaries/nacl_irt_x86_32.nexe || die + doins out/Release/libppGoogleNaClPluginChrome.so || die + ;; + esac newexe "${FILESDIR}"/chromium-launcher-r2.sh chromium-launcher.sh || die @@ -367,7 +377,8 @@ src_install() { local mime_types="text/html;text/xml;application/xhtml+xml;" mime_types+="x-scheme-handler/http;x-scheme-handler/https;" # bug #360797 make_desktop_entry chromium-browser "Chromium" chromium-browser \ - "Network;WebBrowser" "MimeType=${mime_types}" + "Network;WebBrowser" + "MimeType=${mime_types}\nStartupWMClass=chromium-browser" sed -e "/^Exec/s/$/ %U/" -i "${D}"/usr/share/applications/*.desktop || die # Install GNOME default application entry (bug #303100). |