From b40f3db72f2aa68029fe5011c9a55254fd0b0b7a Mon Sep 17 00:00:00 2001 From: Tom spot Callaway Date: Mon, 28 Jun 2021 13:48:34 -0400 Subject: [PATCH] update epel7-erase-fix patch --- chromium-91.0.4472.114-epel7-erase-fix.patch | 20 ++++++++++++++++++++ chromium.spec | 2 +- 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 chromium-91.0.4472.114-epel7-erase-fix.patch diff --git a/chromium-91.0.4472.114-epel7-erase-fix.patch b/chromium-91.0.4472.114-epel7-erase-fix.patch new file mode 100644 index 00000000..42dcf3d5 --- /dev/null +++ b/chromium-91.0.4472.114-epel7-erase-fix.patch @@ -0,0 +1,20 @@ +diff -up chromium-91.0.4472.114/components/ui_devtools/views/view_element.cc.erase-fix chromium-91.0.4472.114/components/ui_devtools/views/view_element.cc +--- chromium-91.0.4472.114/components/ui_devtools/views/view_element.cc.erase-fix 2021-06-28 13:47:06.751802159 -0400 ++++ chromium-91.0.4472.114/components/ui_devtools/views/view_element.cc 2021-06-28 13:47:20.097876929 -0400 +@@ -24,14 +24,14 @@ namespace { + // Remove any custom editor "prefixes" from the property name. The prefixes must + // not be valid identifier characters. + void StripPrefix(std::string& property_name) { +- auto cur = property_name.cbegin(); ++ auto cur = property_name.begin(); + for (; cur < property_name.cend(); ++cur) { + if ((*cur >= 'A' && *cur <= 'Z') || (*cur >= 'a' && *cur <= 'z') || + *cur == '_') { + break; + } + } +- property_name.erase(property_name.cbegin(), cur); ++ property_name.erase(property_name.begin(), cur); + } + + ui::EventType GetMouseEventType(const std::string& type) { diff --git a/chromium.spec b/chromium.spec index 4d818881..8737fd01 100644 --- a/chromium.spec +++ b/chromium.spec @@ -332,7 +332,7 @@ Patch108: chromium-85.0.4183.83-el7-old-libdrm.patch # error: no matching function for call to 'std::basic_string::erase(std::basic_string::const_iterator, __gnu_cxx::__normal_iterator >&)' # 33 | property_name.erase(property_name.cbegin(), cur); # Not sure how this EVER worked anywhere, but it only seems to fail on EPEL-7. -Patch109: chromium-90.0.4430.93-epel7-erase-fix.patch +Patch109: chromium-91.0.4472.114-epel7-erase-fix.patch # Again, not sure how epel8 is the only one to hit this... # AARCH64 neon symbols need to be prefixed too to prevent multiple definition issue at linktime Patch110: chromium-90.0.4430.93-epel8-aarch64-libpng16-symbol-prefixes.patch