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 /www/iridium/files/patch-printing_printing__features.cc | |
| parent | f85f2b2d6e5b7ed869376eb4b180c3a74a5c5da9 (diff) | |
| parent | 1a30da80670973368b399f2b01fe9c04b91a1273 (diff) | |
Merge remote-tracking branch 'freebsd/main' into lf/mainlf/main
Diffstat (limited to 'www/iridium/files/patch-printing_printing__features.cc')
| -rw-r--r-- | www/iridium/files/patch-printing_printing__features.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/www/iridium/files/patch-printing_printing__features.cc b/www/iridium/files/patch-printing_printing__features.cc index d7df935d47ef..9e6a9dfd3c33 100644 --- a/www/iridium/files/patch-printing_printing__features.cc +++ b/www/iridium/files/patch-printing_printing__features.cc @@ -1,18 +1,18 @@ ---- printing/printing_features.cc.orig 2025-09-11 13:19:19 UTC +--- printing/printing_features.cc.orig 2025-11-06 10:11:34 UTC +++ printing/printing_features.cc -@@ -26,7 +26,7 @@ BASE_FEATURE(kApiPrintingMarginsAndScale, - base::FEATURE_DISABLED_BY_DEFAULT); +@@ -22,7 +22,7 @@ BASE_FEATURE(kAddPrinterViaPrintscanmgr, base::FEATURE + BASE_FEATURE(kApiPrintingMarginsAndScale, base::FEATURE_DISABLED_BY_DEFAULT); #endif // BUILDFLAG(IS_CHROMEOS) -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Use the CUPS IPP printing backend instead of the original CUPS backend that // calls the deprecated PPD API. - BASE_FEATURE(kCupsIppPrintingBackend, -@@ -70,7 +70,7 @@ BASE_FEATURE(kUseXpsForPrintingFromPdf, + BASE_FEATURE(kCupsIppPrintingBackend, base::FEATURE_DISABLED_BY_DEFAULT); +@@ -54,7 +54,7 @@ BASE_FEATURE(kUseXpsForPrintingFromPdf, base::FEATURE_ + // Enables printing interactions with the operating system to be performed // 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 |