diff --git a/hplip-skip-blank-lines.patch b/hplip-skip-blank-lines.patch new file mode 100644 index 0000000..288a887 --- /dev/null +++ b/hplip-skip-blank-lines.patch @@ -0,0 +1,11 @@ +diff -up hplip-3.10.2/prnt/hpcups/LJColor.h.skip-blank-lines hplip-3.10.2/prnt/hpcups/LJColor.h +--- hplip-3.10.2/prnt/hpcups/LJColor.h.skip-blank-lines 2010-02-24 23:04:09.000000000 +0000 ++++ hplip-3.10.2/prnt/hpcups/LJColor.h 2010-04-15 21:46:48.375754707 +0100 +@@ -48,6 +48,7 @@ public: + DRIVER_ERROR Configure(Pipeline **pipeline); + DRIVER_ERROR EndJob(); + DRIVER_ERROR FormFeed(); ++ bool CanSkipRasters() {return false;} + protected: + virtual DRIVER_ERROR addJobSettings(); + void configureRasterData(); diff --git a/hplip.spec b/hplip.spec index 8e216c3..0087cbd 100644 --- a/hplip.spec +++ b/hplip.spec @@ -1,7 +1,7 @@ Summary: HP Linux Imaging and Printing Project Name: hplip Version: 3.10.2 -Release: 9.1%{?dist} +Release: 10%{?dist} License: GPLv2+ and MIT Group: System Environment/Daemons Conflicts: system-config-printer < 0.6.132 @@ -28,6 +28,7 @@ Patch11: hplip-device-reconnected.patch Patch14: hplip-hpcups-sigpipe.patch Patch16: hplip-bad-low-ink-warning.patch Patch17: hplip-deviceIDs-ppd.patch +Patch18: hplip-skip-blank-lines.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -176,6 +177,9 @@ do gzip -n ${ppd_file#*/} done +# Hpcups (ljcolor) was putting black lines where should be blank lines (bug #579461). +%patch18 -p1 -b .skip-blank-lines + sed -i.duplex-constraints \ -e 's,\(UIConstraints.* \*Duplex\),//\1,' \ prnt/drv/hpcups.drv.in @@ -397,6 +401,10 @@ fi %{_bindir}/hpcups-update-ppds &>/dev/null ||: %changelog +* Thu Apr 16 2010 Jiri Popelka - 3.10.2-10 +- Fixed black/blank lines in ljcolor hpcups output (bug #579461). + Work-around is to send entire blank raster lines instead of skipping them. + * Fri Apr 9 2010 Jiri Popelka - 3.10.2-9.1 - Added/Corrected several IEEE 1284 Device IDs (bugs #577262, #577282, #577282, #577288, #577292, #577302,