diff --git a/hplip-dbglog-newline.patch b/hplip-dbglog-newline.patch new file mode 100644 index 0000000..6f68837 --- /dev/null +++ b/hplip-dbglog-newline.patch @@ -0,0 +1,203 @@ +diff -up hplip-3.10.2/prnt/hpcups/HPCupsFilter.cpp.dbglog-newline hplip-3.10.2/prnt/hpcups/HPCupsFilter.cpp +--- hplip-3.10.2/prnt/hpcups/HPCupsFilter.cpp.dbglog-newline 2010-04-27 12:20:42.000000000 +0200 ++++ hplip-3.10.2/prnt/hpcups/HPCupsFilter.cpp 2010-04-27 12:38:09.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) { +- dbglog("HPCUPS: found Printer Platform, it is - %s", attr->value); ++ dbglog("HPCUPS: found Printer Platform, it is - %s\n", attr->value); + } + } + +@@ -365,7 +365,7 @@ DRIVER_ERROR HPCupsFilter::startPage (cu + } + strncpy(m_JA.printer_language, attr->value, sizeof(m_JA.printer_language)-1); + if (m_iLogLevel & BASIC_LOG) { +- dbglog("HPCUPS: found Printer Language, it is - %s", attr->value); ++ dbglog("HPCUPS: found Printer Language, it is - %s\n", attr->value); + } + + // Fill in the other PCL header info +@@ -410,14 +410,14 @@ DRIVER_ERROR HPCupsFilter::startPage (cu + { + if (err == PLUGIN_LIBRARY_MISSING) + fputs ("STATE: +hplip.plugin-error\n", stderr); +- dbglog ("m_Job initialization failed with error = %d", err); ++ dbglog ("m_Job initialization failed with error = %d\n", err); + ppdClose(m_ppd); + m_ppd = NULL; + return err; + } + + if (m_iLogLevel & BASIC_LOG) { +- dbglog("HPCUPS: returning NO_ERROR from startPage"); ++ dbglog("HPCUPS: returning NO_ERROR from startPage\n"); + } + + m_pPrinterBuffer = new BYTE[cups_header->cupsWidth * 4 + 32]; +@@ -495,7 +495,7 @@ int HPCupsFilter::StartPrintJob(int arg + close(fd); + } + if (m_iLogLevel & BASIC_LOG) +- dbglog("HPCUPS: processRasterData returned %d, calling closeFilter()", err); ++ dbglog("HPCUPS: processRasterData returned %d, calling closeFilter()\n", err); + closeFilter(); + cupsRasterClose(cups_raster); + return 1; +@@ -505,7 +505,7 @@ int HPCupsFilter::StartPrintJob(int arg + close(fd); + } + if (m_iLogLevel & BASIC_LOG) +- dbglog("HPCUPS: StartPrintJob end of job, calling closeFilter()"); ++ dbglog("HPCUPS: StartPrintJob end of job, calling closeFilter()\n"); + closeFilter(); + cupsRasterClose(cups_raster); + return 0; +diff -up hplip-3.10.2/prnt/hpcups/Lidil.cpp.dbglog-newline hplip-3.10.2/prnt/hpcups/Lidil.cpp +--- hplip-3.10.2/prnt/hpcups/Lidil.cpp.dbglog-newline 2010-02-25 00:04:09.000000000 +0100 ++++ hplip-3.10.2/prnt/hpcups/Lidil.cpp 2010-04-27 12:38:08.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) + { +- dbglog("Requested resolution not supported with requested printmode"); ++ dbglog("Requested resolution not supported with requested printmode\n"); + return UNSUPPORTED_PRINTMODE; + } + +@@ -167,13 +167,13 @@ DRIVER_ERROR Lidil::StartJob(SystemServi + + if (!selectPrintMode()) + { +- dbglog("selectPrintMode failed, PrintMode name = %s", m_pQA->print_mode_name); ++ dbglog("selectPrintMode failed, PrintMode name = %s\n", m_pQA->print_mode_name); + return UNSUPPORTED_PRINTMODE; + } + 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\n"); + return UNSUPPORTED_PRINTMODE; + } + +@@ -188,7 +188,7 @@ DRIVER_ERROR Lidil::StartJob(SystemServi + err = allocateSwathBuffers(); + if (err != NO_ERROR) + { +- dbglog("allocateSwathBuffers failed, err = %d", err); ++ dbglog("allocateSwathBuffers failed, err = %d\n", err); + return err; + } + +@@ -577,7 +577,7 @@ bool Lidil::selectPrintMode() + { + if (m_pJA->printer_platform[0] == 0) + { +- dbglog("printer_platform is undefined"); ++ dbglog("printer_platform is undefined\n"); + 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() + return selectPrintMode(i); + } + } +- dbglog("Unsupported printer_platform: %s", m_pJA->printer_platform); ++ dbglog("Unsupported printer_platform: %s\n", m_pJA->printer_platform); + return false; + } + +diff -up hplip-3.10.2/prnt/hpcups/Pcl3.cpp.dbglog-newline hplip-3.10.2/prnt/hpcups/Pcl3.cpp +--- hplip-3.10.2/prnt/hpcups/Pcl3.cpp.dbglog-newline 2010-02-25 00:04:09.000000000 +0100 ++++ hplip-3.10.2/prnt/hpcups/Pcl3.cpp 2010-04-27 12:38:07.000000000 +0200 +@@ -66,13 +66,13 @@ DRIVER_ERROR Pcl3::Configure(Pipeline ** + + if (!selectPrintMode()) + { +- dbglog("selectPrintMode failed, PrintMode name = %s", m_pQA->print_mode_name); ++ dbglog("selectPrintMode failed, PrintMode name = %s\n", m_pQA->print_mode_name); + return UNSUPPORTED_PRINTMODE; + } + 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\n"); + return UNSUPPORTED_PRINTMODE; + } + +@@ -220,7 +220,7 @@ void Pcl3::configureRasterData() + { + if (m_pPM == NULL) + { +- dbglog("configureRasterData: m_pPM is NULL"); ++ dbglog("configureRasterData: m_pPM is NULL\n"); + return; + } + BYTE *p = cur_pcl_buffer_ptr; +@@ -255,7 +255,7 @@ bool Pcl3::selectPrintMode() + { + if (m_pJA->printer_platform[0] == 0) + { +- dbglog("printer_platform is undefined"); ++ dbglog("printer_platform is undefined\n"); + return false; + } + for (unsigned int i = 0; i < sizeof(pcl3_print_modes_table) / sizeof(pcl3_print_modes_table[0]); i++) +@@ -265,7 +265,7 @@ bool Pcl3::selectPrintMode() + return selectPrintMode(i); + } + } +- dbglog("Unsupported printer_platform: %s", m_pJA->printer_platform); ++ dbglog("Unsupported printer_platform: %s\n", m_pJA->printer_platform); + return false; + } + +diff -up hplip-3.10.2/prnt/hpcups/Pcl3Gui.cpp.dbglog-newline hplip-3.10.2/prnt/hpcups/Pcl3Gui.cpp +--- hplip-3.10.2/prnt/hpcups/Pcl3Gui.cpp.dbglog-newline 2010-02-25 00:04:09.000000000 +0100 ++++ hplip-3.10.2/prnt/hpcups/Pcl3Gui.cpp 2010-04-27 12:38:06.000000000 +0200 +@@ -66,13 +66,13 @@ DRIVER_ERROR Pcl3Gui::Configure(Pipeline + + if (!selectPrintMode()) + { +- dbglog("selectPrintMode failed, PrintMode name = %s", m_pQA->print_mode_name); ++ dbglog("selectPrintMode failed, PrintMode name = %s\n", m_pQA->print_mode_name); + return UNSUPPORTED_PRINTMODE; + } + 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\n"); + return UNSUPPORTED_PRINTMODE; + } + +@@ -224,7 +224,7 @@ void Pcl3Gui::configureRasterData() + { + if (m_pPM == NULL) + { +- dbglog("configureRasterData: m_pPM is NULL"); ++ dbglog("configureRasterData: m_pPM is NULL\n"); + return; + } + BYTE *p = cur_pcl_buffer_ptr; +@@ -259,7 +259,7 @@ bool Pcl3Gui::selectPrintMode() + { + if (m_pJA->printer_platform[0] == 0) + { +- dbglog("printer_platform is undefined"); ++ dbglog("printer_platform is undefined\n"); + return false; + } + for (unsigned int i = 0; i < sizeof(pcl3_gui_print_modes_table) / sizeof(pcl3_gui_print_modes_table[0]); i++) +@@ -269,7 +269,7 @@ bool Pcl3Gui::selectPrintMode() + return selectPrintMode(i); + } + } +- dbglog("Unsupported printer_platform: %s", m_pJA->printer_platform); ++ dbglog("Unsupported printer_platform: %s\n", m_pJA->printer_platform); + return false; + } + diff --git a/hplip.spec b/hplip.spec index 30ae6ed..f4f1aa0 100644 --- a/hplip.spec +++ b/hplip.spec @@ -1,7 +1,7 @@ Summary: HP Linux Imaging and Printing Project Name: hplip Version: 3.10.2 -Release: 11%{?dist} +Release: 12%{?dist} License: GPLv2+ and MIT Group: System Environment/Daemons Conflicts: system-config-printer < 0.6.132 @@ -29,6 +29,7 @@ Patch14: hplip-hpcups-sigpipe.patch Patch16: hplip-bad-low-ink-warning.patch Patch17: hplip-deviceIDs-ppd.patch Patch18: hplip-skip-blank-lines.patch +Patch19: hplip-dbglog-newline.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -185,6 +186,9 @@ done # Hpcups (ljcolor) was putting black lines where should be blank lines (bug #579461). %patch18 -p1 -b .skip-blank-lines +# Added missing newline to string argument in dbglog() call (bug #585275). +%patch19 -p1 -b .dbglog-newline + sed -i.duplex-constraints \ -e 's,\(UIConstraints.* \*Duplex\),//\1,' \ prnt/drv/hpcups.drv.in @@ -406,6 +410,9 @@ fi %{_bindir}/hpcups-update-ppds &>/dev/null ||: %changelog +* Tue Apr 27 2010 Jiri Popelka - 3.10.2-12 +- Added missing newline to string argument in dbglog() call (bug #585275). + * Fri Apr 16 2010 Tim Waugh - 3.10.2-11 - Added/corrected more IEEE 1284 Device IDs: - HP Color LaserJet CM1312nfi (bug #581005).