Added MimeType field to the .desktop file, so that .html and other files can be opened with Chromium. Patch by Daniel Schoemer <daniel.schoemer@gmx.net>, bug #326863.

Package-Manager: portage-2.1.8.3/cvs/Linux i686

4 files changed, 16 insertions, 18 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index ea199a4a9f43..8f65fefdf2be 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.131 2010/07/03 14:25:20 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.132 2010/07/04 17:33:18 phajdan.jr Exp $
+
+  04 Jul 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  chromium-6.0.453.1.ebuild, chromium-9999.ebuild:
+  Added MimeType field to the .desktop file, so that .html and other files
+  can be opened with Chromium. Patch by Daniel Schoemer
+  <daniel.schoemer@gmx.net>, bug #326863.
 
   03 Jul 2010; Pacho Ramos <pacho@gentoo.org> chromium-5.0.375.99.ebuild:
   amd64 stable, security bug #326717
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index d4e727c15c78..05afcd3ee88b 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX chromium-20100122-ubuntu-html5-video-mimetypes.patch 1228 RMD160 69157e703e14138cc838ae26191ef42116f3f614 SHA1 f9bac7a6840c060c921119051cd724b7b53ff2fd SHA256 d6f8e5dabf8b55c3fb9ae58920807758e5d1aa76f536efc6f53949208a567566
 AUX chromium-disable-vp8-r1.patch 1204 RMD160 22264b89adf908149e5405c316e4666c4eda4ad8 SHA1 7e104772a645f50449432d4c970d52ffc3555c8a SHA256 ebb9031cd447aca0f3d7f9a2b4081f64dd8244ffd90564ecab06724e1dda63e8
 AUX chromium-drop_sse2-r0.patch 1387 RMD160 5be0a252d4e99064e2cc5ba3fce33a5f525ba785 SHA1 a356549db631a7b147bf0046be8ab09d88874f15 SHA256 f035f196eea72855cf37d269810f4f99a5f348b7b8d7aaf537e35a11d6e1f1df
@@ -18,14 +15,7 @@ DIST chromium-6.0.453.1.tar.bz2 123140746 RMD160 97423641f926a9fb39408f54e7cd487
 EBUILD chromium-5.0.375.86.ebuild 5531 RMD160 30b33b47d27be694bfd07036a875384a2e091c4f SHA1 cd4141553b04034c9cd17a2cd65b632849afdf10 SHA256 d69079c9bdc0b98466cc2e9afcf0d862762ab81377e4f21d4c9f04d5401154de
 EBUILD chromium-5.0.375.99.ebuild 5530 RMD160 933d63eaca9bc9c6ed94055934838a9c8848ca2a SHA1 14e9c0e8315883eb2c5118301d63f93719e270c3 SHA256 c3b252dc7f1521bb2e4209cbfbcfa6fdb2c23db894fb42b9d5fcd00c103d3444
 EBUILD chromium-6.0.437.3.ebuild 6375 RMD160 fdd78c6b6509a82d0fbfa1aa150d558cd0955007 SHA1 b9ea6ec0d556ddd5d6304b5dfb925f637243e970 SHA256 d88ac315f20b122b8280d6783ada3eb42b1ae45eb2b2e0ef75d84f2ba5b1b8b4
