From 1964554c88c8e379f9ceb934337f0fff260cbfba Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Fri, 6 Sep 2019 17:10:21 -0400 Subject: [PATCH] force disable use_gnome_keyring --- ...809.132-rhel8-force-disable-use_gnome_keyring.patch | 10 ++++++++++ chromium.spec | 7 +++++++ 2 files changed, 17 insertions(+) create mode 100644 chromium-76.0.3809.132-rhel8-force-disable-use_gnome_keyring.patch diff --git a/chromium-76.0.3809.132-rhel8-force-disable-use_gnome_keyring.patch b/chromium-76.0.3809.132-rhel8-force-disable-use_gnome_keyring.patch new file mode 100644 index 00000000..ff6c5236 --- /dev/null +++ b/chromium-76.0.3809.132-rhel8-force-disable-use_gnome_keyring.patch @@ -0,0 +1,10 @@ +diff -up chromium-76.0.3809.132/components/os_crypt/features.gni.rhel8 chromium-76.0.3809.132/components/os_crypt/features.gni +--- chromium-76.0.3809.132/components/os_crypt/features.gni.rhel8 2019-09-06 17:08:01.242314126 -0400 ++++ chromium-76.0.3809.132/components/os_crypt/features.gni 2019-09-06 17:08:10.139134707 -0400 +@@ -7,5 +7,5 @@ import("//build/config/ui.gni") + declare_args() { + # Whether to use libgnome-keyring (deprecated by libsecret). + # See http://crbug.com/466975 and http://crbug.com/355223. +- use_gnome_keyring = is_desktop_linux && use_glib ++ use_gnome_keyring = false + } diff --git a/chromium.spec b/chromium.spec index 9bdec573..9c129514 100644 --- a/chromium.spec +++ b/chromium.spec @@ -316,6 +316,9 @@ Patch204: chromium-75.0.3770.80-vaapi-libva1-compatibility.patch # Pulseaudio changed the API a little in 12.99.1 Patch205: chromium-76.0.3809.100-pulse-api-change.patch +# Apply this patches to work around EPEL8 issues +Patch300: chromium-76.0.3809.132-rhel8-force-disable-use_gnome_keyring.patch + # Use chromium-latest.py to generate clean tarball from released build tarballs, found here: # http://build.chromium.org/buildbot/official/ # For Chromium Fedora use chromium-latest.py --stable --ffmpegclean --ffmpegarm @@ -885,6 +888,10 @@ udev. %patch205 -p1 -b .pulseaudioapichange %endif +%if 0%{?rhel} == 8 +%patch300 -p1 -b .disblegnomekeyring +%endif + # Change shebang in all relevant files in this directory and all subdirectories # See `man find` for how the `-exec command {} +` syntax works find -type f -exec sed -iE '1s=^#! */usr/bin/\(python\|env python\)[23]\?=#!%{__python2}=' {} +