diff --git a/.gitignore b/.gitignore index 609fc5f..4ed299d 100644 --- a/.gitignore +++ b/.gitignore @@ -40,3 +40,4 @@ hplip-3.10.6.tar.gz /hplip-3.11.1.tar.gz /hplip-3.11.3.tar.gz /hplip-3.11.3a.tar.gz +/hplip-3.11.5.tar.gz diff --git a/hplip-dbglog-newline.patch b/hplip-dbglog-newline.patch index c6a969d..6cc1566 100644 --- a/hplip-dbglog-newline.patch +++ b/hplip-dbglog-newline.patch @@ -1,7 +1,7 @@ -diff -up hplip-3.11.1/prnt/hpcups/HPCupsFilter.cpp.dbglog-newline hplip-3.11.1/prnt/hpcups/HPCupsFilter.cpp ---- hplip-3.11.1/prnt/hpcups/HPCupsFilter.cpp.dbglog-newline 2011-01-24 12:01:19.000000000 +0100 -+++ hplip-3.11.1/prnt/hpcups/HPCupsFilter.cpp 2011-01-24 12:08:38.000000000 +0100 -@@ -352,7 +352,7 @@ DRIVER_ERROR HPCupsFilter::startPage (cu +diff -up hplip-3.11.5/prnt/hpcups/HPCupsFilter.cpp.dbglog-newline hplip-3.11.5/prnt/hpcups/HPCupsFilter.cpp +--- hplip-3.11.5/prnt/hpcups/HPCupsFilter.cpp.dbglog-newline 2011-05-12 13:21:09.000000000 +0200 ++++ hplip-3.11.5/prnt/hpcups/HPCupsFilter.cpp 2011-05-12 13:21:10.000000000 +0200 +@@ -350,7 +350,7 @@ DRIVER_ERROR HPCupsFilter::startPage (cu (attr->value != NULL)) { strncpy(m_JA.printer_platform, attr->value, sizeof(m_JA.printer_platform)-1); if (m_iLogLevel & BASIC_LOG) { @@ -10,7 +10,7 @@ diff -up hplip-3.11.1/prnt/hpcups/HPCupsFilter.cpp.dbglog-newline hplip-3.11.1/p } if(strcmp(m_JA.printer_platform, "ljzjscolor") == 0) { -@@ -372,7 +372,7 @@ DRIVER_ERROR HPCupsFilter::startPage (cu +@@ -370,7 +370,7 @@ DRIVER_ERROR HPCupsFilter::startPage (cu } strncpy(m_JA.printer_language, attr->value, sizeof(m_JA.printer_language)-1); if (m_iLogLevel & BASIC_LOG) { @@ -19,7 +19,7 @@ diff -up hplip-3.11.1/prnt/hpcups/HPCupsFilter.cpp.dbglog-newline hplip-3.11.1/p } // Fill in the other PCL header info -@@ -417,14 +417,14 @@ DRIVER_ERROR HPCupsFilter::startPage (cu +@@ -415,14 +415,14 @@ DRIVER_ERROR HPCupsFilter::startPage (cu { if (err == PLUGIN_LIBRARY_MISSING) fputs ("STATE: +hplip.plugin-error\n", stderr); @@ -36,7 +36,7 @@ diff -up hplip-3.11.1/prnt/hpcups/HPCupsFilter.cpp.dbglog-newline hplip-3.11.1/p } m_pPrinterBuffer = new BYTE[cups_header->cupsWidth * 4 + 32]; -@@ -510,7 +510,7 @@ int HPCupsFilter::StartPrintJob(int arg +@@ -509,7 +509,7 @@ int HPCupsFilter::StartPrintJob(int arg close(fd); } if (m_iLogLevel & BASIC_LOG) @@ -45,7 +45,7 @@ diff -up hplip-3.11.1/prnt/hpcups/HPCupsFilter.cpp.dbglog-newline hplip-3.11.1/p closeFilter(); cupsRasterClose(cups_raster); return 1; -@@ -520,7 +520,7 @@ int HPCupsFilter::StartPrintJob(int arg +@@ -519,7 +519,7 @@ int HPCupsFilter::StartPrintJob(int arg close(fd); } if (m_iLogLevel & BASIC_LOG) @@ -54,9 +54,9 @@ diff -up hplip-3.11.1/prnt/hpcups/HPCupsFilter.cpp.dbglog-newline hplip-3.11.1/p closeFilter(); cupsRasterClose(cups_raster); return 0; -diff -up hplip-3.11.1/prnt/hpcups/Lidil.cpp.dbglog-newline hplip-3.11.1/prnt/hpcups/Lidil.cpp ---- hplip-3.11.1/prnt/hpcups/Lidil.cpp.dbglog-newline 2011-01-19 06:15:27.000000000 +0100 -+++ hplip-3.11.1/prnt/hpcups/Lidil.cpp 2011-01-24 12:01:20.000000000 +0100 +diff -up hplip-3.11.5/prnt/hpcups/Lidil.cpp.dbglog-newline hplip-3.11.5/prnt/hpcups/Lidil.cpp +--- hplip-3.11.5/prnt/hpcups/Lidil.cpp.dbglog-newline 2011-05-09 02:59:11.000000000 +0200 ++++ hplip-3.11.5/prnt/hpcups/Lidil.cpp 2011-05-12 13:23:52.000000000 +0200 @@ -103,7 +103,7 @@ DRIVER_ERROR Lidil::Configure(Pipeline * if (m_pPM->BaseResX != m_pQA->horizontal_resolution || m_pPM->BaseResY != m_pQA->vertical_resolution) @@ -66,7 +66,7 @@ diff -up hplip-3.11.1/prnt/hpcups/Lidil.cpp.dbglog-newline hplip-3.11.1/prnt/hpc return UNSUPPORTED_PRINTMODE; } -@@ -167,13 +167,13 @@ DRIVER_ERROR Lidil::StartJob(SystemServi +@@ -166,7 +166,7 @@ DRIVER_ERROR Lidil::StartJob(SystemServi if (!selectPrintMode()) { @@ -74,15 +74,17 @@ diff -up hplip-3.11.1/prnt/hpcups/Lidil.cpp.dbglog-newline hplip-3.11.1/prnt/hpc + dbglog("selectPrintMode failed, PrintMode name = %s\n", m_pQA->print_mode_name); return UNSUPPORTED_PRINTMODE; } + +@@ -174,7 +174,7 @@ DRIVER_ERROR Lidil::StartJob(SystemServi if (m_pPM->BaseResX != m_pQA->horizontal_resolution || m_pPM->BaseResY != m_pQA->vertical_resolution) { -- dbglog("Requested resolution not supported with requested printmode"); +- dbglog("Requested resolution not supported with requested printmode"); + dbglog("Requested resolution not supported with requested printmode\n"); - return UNSUPPORTED_PRINTMODE; - } - -@@ -188,7 +188,7 @@ DRIVER_ERROR Lidil::StartJob(SystemServi + dbglog(" m_pPM->BaseResX = %d\n",m_pPM->BaseResX); + dbglog(" m_pPM->BaseResY = %d\n",m_pPM->BaseResY); + dbglog(" m_pQA->horizontal_resolution = %d\n",m_pQA->horizontal_resolution); +@@ -193,7 +193,7 @@ DRIVER_ERROR Lidil::StartJob(SystemServi err = allocateSwathBuffers(); if (err != NO_ERROR) { @@ -91,7 +93,7 @@ diff -up hplip-3.11.1/prnt/hpcups/Lidil.cpp.dbglog-newline hplip-3.11.1/prnt/hpc return err; } -@@ -577,7 +577,7 @@ bool Lidil::selectPrintMode() +@@ -625,7 +625,7 @@ bool Lidil::selectPrintMode() { if (m_pJA->printer_platform[0] == 0) { @@ -100,7 +102,7 @@ diff -up hplip-3.11.1/prnt/hpcups/Lidil.cpp.dbglog-newline hplip-3.11.1/prnt/hpc return false; } for (unsigned int i = 0; i < sizeof(lidil_print_modes_table) / sizeof(lidil_print_modes_table[0]); i++) -@@ -587,7 +587,7 @@ bool Lidil::selectPrintMode() +@@ -635,7 +635,7 @@ bool Lidil::selectPrintMode() return selectPrintMode(i); } } @@ -109,9 +111,9 @@ diff -up hplip-3.11.1/prnt/hpcups/Lidil.cpp.dbglog-newline hplip-3.11.1/prnt/hpc return false; } -diff -up hplip-3.11.1/prnt/hpcups/Pcl3.cpp.dbglog-newline hplip-3.11.1/prnt/hpcups/Pcl3.cpp ---- hplip-3.11.1/prnt/hpcups/Pcl3.cpp.dbglog-newline 2011-01-19 06:15:27.000000000 +0100 -+++ hplip-3.11.1/prnt/hpcups/Pcl3.cpp 2011-01-24 12:01:20.000000000 +0100 +diff -up hplip-3.11.5/prnt/hpcups/Pcl3.cpp.dbglog-newline hplip-3.11.5/prnt/hpcups/Pcl3.cpp +--- hplip-3.11.5/prnt/hpcups/Pcl3.cpp.dbglog-newline 2011-05-09 02:59:11.000000000 +0200 ++++ hplip-3.11.5/prnt/hpcups/Pcl3.cpp 2011-05-12 13:21:10.000000000 +0200 @@ -66,13 +66,13 @@ DRIVER_ERROR Pcl3::Configure(Pipeline ** if (!selectPrintMode()) @@ -155,9 +157,9 @@ diff -up hplip-3.11.1/prnt/hpcups/Pcl3.cpp.dbglog-newline hplip-3.11.1/prnt/hpcu return false; } -diff -up hplip-3.11.1/prnt/hpcups/Pcl3Gui.cpp.dbglog-newline hplip-3.11.1/prnt/hpcups/Pcl3Gui.cpp ---- hplip-3.11.1/prnt/hpcups/Pcl3Gui.cpp.dbglog-newline 2011-01-19 06:15:27.000000000 +0100 -+++ hplip-3.11.1/prnt/hpcups/Pcl3Gui.cpp 2011-01-24 12:01:20.000000000 +0100 +diff -up hplip-3.11.5/prnt/hpcups/Pcl3Gui.cpp.dbglog-newline hplip-3.11.5/prnt/hpcups/Pcl3Gui.cpp +--- hplip-3.11.5/prnt/hpcups/Pcl3Gui.cpp.dbglog-newline 2011-05-09 02:59:11.000000000 +0200 ++++ hplip-3.11.5/prnt/hpcups/Pcl3Gui.cpp 2011-05-12 13:21:10.000000000 +0200 @@ -66,13 +66,13 @@ DRIVER_ERROR Pcl3Gui::Configure(Pipeline if (!selectPrintMode()) diff --git a/hplip-deviceIDs-ppd.patch b/hplip-deviceIDs-ppd.patch index 3ae473d..0e7aa25 100644 --- a/hplip-deviceIDs-ppd.patch +++ b/hplip-deviceIDs-ppd.patch @@ -173,28 +173,6 @@ diff -up hplip-3.10.2/prnt/ps/hp-laserjet_2300_series-ps.ppd.deviceIDs-ppd hplip +*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp LaserJet 2300 series;DES:Hewlett-Packard LaserJet 2300 series" *PSVersion: "(3010.107) 0" - *%================================================= -diff -up hplip-3.10.2/prnt/ps/hp-laserjet_p2015dn_series-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-laserjet_p2015dn_series-ps.ppd ---- hplip-3.10.2/prnt/ps/hp-laserjet_p2015dn_series-ps.ppd.deviceIDs-ppd 2010-02-24 23:09:55.000000000 +0000 -+++ hplip-3.10.2/prnt/ps/hp-laserjet_p2015dn_series-ps.ppd 2010-04-16 22:21:49.356149235 +0100 -@@ -64,6 +64,7 @@ - *Product: "(HP LaserJet P2015 Series)" - *Product: "(Hewlett-Packard HP LaserJet P2015 Series)" - *Manufacturer: "HP" -+*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet P2015 Series;DES:Hewlett-Packard LaserJet P2015 series;" - *PSVersion: "(3010.107) 0" - - *%================================================= -diff -up hplip-3.10.2/prnt/ps/hp-laserjet_p2015n_series-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-laserjet_p2015n_series-ps.ppd ---- hplip-3.10.2/prnt/ps/hp-laserjet_p2015n_series-ps.ppd.deviceIDs-ppd 2010-02-24 23:09:55.000000000 +0000 -+++ hplip-3.10.2/prnt/ps/hp-laserjet_p2015n_series-ps.ppd 2010-04-16 22:21:49.367148274 +0100 -@@ -64,6 +64,7 @@ - *Product: "(HP LaserJet P2015 Series)" - *Product: "(Hewlett-Packard HP LaserJet P2015 Series)" - *Manufacturer: "HP" -+*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet P2015 Series;DES:Hewlett-Packard LaserJet P2015 series;" - *PSVersion: "(3010.107) 0" - *%================================================= diff -up hplip-3.10.2/prnt/ps/hp-laserjet_p2015_series-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-laserjet_p2015_series-ps.ppd --- hplip-3.10.2/prnt/ps/hp-laserjet_p2015_series-ps.ppd.deviceIDs-ppd 2010-02-24 23:09:55.000000000 +0000 @@ -206,17 +184,6 @@ diff -up hplip-3.10.2/prnt/ps/hp-laserjet_p2015_series-ps.ppd.deviceIDs-ppd hpli +*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet P2015 Series;DES:Hewlett-Packard LaserJet P2015 series;" *PSVersion: "(3010.107) 0" - *%================================================= -diff -up hplip-3.10.2/prnt/ps/hp-laserjet_p2015x_series-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-laserjet_p2015x_series-ps.ppd ---- hplip-3.10.2/prnt/ps/hp-laserjet_p2015x_series-ps.ppd.deviceIDs-ppd 2010-02-24 23:09:55.000000000 +0000 -+++ hplip-3.10.2/prnt/ps/hp-laserjet_p2015x_series-ps.ppd 2010-04-16 22:21:49.386147840 +0100 -@@ -64,6 +64,7 @@ - *Product: "(HP LaserJet P2015 Series)" - *Product: "(Hewlett-Packard HP LaserJet P2015 Series)" - *Manufacturer: "HP" -+*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet P2015 Series;DES:Hewlett-Packard LaserJet P2015 series;" - *PSVersion: "(3010.107) 0" - *%================================================= diff -up hplip-3.11.1/prnt/ps/hp-laserjet_3390-ps.ppd.deviceIDs-ppd hplip-3.11.1/prnt/ps/hp-laserjet_3390-ps.ppd --- hplip-3.11.1/prnt/ps/hp-laserjet_3390-ps.ppd.deviceIDs-ppd 2011-03-01 18:27:07.000000000 +0100 diff --git a/hplip-network-timeout.patch b/hplip-network-timeout.patch deleted file mode 100644 index 22dce05..0000000 --- a/hplip-network-timeout.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -up hplip-3.10.6/installer/core_install.py.network-timeout hplip-3.10.6/installer/core_install.py ---- hplip-3.10.6/installer/core_install.py.network-timeout 2010-07-19 04:17:37.000000000 +0200 -+++ hplip-3.10.6/installer/core_install.py 2010-09-20 11:35:54.000000000 +0200 -@@ -1546,7 +1546,7 @@ class CoreInstall(object): - wget = utils.which("wget") - if wget: - wget = os.path.join(wget, "wget") -- cmd = "%s --timeout=10 --output-document=- %s" % (wget, HTTP_GET_TARGET) -+ cmd = "%s --timeout=30 --output-document=- %s" % (wget, HTTP_GET_TARGET) - log.debug(cmd) - status, output = self.run(cmd) - log.debug("wget returned: %d" % status) -@@ -1556,7 +1556,7 @@ class CoreInstall(object): - curl = utils.which("curl") - if curl: - curl = os.path.join(curl, "curl") -- cmd = "%s --output - --connect-timeout 5 --max-time 10 %s" % (curl, HTTP_GET_TARGET) -+ cmd = "%s --output - --connect-timeout 15 --max-time 30 %s" % (curl, HTTP_GET_TARGET) - log.debug(cmd) - status, output = self.run(cmd) - log.debug("curl returned: %d" % status) -@@ -1567,7 +1567,7 @@ class CoreInstall(object): - - if ping: - ping = os.path.join(ping, "ping") -- cmd = "%s -c1 -W1 -w10 %s" % (ping, PING_TARGET) -+ cmd = "%s -c1 -W3 -w30 %s" % (ping, PING_TARGET) - log.debug(cmd) - status, output = self.run(cmd) - log.debug("ping returned: %d" % status) diff --git a/hplip-newline.patch b/hplip-newline.patch index a94f67f..a690693 100644 --- a/hplip-newline.patch +++ b/hplip-newline.patch @@ -1,8 +1,8 @@ -diff -up hplip-3.10.9/prnt/hpcups/HPCupsFilter.cpp.newline hplip-3.10.9/prnt/hpcups/HPCupsFilter.cpp ---- hplip-3.10.9/prnt/hpcups/HPCupsFilter.cpp.newline 2010-12-14 15:10:25.730407116 +0000 -+++ hplip-3.10.9/prnt/hpcups/HPCupsFilter.cpp 2010-12-14 15:11:27.343440547 +0000 -@@ -608,7 +608,7 @@ int HPCupsFilter::processRasterData(cups - WriteBMPHeader (kfp, cups_header.cupsWidth, cups_header.cupsHeight, BLACK_RASTER); +diff -up hplip-3.11.5/prnt/hpcups/HPCupsFilter.cpp.newline hplip-3.11.5/prnt/hpcups/HPCupsFilter.cpp +--- hplip-3.11.5/prnt/hpcups/HPCupsFilter.cpp.newline 2011-05-12 16:10:02.000000000 +0200 ++++ hplip-3.11.5/prnt/hpcups/HPCupsFilter.cpp 2011-05-12 16:13:06.000000000 +0200 +@@ -618,7 +618,7 @@ int HPCupsFilter::processRasterData(cups + dbglog("10......\n"); } - fprintf(stderr, "PAGE: %d %s", current_page_number, m_argv[4]); diff --git a/hplip.spec b/hplip.spec index 3a04da7..3671372 100644 --- a/hplip.spec +++ b/hplip.spec @@ -1,6 +1,6 @@ Summary: HP Linux Imaging and Printing Project Name: hplip -Version: 3.11.3a +Version: 3.11.5 Release: 1%{?dist} License: GPLv2+ and MIT Group: System Environment/Daemons @@ -32,7 +32,6 @@ Patch18: hplip-skip-blank-lines.patch Patch19: hplip-dbglog-newline.patch Patch20: hplip-no-system-tray.patch Patch22: hplip-ppd-ImageableArea.patch -Patch23: hplip-network-timeout.patch Patch25: hplip-raw_deviceID-traceback.patch Patch26: hplip-UnicodeDecodeError.patch Patch27: hplip-emit-SIGNAL.patch @@ -250,9 +249,6 @@ do gzip -n ${ppd_file#*/} done -# Increase timeouts for curl, wget, ping for high latency networks (bug #635388). -%patch23 -p1 -b .network-timeout - # Fixed traceback on error condition in device.py (bug #628125). %patch25 -p1 -b .raw_deviceID-traceback @@ -519,6 +515,9 @@ fi %postun libs -p /sbin/ldconfig %changelog +* Thu May 12 2011 Jiri Popelka 3.11.5-1 +- 3.11.5 + * Thu Mar 31 2011 Tim Waugh 3.11.3a-1 - 3.11.3a. diff --git a/sources b/sources index 2a04c73..a3d3e01 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -967e095bec457b4acc858774d673f884 hplip-3.11.3a.tar.gz +96f17f58a81cb76828112cb70d01615a hplip-3.11.5.tar.gz