diff options
| author | Matthias Wolf <freebsd@rheinwolf.de> | 2022-02-01 18:38:49 +0100 |
|---|---|---|
| committer | Rene Ladan <rene@FreeBSD.org> | 2022-02-01 18:45:40 +0100 |
| commit | aa70a996eae7376396a5dd8a9e5105bebb6bc72c (patch) | |
| tree | ee91e0564101803a57091d4df8e4f3892eb8d0fc /www/chromium/files/patch-printing_print__settings__conversion.cc | |
| parent | www/firefox-esr: update to 91.6.0 (rc1) (diff) | |
www/chromium: update to 97.0.4692.99
Note that the port is currently broken on i386 as it does not compile there.
Security: https://vuxml.freebsd.org/freebsd/51496cbc-7a0e-11ec-a323-3065ec8fd3ec.html
Security: https://vuxml.freebsd.org/freebsd/9eeccbf3-6e26-11ec-bb10-3065ec8fd3ec.html
Security: https://vuxml.freebsd.org/freebsd/fb9ba490-5cc4-11ec-aac7-3065ec8fd3ec.html
Security: https://vuxml.freebsd.org/freebsd/18ac074c-579f-11ec-aac7-3065ec8fd3ec.html
Security: https://vuxml.freebsd.org/freebsd/b8c0cbca-472d-11ec-83dc-3065ec8fd3ec.html
Security: https://vuxml.freebsd.org/freebsd/976d7bf9-38ea-11ec-b3b0-3065ec8fd3ec.html
Security: https://vuxml.freebsd.org/freebsd/bdaecfad-3117-11ec-b3b0-3065ec8fd3ec.html
Diffstat (limited to 'www/chromium/files/patch-printing_print__settings__conversion.cc')
| -rw-r--r-- | www/chromium/files/patch-printing_print__settings__conversion.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/www/chromium/files/patch-printing_print__settings__conversion.cc b/www/chromium/files/patch-printing_print__settings__conversion.cc index 3f4093e5ad99..bd809412d24c 100644 --- a/www/chromium/files/patch-printing_print__settings__conversion.cc +++ b/www/chromium/files/patch-printing_print__settings__conversion.cc @@ -1,6 +1,6 @@ ---- printing/print_settings_conversion.cc.orig 2021-09-24 04:26:09 UTC +--- printing/print_settings_conversion.cc.orig 2021-12-14 11:45:09 UTC +++ printing/print_settings_conversion.cc -@@ -217,14 +217,14 @@ std::unique_ptr<PrintSettings> PrintSettingsFromJobSet +@@ -220,7 +220,7 @@ std::unique_ptr<PrintSettings> PrintSettingsFromJobSet #endif } @@ -9,8 +9,9 @@ const base::Value* advanced_settings = job_settings.FindDictKey(kSettingAdvancedSettings); if (advanced_settings) { - for (const auto item : advanced_settings->DictItems()) - settings->advanced_settings().emplace(item.first, item.second.Clone()); +@@ -232,7 +232,7 @@ std::unique_ptr<PrintSettings> PrintSettingsFromJobSet + settings->advanced_settings().emplace(item.first, item.second.Clone()); + } } -#endif // defined(OS_CHROMEOS) || (defined(OS_LINUX) && defined(USE_CUPS)) +#endif // defined(OS_CHROMEOS) || ((defined(OS_LINUX) || defined(OS_BSD)) && defined(USE_CUPS)) |