-EBUILD chromium-6.0.453.1.ebuild 6217 RMD160 4105330fe83b2bfc68174787bef5b5ec2597463e SHA1 9258aceabccaf9c405b8d476458970f7560bb0fa SHA256 d4dc0e3dcce52863ded5792ed77a31029951ccf5ce14fa8029af36d36ee1cc83
-EBUILD chromium-9999.ebuild 7861 RMD160 27976b085ed58739b55eb620c028ed4a3be0f303 SHA1 daf57d18fe6177cac5003964474146954527a516 SHA256 a29413960791c1035ac5e49fe7c8e32028721deeeb4f6be45aa150b00e6912f3
-MISC ChangeLog 29187 RMD160 9938016f9f6a1e30401d74f07c8982646d058e75 SHA1 61b763c408adabd54610454d0ea90402ad7ad511 SHA256 634d97f0b75cbacf632794d44d2d692acbc8a4ea43ae40ec7b8dda216bee8dd3
+EBUILD chromium-6.0.453.1.ebuild 6274 RMD160 dabeb0630244fc10b7e55dc2e8ba560481d0b050 SHA1 fb5c9855667cc2e91e073ebad12cdf734b249f52 SHA256 2c27c3d879d1454cc4d7d15dbc17d9b7c15c1e562492d3a907b63c0870535f78
+EBUILD chromium-9999.ebuild 7918 RMD160 5590dd6e805131c952589486124823cdd706ded5 SHA1 1d5785693732a272401f699e496376a2cd7894a3 SHA256 b7a95f792a56cc5f5027af43ac256a49fa7eb7d8466359de5aea7eebc3f477a8
+MISC ChangeLog 29472 RMD160 37d2dfb855d8a0634b3a3a41003ebbc2eaadbe8e SHA1 5f82f8573002419099979664a78b8a9509a55e51 SHA256 42f0494c88505eebe35a269ce918d1303a5b88d7332186a1b5759f9ef30f6150
 MISC metadata.xml 572 RMD160 458a635f4040d8552b46256c8437099608041b99 SHA1 6ed49919f57f709065cf06c148f1df68119a3b3f SHA256 4a433c3dadf06af7e3dca492ffaa3f26a6c4419de61a044609e2d528891e09a5
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iEYEARECAAYFAkwvSFYACgkQCaWpQKGI+9ShwQCcC5B1CZRpSHua30rEVR1vDDWj
-HqEAn2Yo1rmboaEyAfZx/XEQ3O7gmSw8
-=z/nb
------END PGP SIGNATURE-----
diff --git a/www-client/chromium/chromium-6.0.453.1.ebuild b/www-client/chromium/chromium-6.0.453.1.ebuild
index 96b9b54219c9..e36346527679 100644
--- a/www-client/chromium/chromium-6.0.453.1.ebuild
+++ b/www-client/chromium/chromium-6.0.453.1.ebuild
@@ -1,6 +1,6 @@
 # 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-6.0.453.1.ebuild,v 1.1 2010/07/03 09:34:47 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-6.0.453.1.ebuild,v 1.2 2010/07/04 17:33:18 phajdan.jr Exp $
 
 EAPI="2"
 
@@ -193,7 +193,8 @@ src_install() {
 	# Install icon and desktop entry.
 	newicon out/Release/product_logo_48.png ${PN}-browser.png
 	dosym "$(get_chromium_home)/chromium-launcher.sh" /usr/bin/chromium
-	make_desktop_entry chromium "Chromium" ${PN}-browser "Network;WebBrowser"
+	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 "desktop file sed failed"
 
diff --git a/www-client/chromium/chromium-9999.ebuild b/www-client/chromium/chromium-9999.ebuild
index d56bbf942165..e6f7a616b5ea 100644
--- a/www-client/chromium/chromium-9999.ebuild
+++ b/www-client/chromium/chromium-9999.ebuild
@@ -1,6 +1,6 @@
 # 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-9999.ebuild,v 1.64 2010/07/03 09:34:47 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999.ebuild,v 1.65 2010/07/04 17:33:18 phajdan.jr Exp $
 
 EAPI="2"
 
@@ -235,7 +235,8 @@ src_install() {
 	# Install icon and desktop entry.
 	newicon out/Release/product_logo_48.png ${PN}-browser.png
 	dosym "$(get_chromium_home)/chromium-launcher.sh" /usr/bin/chromium
-	make_desktop_entry chromium "Chromium" ${PN}-browser "Network;WebBrowser"
+	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 "desktop file sed failed"