commit:     aede8fc50bd968a87499e006498d84f46b1a3cb4
Author:     Stephan Hartmann <stha09 <AT> googlemail <DOT> com>
AuthorDate: Thu Jan 30 08:37:43 2020 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Thu Jan 30 16:17:14 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aede8fc5

www-client/chromium: beta channel bump to 80.0.3987.78

Closes: https://bugs.gentoo.org/706786
Package-Manager: Portage-2.3.76, Repoman-2.3.16
Signed-off-by: Stephan Hartmann <stha09 <AT> googlemail.com>
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/14502

 www-client/chromium/Manifest                       |  2 +-
 ...3987.66.ebuild => chromium-80.0.3987.78.ebuild} | 23 +++++++++++-----------
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 4f35852ba2c..7534e3cc00d 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -1,3 +1,3 @@
 DIST chromium-79.0.3945.130.tar.xz 778319112 BLAKE2B 
ac6d7c08c34afc4de8383964f76a5eabc9209de185535a27eff2d6934a77d01fd6b07d5c5afb16e9dd936b2650da76d460e8a485ab16f8300144c7de9b3be2bb
 SHA512 
4b5d4769b068f20b8028085a148cbaf31311eeffad0a22c5c0909af273a8e57e077b33cc93331bbeff9165477262eed2e345b2224ac4f76d8bdb79f983596a81
-DIST chromium-80.0.3987.66.tar.xz 801288252 BLAKE2B 
da3db645a6d086aa4604a8ca208b982870d32571128a74fb484a7b18b435644987beefe9edb91d635f30ca1c0ebc68968d8bd2ea8b30baeeffeb684ac4feadf9
 SHA512 
6759433aa4fdad6630d30709960d4e97b88086a2ccac79fcffcf3d770a15fd5092d5f9a79225fc13f599430b36ddce51a244674b47a9aafae1f272b3d7e2fa25
+DIST chromium-80.0.3987.78.tar.xz 801286168 BLAKE2B 
deb9e1392354dcd4b575b559eb5f57e03f558aa546e11f007bda2fe4ebb4a044e8419e36244a358c0b8fe9f5e79782751bc308e33d6454d086cae70361cecead
 SHA512 
2e920fff17586d6dfdbbe324ed56ad1135a3abfe5b74ead8b1277c48e92c68c0a73172c37c3ba73c4475b711502e852a6fcda6681898517f8354a3c97842347d
 DIST chromium-81.0.4040.5.tar.xz 828003840 BLAKE2B 
81b3d4b15d5cdc99bcb19ab3745e49b402f00d68a557f58fa3ae0e6b584c28473dba5ca8622373721e54c64760adbf7cb9daae93c1b29336e7f9fc3a387b199f
 SHA512 
47928d6fc022dc0d8b51562c8079baf25aad098f93c52dd4d07d70fa6d9c4b56b4920e163ff3b44d328e741184d5af327394fa56aa36c54509406f2d67e525ed

diff --git a/www-client/chromium/chromium-80.0.3987.66.ebuild 
b/www-client/chromium/chromium-80.0.3987.78.ebuild
similarity index 97%
rename from www-client/chromium/chromium-80.0.3987.66.ebuild
rename to www-client/chromium/chromium-80.0.3987.78.ebuild
index 1df1ef1ffe2..1dfd272b3bd 100644
--- a/www-client/chromium/chromium-80.0.3987.66.ebuild
+++ b/www-client/chromium/chromium-80.0.3987.78.ebuild
@@ -644,6 +644,14 @@ src_compile() {
                s|@@MENUNAME@@|Chromium|g;' \
                chrome/app/resources/manpage.1.in > \
                out/Release/chromium-browser.1 || die
+
+       # Build desktop file; bug #706786
+       sed -e 's|@@MENUNAME@@|Chromium|g;
+               s|@@USR_BIN_SYMLINK_NAME@@|chromium-browser|g;
+               s|@@PACKAGE@@|chromium-browser|g;
+               s|\(^Exec=\)/usr/bin/|\1|g;' \
+               chrome/installer/linux/common/desktop.template > \
+               out/Release/chromium-browser-chromium.desktop || die
 }
 
 src_install() {
@@ -695,7 +703,7 @@ src_install() {
                doins out/Release/swiftshader/*.so
        fi
 
-       # Install icons and desktop entry.
+       # Install icons
        local branding size
        for size in 16 24 32 48 64 128 256 ; do
                case ${size} in
@@ -706,17 +714,8 @@ src_install() {
                        chromium-browser.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" \
-               chromium-browser \
-               "Network;WebBrowser" \
-               "MimeType=${mime_types}\nStartupWMClass=chromium-browser"
-       sed -e "/^Exec/s/$/ %U/" -i "${ED}"/usr/share/applications/*.desktop || 
die
+       # Install desktop entry
+       domenu out/Release/chromium-browser-chromium.desktop
 
        # Install GNOME default application entry (bug #303100).
        insinto /usr/share/gnome-control-center/default-apps

Reply via email to