From 0752ba3568a1893762c52a7882a7f48e65439e3c Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Wed, 8 Jun 2022 19:11:18 +0200 Subject: [PATCH 1/4] foo2zjs: Fix AirPrint color printing for Dell1250c --- pkgs/misc/drivers/foo2zjs/default.nix | 6 +++++- pkgs/misc/drivers/foo2zjs/dell1250c-color-fix.patch | 13 +++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 pkgs/misc/drivers/foo2zjs/dell1250c-color-fix.patch diff --git a/pkgs/misc/drivers/foo2zjs/default.nix b/pkgs/misc/drivers/foo2zjs/default.nix index ca50ad2f1cc9..c1d38656b267 100644 --- a/pkgs/misc/drivers/foo2zjs/default.nix +++ b/pkgs/misc/drivers/foo2zjs/default.nix @@ -13,11 +13,15 @@ stdenv.mkDerivation rec { patches = [ ./no-hardcode-fw.diff - # Support HBPL1 printers https://www.dechifro.org/hbpl/ + # Support HBPL1 printers. Updated patch based on + # https://www.dechifro.org/hbpl/ ./hbpl1.patch # Fix "Unimplemented paper code" error for hbpl1 printers # https://github.com/mikerr/foo2zjs/pull/2 ./papercode-format-fix.patch + # Fix AirPrint color printing for Dell 1250c + # See https://github.com/OpenPrinting/cups/issues/272 + ./dell1250c-color-fix.patch ]; makeFlags = [ diff --git a/pkgs/misc/drivers/foo2zjs/dell1250c-color-fix.patch b/pkgs/misc/drivers/foo2zjs/dell1250c-color-fix.patch new file mode 100644 index 000000000000..74a03b8abed6 --- /dev/null +++ b/pkgs/misc/drivers/foo2zjs/dell1250c-color-fix.patch @@ -0,0 +1,13 @@ +diff --git a/PPD/Dell-1250c.ppd b/PPD/Dell-1250c.ppd +index 828ecd6..7e78ce4 100644 +--- a/PPD/Dell-1250c.ppd ++++ b/PPD/Dell-1250c.ppd +@@ -95,7 +95,7 @@ + *OpenUI *ColorMode/Color Mode: PickOne + *FoomaticRIPOption ColorMode: enum CmdLine A + *OrderDependency: 120 AnySetup *ColorMode +-*DefaultColorMode: Monochrome ++*DefaultColorMode: Color + *ColorMode Color/Color: "%% FoomaticRIPOptionSetting: ColorMode=Color" + *FoomaticRIPOptionSetting ColorMode=Color: "-c " + *ColorMode Monochrome/Monochrome: "%% FoomaticRIPOptionSetting: ColorMode=Monochrome" From f50d327f00f00147c4fb9abb083baf311273d3ac Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Thu, 9 Jun 2022 14:09:40 +0200 Subject: [PATCH 2/4] updated color patch --- .../drivers/foo2zjs/dell1250c-color-fix.patch | 34 ++++++++++++++----- 1 file changed, 25 insertions(+), 9 deletions(-) diff --git a/pkgs/misc/drivers/foo2zjs/dell1250c-color-fix.patch b/pkgs/misc/drivers/foo2zjs/dell1250c-color-fix.patch index 74a03b8abed6..ba0bea32b7ca 100644 --- a/pkgs/misc/drivers/foo2zjs/dell1250c-color-fix.patch +++ b/pkgs/misc/drivers/foo2zjs/dell1250c-color-fix.patch @@ -1,13 +1,29 @@ diff --git a/PPD/Dell-1250c.ppd b/PPD/Dell-1250c.ppd -index 828ecd6..7e78ce4 100644 +index 828ecd6..20f3595 100644 --- a/PPD/Dell-1250c.ppd +++ b/PPD/Dell-1250c.ppd -@@ -95,7 +95,7 @@ - *OpenUI *ColorMode/Color Mode: PickOne - *FoomaticRIPOption ColorMode: enum CmdLine A - *OrderDependency: 120 AnySetup *ColorMode +@@ -92,15 +92,15 @@ + *FoomaticRIPOptionSetting Quality=normal: " " + *CloseUI: *Quality + +-*OpenUI *ColorMode/Color Mode: PickOne +-*FoomaticRIPOption ColorMode: enum CmdLine A +-*OrderDependency: 120 AnySetup *ColorMode -*DefaultColorMode: Monochrome -+*DefaultColorMode: Color - *ColorMode Color/Color: "%% FoomaticRIPOptionSetting: ColorMode=Color" - *FoomaticRIPOptionSetting ColorMode=Color: "-c " - *ColorMode Monochrome/Monochrome: "%% FoomaticRIPOptionSetting: ColorMode=Monochrome" +-*ColorMode Color/Color: "%% FoomaticRIPOptionSetting: ColorMode=Color" +-*FoomaticRIPOptionSetting ColorMode=Color: "-c " +-*ColorMode Monochrome/Monochrome: "%% FoomaticRIPOptionSetting: ColorMode=Monochrome" +-*FoomaticRIPOptionSetting ColorMode=Monochrome: " " +-*CloseUI: *ColorMode ++*OpenUI *ColorModel/Color Mode: PickOne ++*FoomaticRIPOption ColorModel: enum CmdLine A ++*OrderDependency: 120 AnySetup *ColorModel ++*DefaultColorModel: Color ++*ColorModel RGB/Color: "%% FoomaticRIPOptionSetting: ColorModel=Color" ++*FoomaticRIPOptionSetting ColorModel=RGB: "-c " ++*ColorModel Gray/Monochrome: "%% FoomaticRIPOptionSetting: ColorMode=Monochrome" ++*FoomaticRIPOptionSetting ColorModel=Gray: " " ++*CloseUI: *ColorModel + + *OpenUI *PageSize/Page Size: PickOne + *FoomaticRIPOption PageSize: enum CmdLine A From d4ff221c45dc656ea65ae4c9cc8fa58e64694dfe Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Thu, 9 Jun 2022 14:25:39 +0200 Subject: [PATCH 3/4] updated color patch --- pkgs/misc/drivers/foo2zjs/dell1250c-color-fix.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/drivers/foo2zjs/dell1250c-color-fix.patch b/pkgs/misc/drivers/foo2zjs/dell1250c-color-fix.patch index ba0bea32b7ca..909ecb25cb1a 100644 --- a/pkgs/misc/drivers/foo2zjs/dell1250c-color-fix.patch +++ b/pkgs/misc/drivers/foo2zjs/dell1250c-color-fix.patch @@ -1,5 +1,5 @@ diff --git a/PPD/Dell-1250c.ppd b/PPD/Dell-1250c.ppd -index 828ecd6..20f3595 100644 +index 828ecd6..032d6c8 100644 --- a/PPD/Dell-1250c.ppd +++ b/PPD/Dell-1250c.ppd @@ -92,15 +92,15 @@ @@ -19,7 +19,7 @@ index 828ecd6..20f3595 100644 +*FoomaticRIPOption ColorModel: enum CmdLine A +*OrderDependency: 120 AnySetup *ColorModel +*DefaultColorModel: Color -+*ColorModel RGB/Color: "%% FoomaticRIPOptionSetting: ColorModel=Color" ++*ColorModel RGB/Color: "%% FoomaticRIPOptionSetting: ColorMode=Color" +*FoomaticRIPOptionSetting ColorModel=RGB: "-c " +*ColorModel Gray/Monochrome: "%% FoomaticRIPOptionSetting: ColorMode=Monochrome" +*FoomaticRIPOptionSetting ColorModel=Gray: " " From 871ea2c4352d0248b04925dd6cdd550e27c95a7f Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Thu, 9 Jun 2022 14:44:35 +0200 Subject: [PATCH 4/4] updated color patch --- pkgs/misc/drivers/foo2zjs/dell1250c-color-fix.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/drivers/foo2zjs/dell1250c-color-fix.patch b/pkgs/misc/drivers/foo2zjs/dell1250c-color-fix.patch index 909ecb25cb1a..4cef4f00ab57 100644 --- a/pkgs/misc/drivers/foo2zjs/dell1250c-color-fix.patch +++ b/pkgs/misc/drivers/foo2zjs/dell1250c-color-fix.patch @@ -1,5 +1,5 @@ diff --git a/PPD/Dell-1250c.ppd b/PPD/Dell-1250c.ppd -index 828ecd6..032d6c8 100644 +index 828ecd6..98f49e1 100644 --- a/PPD/Dell-1250c.ppd +++ b/PPD/Dell-1250c.ppd @@ -92,15 +92,15 @@ @@ -18,7 +18,7 @@ index 828ecd6..032d6c8 100644 +*OpenUI *ColorModel/Color Mode: PickOne +*FoomaticRIPOption ColorModel: enum CmdLine A +*OrderDependency: 120 AnySetup *ColorModel -+*DefaultColorModel: Color ++*DefaultColorModel: RGB +*ColorModel RGB/Color: "%% FoomaticRIPOptionSetting: ColorMode=Color" +*FoomaticRIPOptionSetting ColorModel=RGB: "-c " +*ColorModel Gray/Monochrome: "%% FoomaticRIPOptionSetting: ColorMode=Monochrome"