[hplip/f14] revert prnt/hpcups/HPCupsFilter.cpp 3.11.5->3.11.7 change (bug #738089).
Jiří Popelka
jpopelka at fedoraproject.org
Wed Nov 16 15:18:09 UTC 2011
commit 3377ab93e60b7088493994389ab450e68c4bdf16
Author: Jiri Popelka <jpopelka at redhat.com>
Date: Wed Nov 16 15:55:33 2011 +0100
revert prnt/hpcups/HPCupsFilter.cpp 3.11.5->3.11.7 change (bug #738089).
hplip-top-margins-not-respected.patch | 22 ++++++++++++++++++++++
hplip.spec | 9 ++++++++-
2 files changed, 30 insertions(+), 1 deletions(-)
---
diff --git a/hplip-top-margins-not-respected.patch b/hplip-top-margins-not-respected.patch
new file mode 100644
index 0000000..c11426c
--- /dev/null
+++ b/hplip-top-margins-not-respected.patch
@@ -0,0 +1,22 @@
+diff -up hplip-3.11.10/prnt/hpcups/HPCupsFilter.cpp.top-margins-not-respected hplip-3.11.10/prnt/hpcups/HPCupsFilter.cpp
+--- hplip-3.11.10/prnt/hpcups/HPCupsFilter.cpp.top-margins-not-respected 2011-10-02 05:03:50.000000000 +0200
++++ hplip-3.11.10/prnt/hpcups/HPCupsFilter.cpp 2011-11-14 16:49:39.073220429 +0100
+@@ -544,18 +544,10 @@ bool HPCupsFilter::isBlankRaster(BYTE *i
+ return true;
+ }
+
+- if(header->cupsColorSpace == CUPS_CSPACE_K){
+- if (*input_raster == 0x00 &&
+- !(memcmp(input_raster + 1, input_raster, length_in_bytes - 1))) {
+- return true;
+- }
+- }
+- else{
+ if (*input_raster == 0xFF &&
+ !(memcmp(input_raster + 1, input_raster, length_in_bytes - 1))) {
+ return true;
+ }
+- }
+ return false;
+ }
+
diff --git a/hplip.spec b/hplip.spec
index 72316d7..907be60 100644
--- a/hplip.spec
+++ b/hplip.spec
@@ -1,7 +1,7 @@
Summary: HP Linux Imaging and Printing Project
Name: hplip
Version: 3.11.10
-Release: 5%{?dist}
+Release: 6%{?dist}
License: GPLv2+ and MIT
Group: System Environment/Daemons
Conflicts: system-config-printer < 0.6.132
@@ -46,6 +46,7 @@ Patch33: hplip-dbus-threads.patch
Patch34: hplip-notification-exception.patch
Patch35: hplip-CVE-2010-4267.patch
Patch36: hplip-wifisetup.patch
+Patch37: hplip-top-margins-not-respected.patch
Requires(pre): /sbin/service
Requires(post): /sbin/chkconfig
@@ -299,6 +300,9 @@ done
# Avoid KeyError in ui4/wifisetupdialog.py (bug #680939).
%patch36 -p1 -b .wifisetup
+# revert prnt/hpcups/HPCupsFilter.cpp 3.11.5->3.11.7 change (bug #738089).
+%patch37 -p1 -b .top-margins-not-respected
+
sed -i.duplex-constraints \
-e 's,\(UIConstraints.* \*Duplex\),//\1,' \
prnt/drv/hpcups.drv.in
@@ -523,6 +527,9 @@ fi
%postun libs -p /sbin/ldconfig
%changelog
+* Wed Nov 16 2011 Jiri Popelka <jpopelka at redhat.com> 3.11.10-6
+- revert prnt/hpcups/HPCupsFilter.cpp 3.11.5->3.11.7 change (bug #738089).
+
* Tue Oct 25 2011 Tim Waugh <twaugh at redhat.com> 3.11.10-5
- Catch DBusException in hp-systray (bug #746024).
More information about the scm-commits
mailing list