From fed246998c27ef6abd6ee12e9192dc318874bfc7 Mon Sep 17 00:00:00 2001 From: Tom spot Callaway Date: Sat, 5 Mar 2022 14:26:19 -0500 Subject: [PATCH] merge + rhel 8 fix --- ...44.51-rhel8-force-disable-use_gnome_keyring.patch | 12 ++++++++++++ chromium.spec | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 chromium-99.0.4844.51-rhel8-force-disable-use_gnome_keyring.patch diff --git a/chromium-99.0.4844.51-rhel8-force-disable-use_gnome_keyring.patch b/chromium-99.0.4844.51-rhel8-force-disable-use_gnome_keyring.patch new file mode 100644 index 00000000..a65f244b --- /dev/null +++ b/chromium-99.0.4844.51-rhel8-force-disable-use_gnome_keyring.patch @@ -0,0 +1,12 @@ +diff -up chromium-99.0.4844.51/components/os_crypt/features.gni.disblegnomekeyring chromium-99.0.4844.51/components/os_crypt/features.gni +--- chromium-99.0.4844.51/components/os_crypt/features.gni.disblegnomekeyring 2022-03-05 14:24:15.073877597 -0500 ++++ chromium-99.0.4844.51/components/os_crypt/features.gni 2022-03-05 14:25:04.174183483 -0500 +@@ -8,7 +8,7 @@ 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_linux && use_glib ++ use_gnome_keyring = false + + # Whether to make account and service names for the crypto key storage + # configurable at runtime for embedders. diff --git a/chromium.spec b/chromium.spec index 5ce750cd..e9616a4e 100644 --- a/chromium.spec +++ b/chromium.spec @@ -355,7 +355,7 @@ Patch203: chromium-86.0.4240.75-vaapi-i686-fpermissive.patch Patch205: chromium-86.0.4240.75-fix-vaapi-on-intel.patch # Apply these patches to work around EPEL8 issues -Patch300: chromium-92.0.4515.107-rhel8-force-disable-use_gnome_keyring.patch +Patch300: chromium-99.0.4844.51-rhel8-force-disable-use_gnome_keyring.patch # And fixes for new compilers Patch400: %{name}-gcc11.patch