www-client/google-chrome-beta: apply workaround for GNOME

Closes: https://bugs.gentoo.org/684116
Package-Manager: Portage-2.3.62_p4, Repoman-2.3.12_p87
Signed-off-by: Mike Gilbert <floppym@gentoo.org>

diff --git a/www-client/google-chrome-beta/files/chrome-gnome.patch b/www-client/google-chrome-beta/files/chrome-gnome.patch
new file mode 100644 (file)
index 0000000..9662ea3
--- /dev/null
+++ b/www-client/google-chrome-beta/files/chrome-gnome.patch
@@ -0,0 +1,14 @@
+--- a/opt/google/chrome-beta/google-chrome-beta
++++ b/opt/google/chrome-beta/google-chrome-beta
+@@ -39,6 +39,11 @@
+ # We don't want bug-buddy intercepting our crashes. http://crbug.com/24120
+ export GNOME_DISABLE_CRASH_DIALOG=SET_BY_GOOGLE_CHROME
+ 
++# Workaround to detect GNOME session variants until fix is backported to
++# older Chrome versions (fixed in 75.x):
++# https://chromium.googlesource.com/chromium/src/+/dd407d416fa941c04e33d81f2b1d8cab8196b633
++[[ ${XDG_CURRENT_DESKTOP} = *"GNOME"* ]] && export XDG_CURRENT_DESKTOP="GNOME"
++
+ # Sanitize std{in,out,err} because they'll be shared with untrusted child
+ # processes (http://crbug.com/376567).
+ exec < /dev/null

diff --git a/www-client/google-chrome-beta/google-chrome-beta-74.0.3729.108.ebuild b/www-client/google-chrome-beta/google-chrome-beta-74.0.3729.108-r1.ebuild
similarity index 98%
rename from www-client/google-chrome-beta/google-chrome-beta-74.0.3729.108.ebuild
rename to www-client/google-chrome-beta/google-chrome-beta-74.0.3729.108-r1.ebuild
index e75218fcde20af78fc9dd907070be5ce757c2366..b8601eeffdfb51433cbc2e4638325ae2a0dfac81 100644 (file)
--- a/www-client/google-chrome-beta/google-chrome-beta-74.0.3729.108.ebuild
+++ b/www-client/google-chrome-beta/google-chrome-beta-74.0.3729.108-r1.ebuild
@@ -90,6 +90,8 @@ src_install() {
        cd "${ED}" || die
        unpacker
 
+       eapply "${FILESDIR}"/chrome-gnome.patch
+
        rm -r etc usr/share/menu || die
        mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die