- 3.9.10. No longer need clear-previous-state-reasons, hpcups-reorder,
non-scripts, parenths, plugin-error, requirespageregion or
state-reasons-newline patches.
This commit is contained in:
Tim Waugh
parent
e5c92c9e69
commit
a9040f4755
@ -30,3 +30,4 @@ hplip-2.8.12.tar.gz
|
||||
hplip-3.9.2.tar.gz
|
||||
hplip-3.9.6b.tar.gz
|
||||
hplip-3.9.8.tar.gz
|
||||
hplip-3.9.10.tar.gz
|
||||
|
||||
7
hplip-3.9.10.tar.gz.asc
Normal file
7
hplip-3.9.10.tar.gz.asc
Normal file
@ -0,0 +1,7 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v1.4.9 (GNU/Linux)
|
||||
|
||||
iEYEABECAAYFAkrwszkACgkQhA7anpATwAUMowCdErRsdPydLdQ+AbMUnXmFK/9F
|
||||
IVEAoIDD5umpZ61yzDBUPfnvAALZUBfI
|
||||
=GQ71
|
||||
-----END PGP SIGNATURE-----
|
||||
@ -1,29 +0,0 @@
|
||||
diff -up hplip-3.9.8/prnt/backend/hp.c.clear-previous-state-reasons hplip-3.9.8/prnt/backend/hp.c
|
||||
--- hplip-3.9.8/prnt/backend/hp.c.clear-previous-state-reasons 2009-08-04 22:35:33.000000000 +0100
|
||||
+++ hplip-3.9.8/prnt/backend/hp.c 2009-08-24 09:55:28.941900902 +0100
|
||||
@@ -570,6 +570,14 @@ static int loop_test(HPMUD_DEVICE dd, HP
|
||||
{
|
||||
int status, stat;
|
||||
const char *pstate, *old_state=NULL;
|
||||
+ static int first_time = 1;
|
||||
+
|
||||
+ if (first_time)
|
||||
+ {
|
||||
+ first_time = 0;
|
||||
+ old_state = ("media-empty-error,media-jam-error,"
|
||||
+ "cover-open-error,toner-empty-error,other");
|
||||
+ }
|
||||
|
||||
while (1)
|
||||
{
|
||||
@@ -768,6 +776,10 @@ int main(int argc, char *argv[])
|
||||
pthread_cond_init(&pa.done_cond, NULL);
|
||||
pthread_create(&pa.tid, NULL, (void *(*)(void*))pjl_read_thread, (void *)&pa);
|
||||
}
|
||||
+
|
||||
+ /* Clear any errors left over from a previous run. */
|
||||
+ loop_test (hd, cd, &pa, argv[0], printer, argv[2], argv[1],
|
||||
+ argv[3]);
|
||||
}
|
||||
|
||||
stat = hpmud_write_channel(hd, cd, buf+total, size, EXCEPTION_TIMEOUT, &n);
|
||||
@ -1,7 +1,7 @@
|
||||
diff -up hplip-3.9.8/prnt/backend/hp.c.device-reconnected hplip-3.9.8/prnt/backend/hp.c
|
||||
--- hplip-3.9.8/prnt/backend/hp.c.device-reconnected 2009-09-29 16:02:14.717467334 +0100
|
||||
+++ hplip-3.9.8/prnt/backend/hp.c 2009-09-29 16:02:20.019342096 +0100
|
||||
@@ -638,6 +638,7 @@ int main(int argc, char *argv[])
|
||||
diff -up hplip-3.9.10/prnt/backend/hp.c.device-reconnected hplip-3.9.10/prnt/backend/hp.c
|
||||
--- hplip-3.9.10/prnt/backend/hp.c.device-reconnected 2009-11-03 21:45:10.000000000 +0000
|
||||
+++ hplip-3.9.10/prnt/backend/hp.c 2009-11-04 16:25:30.719129509 +0000
|
||||
@@ -645,6 +645,7 @@ int main(int argc, char *argv[])
|
||||
HPMUD_DEVICE hd=-1;
|
||||
HPMUD_CHANNEL cd=-1;
|
||||
int n, total=0, retry=0, size, pages;
|
||||
@ -9,22 +9,23 @@ diff -up hplip-3.9.8/prnt/backend/hp.c.device-reconnected hplip-3.9.8/prnt/backe
|
||||
enum HPMUD_RESULT stat;
|
||||
char *printer = getenv("PRINTER");
|
||||
|
||||
@@ -789,10 +790,23 @@ int main(int argc, char *argv[])
|
||||
/* IO error, get printer status. */
|
||||
if (loop_test(hd, cd, &pa, argv[0], printer, argv[2], argv[1], argv[3]))
|
||||
@@ -809,11 +810,24 @@ int main(int argc, char *argv[])
|
||||
{
|
||||
exit_stat = BACKEND_STOP; /* stop queue */
|
||||
goto bugout;
|
||||
+ }
|
||||
+
|
||||
+ if (++consecutive_failures == 5)
|
||||
+ {
|
||||
+ /* hpmud_write_channel has failed several times in
|
||||
+ * succession but the Device ID-based status says
|
||||
+ * the printer is happy. Time to face the fact that
|
||||
+ * the device has probably reconnected, and our USB
|
||||
+ * channel is invalidated. */
|
||||
+ if (++consecutive_failures == 5)
|
||||
+ {
|
||||
+ /* hpmud_write_channel has failed several times in
|
||||
+ * succession but the Device ID-based status says
|
||||
+ * the printer is happy. Time to face the fact that
|
||||
+ * the device has probably reconnected, and our USB
|
||||
+ * channel is invalidated. */
|
||||
+
|
||||
+ BUG("ERROR: device reconnected?");
|
||||
+ goto bugout;
|
||||
+ }
|
||||
+ BUG("ERROR: device reconnected?");
|
||||
+ goto bugout;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,12 +0,0 @@
|
||||
diff -up hplip-3.9.8/Makefile.am.non-scripts hplip-3.9.8/Makefile.am
|
||||
--- hplip-3.9.8/Makefile.am.non-scripts 2009-08-04 22:37:39.000000000 +0100
|
||||
+++ hplip-3.9.8/Makefile.am 2009-08-28 10:58:04.488778060 +0100
|
||||
@@ -121,7 +121,7 @@ dist_cmd_SCRIPTS = align.py info.py prin
|
||||
# base
|
||||
basedir = $(hplipdir)/base
|
||||
|
||||
-dist_base_SCRIPTS = base/maint.py base/codes.py base/g.py base/pml.py base/status.py \
|
||||
+dist_base_DATA = base/maint.py base/codes.py base/g.py base/pml.py base/status.py \
|
||||
base/__init__.py base/mfpdtf.py base/utils.py base/wifi.py \
|
||||
base/device.py base/logger.py base/slp.py base/exif.py base/strings.py base/magic.py \
|
||||
base/imagesize.py base/pexpect.py base/models.py base/mdns.py base/tui.py base/dime.py \
|
||||
@ -1,183 +0,0 @@
|
||||
diff -up hplip-3.9.8/prnt/drv/hpcups.drv.in.parenths hplip-3.9.8/prnt/drv/hpcups.drv.in
|
||||
--- hplip-3.9.8/prnt/drv/hpcups.drv.in.parenths 2009-08-24 17:20:34.608890337 +0100
|
||||
+++ hplip-3.9.8/prnt/drv/hpcups.drv.in 2009-08-24 17:22:04.606015304 +0100
|
||||
@@ -214,7 +214,7 @@ Manufacturer "HP"
|
||||
"<</cupsInteger0 74/PageSize[288 423]/ImagingBBox null>>setpagedevice"
|
||||
CustomMedia "A6/A6 105x148mm" 297.36 419.76 9 36 9 9 "<</PageSize[297.36 419.76]/ImagingBBox null>>setpagedevice"
|
||||
"<</cupsInteger0 73/PageSize[297.36 419.76]/ImagingBBox null>>setpagedevice"
|
||||
- CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm)" 297 411 18 27 18 36 "<</PageSize[297 411]/ImagingBBox null>>setpagedevice"
|
||||
+ CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm" 297 411 18 27 18 36 "<</PageSize[297 411]/ImagingBBox null>>setpagedevice"
|
||||
"<</cupsInteger0 73/PageSize[297 411]/ImagingBBox null>>setpagedevice"
|
||||
CustomMedia "Hagaki/Hagaki 100x148mm" 284 411 9 36 9 9 "<</PageSize[284 411]/ImagingBBox null>>setpagedevice"
|
||||
"<</cupsInteger0 71/PageSize[284 411]/ImagingBBox null>>setpagedevice"
|
||||
@@ -260,7 +260,7 @@ Manufacturer "HP"
|
||||
"<</cupsInteger0 2/PageSize[612 783]/ImagingBBox null>>setpagedevice"
|
||||
CustomMedia "A4/A4 210x297mm" 595.44 841.68 18 36 18 9 "<</PageSize[595.44 841.68]/ImagingBBox null>>setpagedevice"
|
||||
"<</cupsInteger0 26/PageSize[595.44 841.68]/ImagingBBox null>>setpagedevice"
|
||||
- CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm)" 595 833 18 27 18 36 "<</PageSize[595 833]/ImagingBBox null>>setpagedevice"
|
||||
+ CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm" 595 833 18 27 18 36 "<</PageSize[595 833]/ImagingBBox null>>setpagedevice"
|
||||
"<</cupsInteger0 26/PageSize[595 833]/ImagingBBox null>>setpagedevice"
|
||||
CustomMedia "Legal/Legal 8.5x14in" 612 1008 18 36 18 9 "<</PageSize[612 1008]/ImagingBBox null>>setpagedevice"
|
||||
"<</cupsInteger0 3/PageSize[612 1008]/ImagingBBox null>>setpagedevice"
|
||||
@@ -890,7 +890,7 @@ Manufacturer "HP"
|
||||
"<</cupsInteger0 74/PageSize[288 423]/ImagingBBox null>>setpagedevice"
|
||||
CustomMedia "A6/A6 105x148mm" 297.36 419.76 9 36 9 9 "<</PageSize[297.36 419.76]/ImagingBBox null>>setpagedevice"
|
||||
"<</cupsInteger0 73/PageSize[297.36 419.76]/ImagingBBox null>>setpagedevice"
|
||||
- CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm)" 297 411 18 27 18 36 "<</PageSize[297 411]/ImagingBBox null>>setpagedevice"
|
||||
+ CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm" 297 411 18 27 18 36 "<</PageSize[297 411]/ImagingBBox null>>setpagedevice"
|
||||
"<</cupsInteger0 73/PageSize[297 411]/ImagingBBox null>>setpagedevice"
|
||||
CustomMedia "Hagaki/Hagaki 100x148mm" 284 411 9 36 9 9 "<</PageSize[284 411]/ImagingBBox null>>setpagedevice"
|
||||
"<</cupsInteger0 71/PageSize[284 411]/ImagingBBox null>>setpagedevice"
|
||||
@@ -936,7 +936,7 @@ Manufacturer "HP"
|
||||
"<</cupsInteger0 2/PageSize[612 783]/ImagingBBox null>>setpagedevice"
|
||||
CustomMedia "A4/A4 210x297mm" 595.44 841.68 18 36 18 9 "<</PageSize[595.44 841.68]/ImagingBBox null>>setpagedevice"
|
||||
"<</cupsInteger0 26/PageSize[595.44 841.68]/ImagingBBox null>>setpagedevice"
|
||||
- CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm)" 595 833 18 27 18 36 "<</PageSize[595 833]/ImagingBBox null>>setpagedevice"
|
||||
+ CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm" 595 833 18 27 18 36 "<</PageSize[595 833]/ImagingBBox null>>setpagedevice"
|
||||
"<</cupsInteger0 26/PageSize[595 833]/ImagingBBox null>>setpagedevice"
|
||||
CustomMedia "Legal/Legal 8.5x14in" 612 1008 18 36 18 9 "<</PageSize[612 1008]/ImagingBBox null>>setpagedevice"
|
||||
"<</cupsInteger0 3/PageSize[612 1008]/ImagingBBox null>>setpagedevice"
|
||||
@@ -1132,7 +1132,7 @@ Manufacturer "HP"
|
||||
"<</cupsInteger0 74/PageSize[288 423]/ImagingBBox null>>setpagedevice"
|
||||
CustomMedia "A6/A6 105x148mm" 297.36 419.76 9 36 9 9 "<</PageSize[297.36 419.76]/ImagingBBox null>>setpagedevice"
|
||||
"<</cupsInteger0 73/PageSize[297.36 419.76]/ImagingBBox null>>setpagedevice"
|
||||
- CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm)" 297 411 18 27 18 36 "<</PageSize[297 411]/ImagingBBox null>>setpagedevice"
|
||||
+ CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm" 297 411 18 27 18 36 "<</PageSize[297 411]/ImagingBBox null>>setpagedevice"
|
||||
"<</cupsInteger0 73/PageSize[297 411]/ImagingBBox null>>setpagedevice"
|
||||
CustomMedia "Hagaki/Hagaki 100x148mm" 284 411 9 36 9 9 "<</PageSize[284 411]/ImagingBBox null>>setpagedevice"
|
||||
"<</cupsInteger0 71/PageSize[284 411]/ImagingBBox null>>setpagedevice"
|
||||
@@ -1178,7 +1178,7 @@ Manufacturer "HP"
|
||||
"<</cupsInteger0 2/PageSize[612 783]/ImagingBBox null>>setpagedevice"
|
||||
CustomMedia "A4/A4 210x297mm" 595.44 841.68 18 36 18 9 "<</PageSize[595.44 841.68]/ImagingBBox null>>setpagedevice"
|
||||
"<</cupsInteger0 26/PageSize[595.44 841.68]/ImagingBBox null>>setpagedevice"
|
||||
- CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm)" 595 833 18 27 18 36 "<</PageSize[595 833]/ImagingBBox null>>setpagedevice"
|
||||
+ CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm" 595 833 18 27 18 36 "<</PageSize[595 833]/ImagingBBox null>>setpagedevice"
|
||||
"<</cupsInteger0 26/PageSize[595 833]/ImagingBBox null>>setpagedevice"
|
||||
CustomMedia "Legal/Legal 8.5x14in" 612 1008 18 36 18 9 "<</PageSize[612 1008]/ImagingBBox null>>setpagedevice"
|
||||
"<</cupsInteger0 3/PageSize[612 1008]/ImagingBBox null>>setpagedevice"
|
||||
@@ -1348,7 +1348,7 @@ Manufacturer "HP"
|
||||
"<</cupsInteger0 74/PageSize[288 423]/ImagingBBox null>>setpagedevice"
|
||||
CustomMedia "A6/A6 105x148mm" 297.36 419.76 9 36 9 9 "<</PageSize[297.36 419.76]/ImagingBBox null>>setpagedevice"
|
||||
"<</cupsInteger0 73/PageSize[297.36 419.76]/ImagingBBox null>>setpagedevice"
|
||||
- CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm)" 297 411 18 27 18 36 "<</PageSize[297 411]/ImagingBBox null>>setpagedevice"
|
||||
+ CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm" 297 411 18 27 18 36 "<</PageSize[297 411]/ImagingBBox null>>setpagedevice"
|
||||
"<</cupsInteger0 73/PageSize[297 411]/ImagingBBox null>>setpagedevice"
|
||||
CustomMedia "Hagaki/Hagaki 100x148mm" 284 411 9 36 9 9 "<</PageSize[284 411]/ImagingBBox null>>setpagedevice"
|
||||
"<</cupsInteger0 71/PageSize[284 411]/ImagingBBox null>>setpagedevice"
|
||||
@@ -1394,7 +1394,7 @@ Manufacturer "HP"
|
||||
"<</cupsInteger0 2/PageSize[612 783]/ImagingBBox null>>setpagedevice"
|
||||
CustomMedia "A4/A4 210x297mm" 595.44 841.68 18 36 18 9 "<</PageSize[595.44 841.68]/ImagingBBox null>>setpagedevice"
|
||||
"<</cupsInteger0 26/PageSize[595.44 841.68]/ImagingBBox null>>setpagedevice"
|
||||
- CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm)" 595 833 18 27 18 36 "<</PageSize[595 833]/ImagingBBox null>>setpagedevice"
|
||||
+ CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm" 595 833 18 27 18 36 "<</PageSize[595 833]/ImagingBBox null>>setpagedevice"
|
||||
"<</cupsInteger0 26/PageSize[595 833]/ImagingBBox null>>setpagedevice"
|
||||
CustomMedia "Legal/Legal 8.5x14in" 612 1008 18 36 18 9 "<</PageSize[612 1008]/ImagingBBox null>>setpagedevice"
|
||||
"<</cupsInteger0 3/PageSize[612 1008]/ImagingBBox null>>setpagedevice"
|
||||
@@ -1758,7 +1758,7 @@ Manufacturer "HP"
|
||||
"<</cupsInteger0 74/PageSize[288 423]/ImagingBBox null>>setpagedevice"
|
||||
CustomMedia "A6/A6 105x148mm" 297.36 419.76 9 36 9 9 "<</PageSize[297.36 419.76]/ImagingBBox null>>setpagedevice"
|
||||
"<</cupsInteger0 73/PageSize[297.36 419.76]/ImagingBBox null>>setpagedevice"
|
||||
- CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm)" 297 411 18 27 18 36 "<</PageSize[297 411]/ImagingBBox null>>setpagedevice"
|
||||
+ CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm" 297 411 18 27 18 36 "<</PageSize[297 411]/ImagingBBox null>>setpagedevice"
|
||||
"<</cupsInteger0 73/PageSize[297 411]/ImagingBBox null>>setpagedevice"
|
||||
CustomMedia "Hagaki/Hagaki 100x148mm" 284 411 9 36 9 9 "<</PageSize[284 411]/ImagingBBox null>>setpagedevice"
|
||||
"<</cupsInteger0 71/PageSize[284 411]/ImagingBBox null>>setpagedevice"
|
||||
@@ -1804,7 +1804,7 @@ Manufacturer "HP"
|
||||
"<</cupsInteger0 2/PageSize[612 783]/ImagingBBox null>>setpagedevice"
|
||||
CustomMedia "A4/A4 210x297mm" 595.44 841.68 18 36 18 9 "<</PageSize[595.44 841.68]/ImagingBBox null>>setpagedevice"
|
||||
"<</cupsInteger0 26/PageSize[595.44 841.68]/ImagingBBox null>>setpagedevice"
|
||||
- CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm)" 595 833 18 27 18 36 "<</PageSize[595 833]/ImagingBBox null>>setpagedevice"
|
||||
+ CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm" 595 833 18 27 18 36 "<</PageSize[595 833]/ImagingBBox null>>setpagedevice"
|
||||
"<</cupsInteger0 26/PageSize[595 833]/ImagingBBox null>>setpagedevice"
|
||||
CustomMedia "Legal/Legal 8.5x14in" 612 1008 18 36 18 9 "<</PageSize[612 1008]/ImagingBBox null>>setpagedevice"
|
||||
"<</cupsInteger0 3/PageSize[612 1008]/ImagingBBox null>>setpagedevice"
|
||||
@@ -1985,7 +1985,7 @@ Manufacturer "HP"
|
||||
"<</cupsInteger0 74/PageSize[288 423]/ImagingBBox null>>setpagedevice"
|
||||
CustomMedia "A6/A6 105x148mm" 297.36 419.76 9 36 9 9 "<</PageSize[297.36 419.76]/ImagingBBox null>>setpagedevice"
|
||||
"<</cupsInteger0 73/PageSize[297.36 419.76]/ImagingBBox null>>setpagedevice"
|
||||
- CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm)" 297 411 18 27 18 36 "<</PageSize[297 411]/ImagingBBox null>>setpagedevice"
|
||||
+ CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm" 297 411 18 27 18 36 "<</PageSize[297 411]/ImagingBBox null>>setpagedevice"
|
||||
"<</cupsInteger0 73/PageSize[297 411]/ImagingBBox null>>setpagedevice"
|
||||
CustomMedia "Hagaki/Hagaki 100x148mm" 284 411 9 36 9 9 "<</PageSize[284 411]/ImagingBBox null>>setpagedevice"
|
||||
"<</cupsInteger0 71/PageSize[284 411]/ImagingBBox null>>setpagedevice"
|
||||
@@ -2031,7 +2031,7 @@ Manufacturer "HP"
|
||||
"<</cupsInteger0 2/PageSize[612 783]/ImagingBBox null>>setpagedevice"
|
||||
CustomMedia "A4/A4 210x297mm" 595.44 841.68 18 36 18 9 "<</PageSize[595.44 841.68]/ImagingBBox null>>setpagedevice"
|
||||
"<</cupsInteger0 26/PageSize[595.44 841.68]/ImagingBBox null>>setpagedevice"
|
||||
- CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm)" 595 833 18 27 18 36 "<</PageSize[595 833]/ImagingBBox null>>setpagedevice"
|
||||
+ CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm" 595 833 18 27 18 36 "<</PageSize[595 833]/ImagingBBox null>>setpagedevice"
|
||||
"<</cupsInteger0 26/PageSize[595 833]/ImagingBBox null>>setpagedevice"
|
||||
CustomMedia "Legal/Legal 8.5x14in" 612 1008 18 36 18 9 "<</PageSize[612 1008]/ImagingBBox null>>setpagedevice"
|
||||
"<</cupsInteger0 3/PageSize[612 1008]/ImagingBBox null>>setpagedevice"
|
||||
@@ -2225,7 +2225,7 @@ Manufacturer "HP"
|
||||
"<</cupsInteger0 73/PageSize[297.36 419.76]/ImagingBBox null>>setpagedevice"
|
||||
CustomMedia "A6FB/A6 Borderless 105x148mm" 307 430 0 0 0 0 "<</PageSize[307 430]/ImagingBBox null>>setpagedevice"
|
||||
"<</cupsInteger0 73/PageSize[307 430]/ImagingBBox null>>setpagedevice"
|
||||
- CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm)" 297 411 9 27 9 36 "<</PageSize[297 411]/ImagingBBox null>>setpagedevice"
|
||||
+ CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm" 297 411 9 27 9 36 "<</PageSize[297 411]/ImagingBBox null>>setpagedevice"
|
||||
"<</cupsInteger0 73/PageSize[297 411]/ImagingBBox null>>setpagedevice"
|
||||
CustomMedia "Hagaki/Hagaki 100x148mm" 284 411 9 9 9 9 "<</PageSize[284 411]/ImagingBBox null>>setpagedevice"
|
||||
"<</cupsInteger0 71/PageSize[284 411]/ImagingBBox null>>setpagedevice"
|
||||
@@ -2285,7 +2285,7 @@ Manufacturer "HP"
|
||||
"<</cupsInteger0 26/PageSize[595.44 841.68]/ImagingBBox null>>setpagedevice"
|
||||
CustomMedia "A4FB/A4 Borderless 210x297mm" 605 852 0 0 0 0 "<</PageSize[605 852]/ImagingBBox null>>setpagedevice"
|
||||
"<</cupsInteger0 26/PageSize[605 852]/ImagingBBox null>>setpagedevice"
|
||||
- CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm)" 595 833 9 27 9 36 "<</PageSize[595 833]/ImagingBBox null>>setpagedevice"
|
||||
+ CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm" 595 833 9 27 9 36 "<</PageSize[595 833]/ImagingBBox null>>setpagedevice"
|
||||
"<</cupsInteger0 26/PageSize[595 833]/ImagingBBox null>>setpagedevice"
|
||||
CustomMedia "Legal/Legal 8.5x14in" 612 1008 9 9 9 9 "<</PageSize[612 1008]/ImagingBBox null>>setpagedevice"
|
||||
"<</cupsInteger0 3/PageSize[612 1008]/ImagingBBox null>>setpagedevice"
|
||||
@@ -3852,7 +3852,7 @@ Manufacturer "HP"
|
||||
"<</cupsInteger0 74/PageSize[298 442]/ImagingBBox null>>setpagedevice"
|
||||
CustomMedia "A6/A6 105x148mm" 297.36 419.76 9 9 9 9 "<</PageSize[297.36 419.76]/ImagingBBox null>>setpagedevice"
|
||||
"<</cupsInteger0 73/PageSize[297.36 419.76]/ImagingBBox null>>setpagedevice"
|
||||
- CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm)" 297 411 9 27 9 36 "<</PageSize[297 411]/ImagingBBox null>>setpagedevice"
|
||||
+ CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm" 297 411 9 27 9 36 "<</PageSize[297 411]/ImagingBBox null>>setpagedevice"
|
||||
"<</cupsInteger0 73/PageSize[297 411]/ImagingBBox null>>setpagedevice"
|
||||
CustomMedia "A6FB/A6 Borderless 105x148mm" 307 430 0 0 0 0 "<</PageSize[307 430]/ImagingBBox null>>setpagedevice"
|
||||
"<</cupsInteger0 73/PageSize[307 430]/ImagingBBox null>>setpagedevice"
|
||||
@@ -3912,7 +3912,7 @@ Manufacturer "HP"
|
||||
"<</cupsInteger0 2/PageSize[622 802]/ImagingBBox null>>setpagedevice"
|
||||
CustomMedia "A4/A4 210x297mm" 595.44 841.68 9 9 9 9 "<</PageSize[595.44 841.68]/ImagingBBox null>>setpagedevice"
|
||||
"<</cupsInteger0 26/PageSize[595.44 841.68]/ImagingBBox null>>setpagedevice"
|
||||
- CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm)" 595 833 9 27 9 36 "<</PageSize[595 833]/ImagingBBox null>>setpagedevice"
|
||||
+ CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm" 595 833 9 27 9 36 "<</PageSize[595 833]/ImagingBBox null>>setpagedevice"
|
||||
"<</cupsInteger0 26/PageSize[595 833]/ImagingBBox null>>setpagedevice"
|
||||
CustomMedia "A4FB/A4 Borderless 210x297mm" 605 852 0 0 0 0 "<</PageSize[605 852]/ImagingBBox null>>setpagedevice"
|
||||
"<</cupsInteger0 26/PageSize[605 852]/ImagingBBox null>>setpagedevice"
|
||||
@@ -4114,7 +4114,7 @@ Manufacturer "HP"
|
||||
"<</cupsInteger0 74/PageSize[298 442]/ImagingBBox null>>setpagedevice"
|
||||
CustomMedia "A6/A6 105x148mm" 297.36 419.76 9 9 9 9 "<</PageSize[297.36 419.76]/ImagingBBox null>>setpagedevice"
|
||||
"<</cupsInteger0 73/PageSize[297.36 419.76]/ImagingBBox null>>setpagedevice"
|
||||
- CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm)" 297 411 9 27 9 36 "<</PageSize[297 411]/ImagingBBox null>>setpagedevice"
|
||||
+ CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm" 297 411 9 27 9 36 "<</PageSize[297 411]/ImagingBBox null>>setpagedevice"
|
||||
"<</cupsInteger0 73/PageSize[297 411]/ImagingBBox null>>setpagedevice"
|
||||
CustomMedia "A6FB/A6 Borderless 105x148mm" 307 430 0 0 0 0 "<</PageSize[307 430]/ImagingBBox null>>setpagedevice"
|
||||
"<</cupsInteger0 73/PageSize[307 430]/ImagingBBox null>>setpagedevice"
|
||||
@@ -4174,7 +4174,7 @@ Manufacturer "HP"
|
||||
"<</cupsInteger0 2/PageSize[622 802]/ImagingBBox null>>setpagedevice"
|
||||
CustomMedia "A4/A4 210x297mm" 595.44 841.68 9 9 9 9 "<</PageSize[595.44 841.68]/ImagingBBox null>>setpagedevice"
|
||||
"<</cupsInteger0 26/PageSize[595.44 841.68]/ImagingBBox null>>setpagedevice"
|
||||
- CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm)" 595 833 9 27 9 36 "<</PageSize[595 833]/ImagingBBox null>>setpagedevice"
|
||||
+ CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm" 595 833 9 27 9 36 "<</PageSize[595 833]/ImagingBBox null>>setpagedevice"
|
||||
"<</cupsInteger0 26/PageSize[595 833]/ImagingBBox null>>setpagedevice"
|
||||
CustomMedia "A4FB/A4 Borderless 210x297mm" 605 852 0 0 0 0 "<</PageSize[605 852]/ImagingBBox null>>setpagedevice"
|
||||
"<</cupsInteger0 26/PageSize[605 852]/ImagingBBox null>>setpagedevice"
|
||||
@@ -4341,7 +4341,7 @@ Manufacturer "HP"
|
||||
"<</cupsInteger0 74/PageSize[288 423]/ImagingBBox null>>setpagedevice"
|
||||
CustomMedia "A6/A6 105x148mm" 297.36 419.76 9 9 9 9 "<</PageSize[297.36 419.76]/ImagingBBox null>>setpagedevice"
|
||||
"<</cupsInteger0 73/PageSize[297.36 419.76]/ImagingBBox null>>setpagedevice"
|
||||
- CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm)" 297 411 9 27 9 36 "<</PageSize[297 411]/ImagingBBox null>>setpagedevice"
|
||||
+ CustomMedia "A6Duplex/A6 AutoDuplex 105x148mm" 297 411 9 27 9 36 "<</PageSize[297 411]/ImagingBBox null>>setpagedevice"
|
||||
"<</cupsInteger0 73/PageSize[297 411]/ImagingBBox null>>setpagedevice"
|
||||
CustomMedia "Hagaki/Hagaki 100x148mm" 284 411 9 9 9 9 "<</PageSize[284 411]/ImagingBBox null>>setpagedevice"
|
||||
"<</cupsInteger0 71/PageSize[284 411]/ImagingBBox null>>setpagedevice"
|
||||
@@ -4387,7 +4387,7 @@ Manufacturer "HP"
|
||||
"<</cupsInteger0 2/PageSize[612 783]/ImagingBBox null>>setpagedevice"
|
||||
CustomMedia "A4/A4 210x297mm" 595.44 841.68 9 9 9 9 "<</PageSize[595.44 841.68]/ImagingBBox null>>setpagedevice"
|
||||
"<</cupsInteger0 26/PageSize[595.44 841.68]/ImagingBBox null>>setpagedevice"
|
||||
- CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm)" 595 833 9 27 9 36 "<</PageSize[595 833]/ImagingBBox null>>setpagedevice"
|
||||
+ CustomMedia "A4Duplex/A4 AutoDuplex 210x297mm" 595 833 9 27 9 36 "<</PageSize[595 833]/ImagingBBox null>>setpagedevice"
|
||||
"<</cupsInteger0 26/PageSize[595 833]/ImagingBBox null>>setpagedevice"
|
||||
CustomMedia "Legal/Legal 8.5x14in" 612 1008 9 9 9 9 "<</PageSize[612 1008]/ImagingBBox null>>setpagedevice"
|
||||
"<</cupsInteger0 3/PageSize[612 1008]/ImagingBBox null>>setpagedevice"
|
||||
@ -1,23 +0,0 @@
|
||||
diff -up hplip-3.9.8/prnt/backend/hp.c~ hplip-3.9.8/prnt/backend/hp.c
|
||||
--- hplip-3.9.8/prnt/backend/hp.c~ 2009-10-28 17:03:27.435140391 +0000
|
||||
+++ hplip-3.9.8/prnt/backend/hp.c 2009-10-28 17:12:15.709140073 +0000
|
||||
@@ -575,7 +575,7 @@ static int loop_test(HPMUD_DEVICE dd, HP
|
||||
if (first_time)
|
||||
{
|
||||
first_time = 0;
|
||||
- old_state = ("media-empty-error,media-jam-error,"
|
||||
+ old_state = ("media-empty-error,media-jam-error,hplip.plugin-error,"
|
||||
"cover-open-error,toner-empty-error,other");
|
||||
}
|
||||
|
||||
diff -up hplip-3.9.8/prnt/hpijs/hpcups.cpp~ hplip-3.9.8/prnt/hpijs/hpcups.cpp
|
||||
--- hplip-3.9.8/prnt/hpijs/hpcups.cpp~ 2009-10-28 17:03:27.390139541 +0000
|
||||
+++ hplip-3.9.8/prnt/hpijs/hpcups.cpp 2009-10-28 17:11:18.980140742 +0000
|
||||
@@ -384,6 +384,7 @@ int HPCups::initContext (char **argv)
|
||||
SendDbusMessage (device_uri, printer,
|
||||
EVENT_PRINT_FAILED_MISSING_PLUGIN,
|
||||
argv[2], atoi (argv[1]), argv[3]);
|
||||
+ fputs ("STATE: +hplip.plugin-error\n", stderr);
|
||||
BUG ("ERROR: unable to set device = %s, err = %d\n", attr->value, err);
|
||||
return 1;
|
||||
}
|
||||
@ -1,12 +0,0 @@
|
||||
diff -up hplip-3.9.8/prnt/drv/hpcups.drv.in.requirespageregion hplip-3.9.8/prnt/drv/hpcups.drv.in
|
||||
--- hplip-3.9.8/prnt/drv/hpcups.drv.in.requirespageregion 2009-08-28 08:59:11.086208461 +0100
|
||||
+++ hplip-3.9.8/prnt/drv/hpcups.drv.in 2009-08-28 09:35:30.095904252 +0100
|
||||
@@ -111,6 +111,8 @@ Throughput 1
|
||||
Filter "application/vnd.cups-raster 0 hpcups"
|
||||
//Filter "application/vnd.cups-command 0 commandtohpijs"
|
||||
|
||||
+Attribute "RequiresPageRegion" "All" "True"
|
||||
+
|
||||
{
|
||||
// Manufacturer - PPD spec has "HP" registered for "Hewlett-Packard"...
|
||||
Manufacturer "HP"
|
||||
@ -1,36 +0,0 @@
|
||||
diff -up hplip-3.9.8/prnt/backend/hp.c.state-reasons-newline hplip-3.9.8/prnt/backend/hp.c
|
||||
diff -up hplip-3.9.8/prnt/hpijs/hpcups.cpp.state-reasons-newline hplip-3.9.8/prnt/hpijs/hpcups.cpp
|
||||
--- hplip-3.9.8/prnt/hpijs/hpcups.cpp.state-reasons-newline 2009-08-24 10:40:32.407070376 +0100
|
||||
+++ hplip-3.9.8/prnt/hpijs/hpcups.cpp 2009-08-24 11:04:14.374016107 +0100
|
||||
@@ -315,7 +315,7 @@ int HPCups::initContext (char **argv)
|
||||
m_pSys->pPC->constructor_error != PLUGIN_LIBRARY_MISSING &&
|
||||
m_pSys->DisplayStatus != DISPLAY_PRINTING_CANCELED)
|
||||
{
|
||||
- BUG("PrintContext creation failed, error = %d", m_pSys->pPC->constructor_error);
|
||||
+ BUG("PrintContext creation failed, error = %d\n", m_pSys->pPC->constructor_error);
|
||||
return 1;
|
||||
}
|
||||
|
||||
@@ -347,11 +347,11 @@ int HPCups::initContext (char **argv)
|
||||
case WARN_LOW_INK_YELLOW:
|
||||
case WARN_LOW_INK_MULTIPLE_PENS:
|
||||
{
|
||||
- BUG ("STATE: +marker-supply-low-warning\n");
|
||||
+ fputs ("STATE: +marker-supply-low-warning\n", stderr);
|
||||
break;
|
||||
}
|
||||
default:
|
||||
- BUG ("STATE: -marker-supply-low-warning\n");
|
||||
+ fputs ("STATE: -marker-supply-low-warning\n", stderr);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -678,7 +678,7 @@ void CancelPrintJob (int sig)
|
||||
int main (int argc, char **argv)
|
||||
{
|
||||
int iRet = hpCups.ProcessJob (argc, argv);
|
||||
- BUG("hpcups: returning status %d from main", iRet);
|
||||
+ BUG("hpcups: returning status %d from main\n", iRet);
|
||||
return iRet;
|
||||
}
|
||||
|
||||
42
hplip.spec
42
hplip.spec
@ -1,7 +1,7 @@
|
||||
Summary: HP Linux Imaging and Printing Project
|
||||
Name: hplip
|
||||
Version: 3.9.8
|
||||
Release: 21%{?dist}
|
||||
Version: 3.9.10
|
||||
Release: 1%{?dist}
|
||||
License: GPLv2+ and MIT
|
||||
Group: System Environment/Daemons
|
||||
Conflicts: system-config-printer < 0.6.132
|
||||
@ -13,18 +13,11 @@ Conflicts: selinux-policy < 3.0.3-3
|
||||
|
||||
Url: http://hplip.sourceforge.net/
|
||||
Source0: http://kent.dl.sourceforge.net/sourceforge/hplip/%{name}-%{version}.tar.gz
|
||||
Patch1: hplip-hpcups-reorder.patch
|
||||
Patch2: hplip-strstr-const.patch
|
||||
Patch3: hplip-ui-optional.patch
|
||||
Patch4: hplip-no-asm.patch
|
||||
Patch5: hplip-clear-previous-state-reasons.patch
|
||||
Patch6: hplip-state-reasons-newline.patch
|
||||
Patch7: hplip-parenths.patch
|
||||
Patch8: hplip-non-scripts.patch
|
||||
Patch9: hplip-requirespageregion.patch
|
||||
Patch10: hplip-discovery-method.patch
|
||||
Patch11: hplip-device-reconnected.patch
|
||||
Patch13: hplip-plugin-error.patch
|
||||
Patch14: hplip-hpcups-sigpipe.patch
|
||||
Patch15: hplip-hpcups-plugin.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
@ -49,7 +42,6 @@ BuildRequires: libusb-devel
|
||||
BuildRequires: openssl-devel
|
||||
BuildRequires: sane-backends-devel
|
||||
BuildRequires: dbus-devel
|
||||
BuildRequires: automake, autoconf, libtool
|
||||
|
||||
%description
|
||||
The Hewlett-Packard Linux Imaging and Printing Project provides
|
||||
@ -116,9 +108,6 @@ SANE driver for scanners in HP's multi-function devices (from HPOJ).
|
||||
rm -rf $RPM_BUILD_DIR/%{name}-%{version}
|
||||
%setup -q
|
||||
|
||||
# Upstream patch to fix paper size order and LJColor device class color space.
|
||||
%patch1 -p1 -b .hpcups-reorder
|
||||
|
||||
# Fix compilation.
|
||||
%patch2 -p1 -b .strstr-const
|
||||
|
||||
@ -128,31 +117,12 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
|
||||
# Make sure to avoid handwritten asm.
|
||||
%patch4 -p1 -b .no-asm
|
||||
|
||||
# Clear previous state reasons in the hp backend (bug #501338).
|
||||
%patch5 -p1 -b .clear-previous-state-reasons
|
||||
|
||||
# Don't hide state reason changes by missing out newlines in stderr.
|
||||
%patch6 -p1 -b .state-reasons-newline
|
||||
|
||||
# Fixed typos in page sizes (bug #515469).
|
||||
%patch7 -p1 -b .parenths
|
||||
|
||||
# Don't install base/*.py with executable bit set.
|
||||
%patch8 -p1 -b .non-scripts
|
||||
|
||||
# Set RequiresPageRegion in hpcups PPDs (bug #518756).
|
||||
%patch9 -p1 -b .requirespageregion
|
||||
|
||||
# Fixed hp-setup traceback when discovery page is skipped (bug #523685).
|
||||
%patch10 -p1 -b .discovery-method
|
||||
|
||||
# Give up trying to print a job to a reconnected device (bug #515481).
|
||||
%patch11 -p1 -b .device-reconnected
|
||||
|
||||
# Set a printer-state-reason when there's a missing required plugin
|
||||
# (bug #531330).
|
||||
%patch13 -p1 -b .plugin-error
|
||||
|
||||
# Avoid busy loop in hpcups when backend has exited (bug #525944).
|
||||
%patch14 -p1 -b .hpcups-sigpipe
|
||||
|
||||
@ -161,9 +131,6 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
|
||||
%patch15 -p1 -b .hpcups-plugin
|
||||
|
||||
%build
|
||||
aclocal
|
||||
automake --foreign --add-missing --copy
|
||||
autoconf
|
||||
%configure \
|
||||
--enable-scan-build --enable-gui-build --enable-fax-build \
|
||||
--disable-foomatic-rip-hplip-install --enable-pp-build \
|
||||
@ -363,6 +330,11 @@ fi
|
||||
/usr/bin/update-desktop-database &>/dev/null ||:
|
||||
|
||||
%changelog
|
||||
* Wed Nov 4 2009 Tim Waugh <twaugh@redhat.com> 3.9.10-1
|
||||
- 3.9.10. No longer need clear-previous-state-reasons,
|
||||
hpcups-reorder, non-scripts, parenths, plugin-error,
|
||||
requirespageregion or state-reasons-newline patches.
|
||||
|
||||
* Mon Nov 2 2009 Tim Waugh <twaugh@redhat.com> 3.9.8-21
|
||||
- Added 'requires proprietary plugin' to appropriate model names
|
||||
(bug #513283).
|
||||
|
||||
Loading…
Reference in New Issue
Block a user