www-client/chromium: dev channel bump to 81.0.4040.5
authorStephan Hartmann <stha09@googlemail.com>
Wed, 29 Jan 2020 12:01:32 +0000 (13:01 +0100)
committerMike Gilbert <floppym@gentoo.org>
Wed, 29 Jan 2020 22:37:44 +0000 (17:37 -0500)
Bug: https://bugs.gentoo.org/706786
Package-Manager: Portage-2.3.76, Repoman-2.3.16
Signed-off-by: Stephan Hartmann <stha09@googlemail.com>
Signed-off-by: Mike Gilbert <floppym@gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/14498

www-client/chromium/Manifest
www-client/chromium/chromium-81.0.4040.5.ebuild [moved from www-client/chromium/chromium-81.0.4033.2.ebuild with 97% similarity]

index fa76ec9c6d832901f18d96c8962faf9a6c9bd0b7..4f35852ba2c4d90216b4529d54d5ab17f90cda20 100644 (file)
@@ -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-81.0.4033.2.tar.xz 819332884 BLAKE2B 4d12fef8959a5de2cde1430b3b0c927e6ecff13276db4490d99491a989310a44fa2df114603e09f5d0f3c3c362b31c02e04be0926ede627ceb075f92f1be76d1 SHA512 3e11cf4cdfa49e80926cfadf217fb7f0cec26b0fac9788b0d020b02be55419cb10ba9e483e4d3851beb55ddd78a80e8d695ed46da971520856f66f32b11d7388
+DIST chromium-81.0.4040.5.tar.xz 828003840 BLAKE2B 81b3d4b15d5cdc99bcb19ab3745e49b402f00d68a557f58fa3ae0e6b584c28473dba5ca8622373721e54c64760adbf7cb9daae93c1b29336e7f9fc3a387b199f SHA512 47928d6fc022dc0d8b51562c8079baf25aad098f93c52dd4d07d70fa6d9c4b56b4920e163ff3b44d328e741184d5af327394fa56aa36c54509406f2d67e525ed
similarity index 97%
rename from www-client/chromium/chromium-81.0.4033.2.ebuild
rename to www-client/chromium/chromium-81.0.4040.5.ebuild
index 2f1a68472d5a1afbb3f243a7599ad47d3dc21bc1..bbe6a457c792542ef39d1acf0fc04ba0d1c0322d 100644 (file)
@@ -142,13 +142,11 @@ For native file dialogs in KDE, install kde-apps/kdialog.
 PATCHES=(
        "${FILESDIR}/chromium-compiler-r11.patch"
        "${FILESDIR}/chromium-fix-char_traits.patch"
-       "${FILESDIR}/chromium-unbundle-zlib-r1.patch"
        "${FILESDIR}/chromium-78-protobuf-export.patch"
        "${FILESDIR}/chromium-79-gcc-alignas.patch"
        "${FILESDIR}/chromium-80-unbundle-libxml.patch"
        "${FILESDIR}/chromium-80-gcc-quiche.patch"
        "${FILESDIR}/chromium-80-gcc-blink.patch"
-       "${FILESDIR}/chromium-81-gcc-dav1d.patch"
        "${FILESDIR}/chromium-81-gcc-template.patch"
        "${FILESDIR}/chromium-81-gcc-noexcept.patch"
        "${FILESDIR}/chromium-81-clang.patch"
@@ -649,6 +647,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() {
@@ -700,7 +706,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
@@ -711,17 +717,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