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_printing__context__linux.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_printing__context__linux.cc')
| -rw-r--r-- | devel/electron35/files/patch-printing_printing__context__linux.cc | 38 |
1 files changed, 0 insertions, 38 deletions
diff --git a/devel/electron35/files/patch-printing_printing__context__linux.cc b/devel/electron35/files/patch-printing_printing__context__linux.cc deleted file mode 100644 index 25c41c27f498..000000000000 --- a/devel/electron35/files/patch-printing_printing__context__linux.cc +++ /dev/null @@ -1,38 +0,0 @@ ---- printing/printing_context_linux.cc.orig 2025-01-27 17:37:37 UTC -+++ printing/printing_context_linux.cc -@@ -23,7 +23,7 @@ - #endif - - // Avoid using LinuxUi on Fuchsia. --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - #include "ui/linux/linux_ui.h" - #endif - -@@ -66,7 +66,7 @@ mojom::ResultCode PrintingContextLinux::UseDefaultSett - - ResetSettings(); - --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - if (!ui::LinuxUi::instance()) - return mojom::ResultCode::kSuccess; - -@@ -82,7 +82,7 @@ gfx::Size PrintingContextLinux::GetPdfPaperSizeDeviceU - } - - gfx::Size PrintingContextLinux::GetPdfPaperSizeDeviceUnits() { --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - if (ui::LinuxUi::instance()) - return ui::LinuxUi::instance()->GetPdfPaperSize(this); - #endif -@@ -95,7 +95,7 @@ mojom::ResultCode PrintingContextLinux::UpdatePrinterS - DCHECK(!printer_settings.show_system_dialog); - DCHECK(!in_print_job_); - --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - if (!ui::LinuxUi::instance()) - return mojom::ResultCode::kSuccess; - |