[gentoo-commits] repo/gentoo:master commit in: www-client/google-chrome/, www-client/google-chrome/files/

[gentoo-commits] repo/gentoo:master commit in: www-client/google-chrome/, www-client/google-chrome/files/

[Mike Gilbert]

commit:     74e5540ea5cdf5e9b75cc2d106996a70574e3233
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 24 15:33:30 2019 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Wed Apr 24 15:36:03 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74e5540e

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

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

 www-client/google-chrome/files/chrome-gnome.patch          | 14 ++++++++++++++
 ...29.108.ebuild => google-chrome-74.0.3729.108-r1.ebuild} |  2 ++
 2 files changed, 16 insertions(+)

diff --git a/www-client/google-chrome/files/chrome-gnome.patch b/www-client/google-chrome/files/chrome-gnome.patch
new file mode 100644
index 00000000000..b32eb2142c2
--- /dev/null
+++ b/www-client/google-chrome/files/chrome-gnome.patch
@@ -0,0 +1,14 @@
+--- a/opt/google/chrome/google-chrome
++++ b/opt/google/chrome/google-chrome
+@@ -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/google-chrome-74.0.3729.108.ebuild b/www-client/google-chrome/google-chrome-74.0.3729.108-r1.ebuild
similarity index 98%
rename from www-client/google-chrome/google-chrome-74.0.3729.108.ebuild
rename to www-client/google-chrome/google-chrome-74.0.3729.108-r1.ebuild
index e75218fcde2..b8601eeffdf 100644
--- a/www-client/google-chrome/google-chrome-74.0.3729.108.ebuild
+++ b/www-client/google-chrome/google-chrome-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