From 9848937170846e3018121dc7640c832d8704d984 Mon Sep 17 00:00:00 2001 From: Jiri Popelka Date: Tue, 11 Aug 2015 13:19:44 +0200 Subject: [PATCH] Upstream fix for 'Stopped "Filter Failed"' (Launchpad #1476920) --- hplip-CommonDefinations.patch | 22 ++++++++++++++++++++++ hplip.spec | 9 ++++++++- 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 hplip-CommonDefinations.patch diff --git a/hplip-CommonDefinations.patch b/hplip-CommonDefinations.patch new file mode 100644 index 0000000..8ee6624 --- /dev/null +++ b/hplip-CommonDefinations.patch @@ -0,0 +1,22 @@ +*** hplip-3.15.7_original/prnt/hpcups/CommonDefinitions.h 2015-07-13 13:18:53.000000000 +0530 +--- hplip-3.15.7_latest/prnt/hpcups/CommonDefinitions.h 2015-07-28 20:07:24.018247373 +0530 +*************** +*** 441,447 **** + { + int media_source; + int color_mode; +- int HPSPDClass; + DUPLEXMODE e_duplex_mode; + int print_borderless; + int krgb_mode; +--- 441,446 ---- +*************** +*** 466,471 **** +--- 465,471 ---- + int integer_values[16]; + int printer_platform_version; + int pre_process_raster; ++ int HPSPDClass; + } JobAttributes; + + #endif // COMMON_DEFINITIONS_H diff --git a/hplip.spec b/hplip.spec index 99d4747..39bfb59 100644 --- a/hplip.spec +++ b/hplip.spec @@ -10,7 +10,7 @@ Summary: HP Linux Imaging and Printing Project Name: hplip Version: 3.15.7 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ and MIT Url: http://hplip.sourceforge.net/ @@ -39,6 +39,7 @@ Patch20: hplip-dj990c-margin.patch Patch21: hplip-strncpy.patch Patch22: hplip-no-write-bytecode.patch Patch23: hplip-silence-ioerror.patch +Patch24: hplip-CommonDefinations.patch %global hpijs_epoch 1 Requires: hpijs%{?_isa} = %{hpijs_epoch}:%{version}-%{release} @@ -237,6 +238,9 @@ done # Ignore IOError when logging output (bug #712537). %patch23 -p1 -b .silence-ioerror +# https://bugs.launchpad.net/hplip/+bug/1476920 +%patch24 -p1 -b .CommonDefinations + sed -i.duplex-constraints \ -e 's,\(UIConstraints.* \*Duplex\),//\1,' \ prnt/drv/hpcups.drv.in @@ -523,6 +527,9 @@ rm -f ppds-all %postun libs -p /sbin/ldconfig %changelog +* Tue Aug 11 2015 Jiri Popelka - 3.15.7-2 +- Upstream fix for 'Stopped "Filter Failed"' (Launchpad #1476920) + * Wed Jul 15 2015 Jiri Popelka - 3.15.7-1 - 3.15.7