[rpms/chromium] epel9-next: rebase emplace_back_on_vector-c++20.patch for 116

[rpms/chromium] epel9-next: rebase emplace_back_on_vector-c++20.patch for 116

[Than Ngo]

A new commit has been pushed.

Repo   : rpms/chromium
Branch : epel9-next
Commit : a8ad64be1d6bcc60d7fbc5d335ed8df228543375
Author : Than Ngo <than@redhat.com>
Date   : 2023-08-15T23:23:23+02:00
Stats  : +47/-22 in 3 file(s)
URL    : https://src.fedoraproject.org/rpms/chromium/c/a8ad64be1d6bcc60d7fbc5d335ed8df228543375?branch=epel9-next

Log:
rebase emplace_back_on_vector-c++20.patch for 116

---
diff --git a/chromium-115-emplace_back_on_vector-c++20.patch b/chromium-115-emplace_back_on_vector-c++20.patch
deleted file mode 100644
index d4dca6a..0000000
--- a/chromium-115-emplace_back_on_vector-c++20.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -up chromium-115.0.5790.40/chrome/test/chromedriver/capabilities.cc.me chromium-115.0.5790.40/chrome/test/chromedriver/capabilities.cc
---- chromium-115.0.5790.40/chrome/test/chromedriver/capabilities.cc.me	2023-06-25 10:06:58.445990069 +0200
-+++ chromium-115.0.5790.40/chrome/test/chromedriver/capabilities.cc	2023-06-25 10:51:17.640818231 +0200
-@@ -355,7 +355,7 @@ Status ParseMobileEmulation(const base::
-                         "'version' field of type string");
-         }
- 
--        brands.emplace_back(*brand, *version);
-+        brands.emplace_back() = {*brand, *version};
-       }
- 
-       client_hints.brands = std::move(brands);
-@@ -392,7 +392,7 @@ Status ParseMobileEmulation(const base::
-                         "a 'version' field of type string");
-         }
- 
--        full_version_list.emplace_back(*brand, *version);
-+        full_version_list.emplace_back() = {*brand, *version};
-       }
- 
-       client_hints.full_version_list = std::move(full_version_list);

diff --git a/chromium-116-emplace_back_on_vector-c++20.patch b/chromium-116-emplace_back_on_vector-c++20.patch
new file mode 100644
index 0000000..363dc87
--- /dev/null
+++ b/chromium-116-emplace_back_on_vector-c++20.patch
@@ -0,0 +1,46 @@
+diff -up chromium-115.0.5790.40/chrome/test/chromedriver/capabilities.cc.me chromium-115.0.5790.40/chrome/test/chromedriver/capabilities.cc
+--- chromium-115.0.5790.40/chrome/test/chromedriver/capabilities.cc.me	2023-06-25 10:06:58.445990069 +0200
++++ chromium-115.0.5790.40/chrome/test/chromedriver/capabilities.cc	2023-06-25 10:51:17.640818231 +0200
+@@ -355,7 +355,7 @@ Status ParseMobileEmulation(const base::
+                         "'version' field of type string");
+         }
+ 
+-        brands.emplace_back(*brand, *version);
++        brands.emplace_back() = {*brand, *version};
+       }
+ 
+       client_hints.brands = std::move(brands);
+@@ -392,7 +392,7 @@ Status ParseMobileEmulation(const base::
+                         "a 'version' field of type string");
+         }
+ 
+-        full_version_list.emplace_back(*brand, *version);
++        full_version_list.emplace_back() = {*brand, *version};
+       }
+ 
+       client_hints.full_version_list = std::move(full_version_list);
+diff -up chromium-116.0.5845.96/chrome/browser/content_settings/one_time_permission_provider.cc.me chromium-116.0.5845.96/chrome/browser/content_settings/one_time_permission_provider.cc
+--- chromium-116.0.5845.96/chrome/browser/content_settings/one_time_permission_provider.cc.me	2023-08-15 21:34:58.922855428 +0200
++++ chromium-116.0.5845.96/chrome/browser/content_settings/one_time_permission_provider.cc	2023-08-15 21:39:23.310434237 +0200
+@@ -207,8 +207,8 @@ void OneTimePermissionProvider::OnSuspen
+ 
+       while (rule_iterator && rule_iterator->HasNext()) {
+         auto rule = rule_iterator->Next();
+-        patterns_to_delete.emplace_back(setting_type, rule->primary_pattern,
+-                                        rule->secondary_pattern);
++        patterns_to_delete.emplace_back() = {setting_type, rule->primary_pattern,
++                                        rule->secondary_pattern};
+         permissions::PermissionUmaUtil::RecordOneTimePermissionEvent(
+             setting_type,
+             permissions::OneTimePermissionEvent::EXPIRED_ON_SUSPEND);
+@@ -302,8 +302,8 @@ void OneTimePermissionProvider::DeleteEn
+     auto rule = rule_iterator->Next();
+     if (rule->primary_pattern.Matches(origin_gurl) &&
+         rule->secondary_pattern.Matches(origin_gurl)) {
+-      patterns_to_delete.emplace_back(
+-          content_setting_type, rule->primary_pattern, rule->secondary_pattern);
++      patterns_to_delete.emplace_back() = {
++          content_setting_type, rule->primary_pattern, rule->secondary_pattern};
+       permissions::PermissionUmaUtil::RecordOneTimePermissionEvent(
+           content_setting_type, trigger_event);
+     }

diff --git a/chromium.spec b/chromium.spec
index 8d7da19..a23f423 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -350,7 +350,7 @@ Patch303: chromium-116-typename.patch
 Patch304: chromium-116-missing-header-files.patch
 
 # compiler error with c++20
-Patch306: chromium-115-emplace_back_on_vector-c++20.patch
+Patch306: chromium-116-emplace_back_on_vector-c++20.patch
 
 # disable memory tagging for epel8 on aarch64 due to new feature IFUNC-Resolver not supported
 # in old glibc < 2.30