diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2019-04-24 11:33:30 -0400 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2019-04-24 11:36:03 -0400 |
| commit | 74e5540ea5cdf5e9b75cc2d106996a70574e3233 (patch) | |
| tree | aef1fa4ed4c2eea1c2603df916e33f18cf3caf91 | |
| parent | www-client/firefox: elfhack build fixes (diff) | |
| download | gentoo-74e5540ea5cdf5e9b75cc2d106996a70574e3233.tar.gz gentoo-74e5540ea5cdf5e9b75cc2d106996a70574e3233.tar.bz2 gentoo-74e5540ea5cdf5e9b75cc2d106996a70574e3233.zip | |
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@gentoo.org>
| -rw-r--r-- | www-client/google-chrome/files/chrome-gnome.patch | 14 | ||||
| -rw-r--r-- | www-client/google-chrome/google-chrome-74.0.3729.108-r1.ebuild (renamed from www-client/google-chrome/google-chrome-74.0.3729.108.ebuild) | 2 |
2 files changed, 16 insertions, 0 deletions
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 000000000000..b32eb2142c21 --- /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 index e75218fcde20..b8601eeffdfb 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 |