rpms/hplip
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'f14' into f15

Browse Source
This commit is contained in:
Jiri Popelka 2011-11-16 16:02:18 +01:00
commit be89e78016
2 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
hplip-top-margins-not-respected.patch Normal file
View File

@ -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;
}

9
hplip.spec
View File

@ -1,7 +1,7 @@
Summary: HP Linux Imaging and Printing Project Summary: HP Linux Imaging and Printing Project
Name: hplip Name: hplip
Version: 3.11.10 Version: 3.11.10
Release: 5%{?dist} Release: 6%{?dist}
License: GPLv2+ and MIT License: GPLv2+ and MIT
Group: System Environment/Daemons Group: System Environment/Daemons
Conflicts: system-config-printer < 0.6.132 Conflicts: system-config-printer < 0.6.132
@ -47,6 +47,7 @@ Patch33: hplip-dbus-threads.patch
Patch34: hplip-notification-exception.patch Patch34: hplip-notification-exception.patch
Patch35: hplip-CVE-2010-4267.patch Patch35: hplip-CVE-2010-4267.patch
Patch36: hplip-wifisetup.patch Patch36: hplip-wifisetup.patch
Patch37: hplip-top-margins-not-respected.patch
Requires(pre): /sbin/service Requires(pre): /sbin/service
Requires(post): /sbin/chkconfig Requires(post): /sbin/chkconfig
@ -301,6 +302,9 @@ done
# Avoid KeyError in ui4/wifisetupdialog.py (bug #680939). # Avoid KeyError in ui4/wifisetupdialog.py (bug #680939).
%patch36 -p1 -b .wifisetup %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 \ sed -i.duplex-constraints \
-e 's,\(UIConstraints.* \*Duplex\),//\1,' \ -e 's,\(UIConstraints.* \*Duplex\),//\1,' \
prnt/drv/hpcups.drv.in prnt/drv/hpcups.drv.in
@ -527,6 +531,9 @@ fi
%postun libs -p /sbin/ldconfig %postun libs -p /sbin/ldconfig
%changelog %changelog
* Wed Nov 16 2011 Jiri Popelka <jpopelka@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@redhat.com> 3.11.10-5 * Tue Oct 25 2011 Tim Waugh <twaugh@redhat.com> 3.11.10-5
- Catch DBusException in hp-systray (bug #746024). - Catch DBusException in hp-systray (bug #746024).