diff options
| author | Robert Nagy <rnagy@FreeBSD.org> | 2023-07-25 08:32:19 +0200 |
|---|---|---|
| committer | Robert Nagy <rnagy@FreeBSD.org> | 2023-07-25 12:39:06 +0200 |
| commit | 2f85e0aed6882f5be23adf89be70ce5f327d3373 (patch) | |
| tree | 3ef44960af9cc5ef7a05ed9dc3378cd2540ea68c /www/iridium/files/patch-printing_print__settings.cc | |
| parent | emulators/wine: fix packaging with ALSA enabled (diff) | |
www/iridium: update to 2023.07.115.1
Diffstat (limited to 'www/iridium/files/patch-printing_print__settings.cc')
| -rw-r--r-- | www/iridium/files/patch-printing_print__settings.cc | 24 |
1 files changed, 21 insertions, 3 deletions
diff --git a/www/iridium/files/patch-printing_print__settings.cc b/www/iridium/files/patch-printing_print__settings.cc index f1b26b51e39d..938d05778327 100644 --- a/www/iridium/files/patch-printing_print__settings.cc +++ b/www/iridium/files/patch-printing_print__settings.cc @@ -1,6 +1,6 @@ ---- printing/print_settings.cc.orig 2023-04-24 20:55:01 UTC +--- printing/print_settings.cc.orig 2023-07-24 14:27:53 UTC +++ printing/print_settings.cc -@@ -306,7 +306,7 @@ PrintSettings& PrintSettings::operator=(const PrintSet +@@ -314,7 +314,7 @@ PrintSettings& PrintSettings::operator=(const PrintSet #endif is_modifiable_ = settings.is_modifiable_; pages_per_sheet_ = settings.pages_per_sheet_; @@ -9,7 +9,25 @@ for (const auto& item : settings.advanced_settings_) advanced_settings_.emplace(item.first, item.second.Clone()); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -348,7 +348,7 @@ void PrintSettings::Clear() { +@@ -341,7 +341,7 @@ bool PrintSettings::operator==(const PrintSettings& ot + #endif + is_modifiable_, requested_custom_margins_in_points_, + pages_per_sheet_ +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + , + advanced_settings_ + #endif +@@ -366,7 +366,7 @@ bool PrintSettings::operator==(const PrintSettings& ot + other.is_modifiable_, + other.requested_custom_margins_in_points_, + other.pages_per_sheet_ +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + , + other.advanced_settings_ + #endif +@@ -405,7 +405,7 @@ void PrintSettings::Clear() { #endif is_modifiable_ = true; pages_per_sheet_ = 1; |