Merge remote-tracking branch 'freebsd/main' into lf/mainlf/main

1 files changed, 0 insertions, 26 deletions

diff --git a/devel/electron35/files/patch-printing_printing__features.cc b/devel/electron35/files/patch-printing_printing__features.cc
deleted file mode 100644
index 6e6d665dfee8..000000000000
--- a/devel/electron35/files/patch-printing_printing__features.cc
+++ /dev/null
@@ -1,26 +0,0 @@
---- printing/printing_features.cc.orig	2025-03-24 20:50:14 UTC
-+++ printing/printing_features.cc
-@@ -21,12 +21,12 @@ BASE_FEATURE(kAddPrinterViaPrintscanmgr,
-              base::FEATURE_ENABLED_BY_DEFAULT);
- #endif  // BUILDFLAG(IS_CHROMEOS)
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
- // Use the CUPS IPP printing backend instead of the original CUPS backend that
- // calls the deprecated PPD API.
- BASE_FEATURE(kCupsIppPrintingBackend,
-              "CupsIppPrintingBackend",
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-              base::FEATURE_DISABLED_BY_DEFAULT
- #else
-              base::FEATURE_ENABLED_BY_DEFAULT
-@@ -69,7 +69,7 @@ BASE_FEATURE(kEnableOopPrintDrivers,
- // out-of-process.
- BASE_FEATURE(kEnableOopPrintDrivers,
-              "EnableOopPrintDrivers",
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
-              base::FEATURE_ENABLED_BY_DEFAULT
- #else
-              base::FEATURE_DISABLED_BY_DEFAULT