diff options
| author | Lexi Winter <ivy@FreeBSD.org> | 2025-12-01 03:19:41 +0000 |
|---|---|---|
| committer | Lexi Winter <ivy@FreeBSD.org> | 2025-12-01 03:19:41 +0000 |
| commit | 2e80774d0b20d167bc0a9e2b63dafbfb171c0d22 (patch) | |
| tree | 25f0138e1af8902b92dacc8cce09b267447c17db /devel/electron35/files/patch-printing_print__settings.cc | |
| parent | f85f2b2d6e5b7ed869376eb4b180c3a74a5c5da9 (diff) | |
| parent | 1a30da80670973368b399f2b01fe9c04b91a1273 (diff) | |
Merge remote-tracking branch 'freebsd/main' into lf/mainlf/main
Diffstat (limited to 'devel/electron35/files/patch-printing_print__settings.cc')
| -rw-r--r-- | devel/electron35/files/patch-printing_print__settings.cc | 38 |
1 files changed, 0 insertions, 38 deletions
diff --git a/devel/electron35/files/patch-printing_print__settings.cc b/devel/electron35/files/patch-printing_print__settings.cc deleted file mode 100644 index 1b385dc65667..000000000000 --- a/devel/electron35/files/patch-printing_print__settings.cc +++ /dev/null @@ -1,38 +0,0 @@ ---- printing/print_settings.cc.orig 2025-01-27 17:37:37 UTC -+++ printing/print_settings.cc -@@ -319,7 +319,7 @@ PrintSettings& PrintSettings::operator=(const PrintSet - #endif - is_modifiable_ = settings.is_modifiable_; - pages_per_sheet_ = settings.pages_per_sheet_; --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - for (const auto& item : settings.advanced_settings_) - advanced_settings_.emplace(item.first, item.second.Clone()); - #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -349,7 +349,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 -@@ -373,7 +373,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 -@@ -413,7 +413,7 @@ void PrintSettings::Clear() { - #endif - is_modifiable_ = true; - pages_per_sheet_ = 1; --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - advanced_settings_.clear(); - #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) - #if BUILDFLAG(IS_CHROMEOS) |