diff options
| author | Lexi Winter <ivy@FreeBSD.org> | 2025-10-05 09:19:31 +0100 |
|---|---|---|
| committer | Lexi Winter <ivy@FreeBSD.org> | 2025-10-05 09:19:31 +0100 |
| commit | f85f2b2d6e5b7ed869376eb4b180c3a74a5c5da9 (patch) | |
| tree | ad799ccacfb459b809b02b9c115ed4befb93b4c1 /www/ungoogled-chromium/files/patch-printing_printing__features.cc | |
| parent | 0b1510fe1f98f82da6f3481cb6c58957022d9211 (diff) | |
| parent | b057c68280a2f2a7b3d1fbac36f7b034e1fdf593 (diff) | |
Merge remote-tracking branch 'freebsd/main' into lf/main
Diffstat (limited to 'www/ungoogled-chromium/files/patch-printing_printing__features.cc')
| -rw-r--r-- | www/ungoogled-chromium/files/patch-printing_printing__features.cc | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/www/ungoogled-chromium/files/patch-printing_printing__features.cc b/www/ungoogled-chromium/files/patch-printing_printing__features.cc index e1061b42f81c..8d6630914d05 100644 --- a/www/ungoogled-chromium/files/patch-printing_printing__features.cc +++ b/www/ungoogled-chromium/files/patch-printing_printing__features.cc @@ -1,21 +1,15 @@ ---- printing/printing_features.cc.orig 2025-05-06 12:23:00 UTC +--- printing/printing_features.cc.orig 2025-09-10 13:22:16 UTC +++ printing/printing_features.cc -@@ -26,12 +26,12 @@ BASE_FEATURE(kApiPrintingMarginsAndScale, +@@ -26,7 +26,7 @@ BASE_FEATURE(kApiPrintingMarginsAndScale, base::FEATURE_DISABLED_BY_DEFAULT); #endif // BUILDFLAG(IS_CHROMEOS) --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) +-#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, - "CupsIppPrintingBackend", --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - base::FEATURE_DISABLED_BY_DEFAULT - #else - base::FEATURE_ENABLED_BY_DEFAULT -@@ -81,7 +81,7 @@ BASE_FEATURE(kUseXpsForPrintingFromPdf, +@@ -70,7 +70,7 @@ BASE_FEATURE(kUseXpsForPrintingFromPdf, // out-of-process. BASE_FEATURE(kEnableOopPrintDrivers, "EnableOopPrintDrivers", |