5ac9881e4f
www/chromium: update to 88.0.4324.96 Submitted by: Matthias Wolf (via github) Security: https://www.vuxml.org/freebsd/4ed0e43c-5cef-11eb-bafd-3065ec8fd3ec.html
20 lines
865 B
C++
20 lines
865 B
C++
--- printing/print_settings_conversion.cc.orig 2021-01-18 21:29:02 UTC
|
|
+++ printing/print_settings_conversion.cc
|
|
@@ -211,14 +211,14 @@ std::unique_ptr<PrintSettings> PrintSettingsFromJobSet
|
|
#endif
|
|
}
|
|
|
|
-#if defined(OS_CHROMEOS) || (defined(OS_LINUX) && defined(USE_CUPS))
|
|
+#if defined(OS_CHROMEOS) || ((defined(OS_LINUX) || defined(OS_BSD)) && defined(USE_CUPS))
|
|
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());
|
|
}
|
|
-#endif // defined(OS_CHROMEOS) || (defined(OS_LINUX) && defined(USE_CUPS))
|
|
+#endif // defined(OS_CHROMEOS) || ((defined(OS_LINUX) || defined(OS_BSD)) && defined(USE_CUPS))
|
|
|
|
#if BUILDFLAG(IS_ASH)
|
|
bool send_user_info =
|