mirror of
https://abf.rosa.ru/djam/hplip.git
synced 2025-02-24 00:42:59 +00:00
Removed unused patches
This commit is contained in:
Eugene Shatokhin
parent
2e0fa98b8e
commit
6709ecd2ba
21 changed files with 0 additions and 633 deletions
|
|
@ -1,16 +0,0 @@
|
|||
#! /bin/sh /usr/share/dpatch/dpatch-run
|
||||
## 10_hashbang_fixes.dpatch by Henrique de Moraes Holschuh <hmh@debian.org>
|
||||
##
|
||||
## All lines beginning with `## DP:' are a description of the patch.
|
||||
## DP: Fix missing, weird or otherwise broken shebang lines
|
||||
|
||||
@DPATCH@
|
||||
Index: hplip-3.12.4/__init__.py
|
||||
===================================================================
|
||||
--- hplip-3.12.4.orig/__init__.py 2012-04-10 18:35:13.000000000 +1000
|
||||
+++ hplip-3.12.4/__init__.py 2012-05-26 10:21:29.000000000 +1000
|
||||
@@ -1,3 +1,4 @@
|
||||
+#!/usr/bin/env python
|
||||
# -*- coding: utf-8 -*-
|
||||
#
|
||||
# (c) Copyright 2003-2007 Hewlett-Packard Development Company, L.P.
|
||||
|
|
@ -1,24 +0,0 @@
|
|||
#! /bin/sh /usr/share/dpatch/dpatch-run
|
||||
## 87_move_documentation.dpatch by <till.kamppeter@gmail.com>
|
||||
##
|
||||
## All lines beginning with `## DP:' are a description of the patch.
|
||||
## DP: place html documentation under hplip-doc/HTML/
|
||||
|
||||
@DPATCH@
|
||||
--- a/Makefile.am
|
||||
+++ b/Makefile.am
|
||||
@@ -29,11 +29,11 @@
|
||||
|
||||
if DOC_BUILD
|
||||
wwwsrc = doc
|
||||
-www0dir = $(docdir)
|
||||
+www0dir = $(hpdocdir)/HTML
|
||||
dist_www0_DATA = $(wwwsrc)/index.html $(wwwsrc)/commandline.html $(wwwsrc)/copying.html $(wwwsrc)/devicemanager.html $(wwwsrc)/faxtrouble.html $(wwwsrc)/gettinghelp.html $(wwwsrc)/hpscan.html $(wwwsrc)/mainttask.html $(wwwsrc)/plugins.html $(wwwsrc)/print.html $(wwwsrc)/printing.html $(wwwsrc)/printoptions.html $(wwwsrc)/printtroubleshooting.html $(wwwsrc)/scanning.html $(wwwsrc)/scantrouble.html $(wwwsrc)/sendfax.html $(wwwsrc)/setup.html $(wwwsrc)/systray.html $(wwwsrc)/troubleshooting.html $(wwwsrc)/uninstalling.html $(wwwsrc)/upgrading.html
|
||||
-www3dir = $(docdir)/styles
|
||||
+www3dir = $(www0dir)/styles
|
||||
dist_www3_DATA = $(wwwsrc)/styles/*
|
||||
-www4dir = $(docdir)/images
|
||||
+www4dir = $(www0dir)/images
|
||||
dist_www4_DATA = $(wwwsrc)/images/*
|
||||
endif
|
||||
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
--- ip/xmatrix.c.orig 2004-02-18 23:43:44.000000000 +0100
|
||||
+++ ip/xmatrix.c 2005-05-17 13:48:17.000000000 +0200
|
||||
@@ -380,7 +380,7 @@
|
||||
|
||||
while (pwOut < (WORD*)pOutAfter)
|
||||
{
|
||||
- int prod0, prod1, prod2;
|
||||
+ int prod0 = 0, prod1 = 0, prod2 = 0;
|
||||
|
||||
/* The fixed-point calculations below are as follows:
|
||||
* 17.15 = input pixel
|
||||
|
|
@ -1,43 +0,0 @@
|
|||
#! /bin/sh /usr/share/dpatch/dpatch-run
|
||||
## hp-mkuri-take-into-account-already-installed-plugin-also-for-exit-value.dpatch by <till.kamppeter@gmail.com>
|
||||
##
|
||||
## All lines beginning with `## DP:' are a description of the patch.
|
||||
## DP: No description.
|
||||
|
||||
@DPATCH@
|
||||
Index: hplip-3.12.4/io/hpmud/hp-mkuri.c
|
||||
===================================================================
|
||||
--- hplip-3.12.4.orig/io/hpmud/hp-mkuri.c 2012-04-10 18:35:06.000000000 +1000
|
||||
+++ hplip-3.12.4/io/hpmud/hp-mkuri.c 2012-05-26 10:23:52.000000000 +1000
|
||||
@@ -385,17 +385,23 @@
|
||||
}
|
||||
|
||||
ret = 0;
|
||||
- if (plugin == HPMUD_PLUGIN_TYPE_REQUIRED)
|
||||
- ret = 2;
|
||||
- else if (plugin == HPMUD_PLUGIN_TYPE_OPTIONAL)
|
||||
- ret = 3;
|
||||
- if (fax > 0)
|
||||
+ if (!plugin_installed)
|
||||
{
|
||||
- ret = 4;
|
||||
if (plugin == HPMUD_PLUGIN_TYPE_REQUIRED)
|
||||
- ret = 5;
|
||||
+ ret = 2;
|
||||
else if (plugin == HPMUD_PLUGIN_TYPE_OPTIONAL)
|
||||
- ret = 6;
|
||||
+ ret = 3;
|
||||
+ }
|
||||
+ if (fax > 0)
|
||||
+ {
|
||||
+ ret = 4;
|
||||
+ if (!plugin_installed)
|
||||
+ {
|
||||
+ if (plugin == HPMUD_PLUGIN_TYPE_REQUIRED)
|
||||
+ ret = 5;
|
||||
+ else if (plugin == HPMUD_PLUGIN_TYPE_OPTIONAL)
|
||||
+ ret = 6;
|
||||
+ }
|
||||
}
|
||||
|
||||
bugout:
|
||||
|
|
@ -1,32 +0,0 @@
|
|||
#! /bin/sh /usr/share/dpatch/dpatch-run
|
||||
## hp-setup-prompt-for-custom-PPD.dpatch by <till.kamppeter@gmail.com>
|
||||
##
|
||||
## All lines beginning with `## DP:' are a description of the patch.
|
||||
## DP: No description.
|
||||
|
||||
@DPATCH@
|
||||
Index: hplip-3.12.4/setup.py
|
||||
===================================================================
|
||||
--- hplip-3.12.4.orig/setup.py 2012-04-10 18:35:14.000000000 +1000
|
||||
+++ hplip-3.12.4/setup.py 2012-05-26 10:21:29.000000000 +1000
|
||||
@@ -487,14 +487,13 @@
|
||||
print_ppd, desc = print_ppd
|
||||
log.info("\nFound PPD file: %s" % print_ppd)
|
||||
|
||||
- if desc:
|
||||
- log.info("Description: %s" % desc)
|
||||
+ log.info("Description: %s" % desc)
|
||||
#
|
||||
- if not auto:
|
||||
- log.info("\nNote: The model number may vary slightly from the actual model number on the device.")
|
||||
- ok, ans = tui.enter_yes_no("\nDoes this PPD file appear to be the correct one")
|
||||
- if not ok: sys.exit(0)
|
||||
- if not ans: enter_ppd = True
|
||||
+ if not auto:
|
||||
+ log.info("\nNote: The model number may vary slightly from the actual model number on the device.")
|
||||
+ ok, ans = tui.enter_yes_no("\nDoes this PPD file appear to be the correct one")
|
||||
+ if not ok: sys.exit(0)
|
||||
+ if not ans: enter_ppd = True
|
||||
|
||||
|
||||
if enter_ppd:
|
||||
|
|
@ -1,10 +0,0 @@
|
|||
--- hplip-3.12.9/prnt/cupsext/cupsext.c.addprinter 2012-09-04 14:31:10.000000000 +0200
|
||||
+++ hplip-3.12.9/prnt/cupsext/cupsext.c 2012-09-11 16:42:26.229950718 +0200
|
||||
@@ -324,6 +324,7 @@ PyObject * getPrinters( PyObject * self,
|
||||
};
|
||||
|
||||
/* Connect to the HTTP server */
|
||||
+ cupsSetUser ("root");
|
||||
if ( ( http = httpConnectEncrypt( cupsServer(), ippPort(), cupsEncryption() ) ) == NULL )
|
||||
{
|
||||
goto abort;
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
--- hplip-3.13.10/data/rules/56-hpmud_sysfs.rules 2013-10-11 09:38:53.000000000 +0000
|
||||
+++ hplip-3.13.10/data/rules/56-hpmud_sysfs.rules.tpg 2013-10-19 11:15:57.196603385 +0000
|
||||
@@ -14,9 +14,6 @@
|
||||
# For RHEL 5, centos 5..
|
||||
ENV{hp_test}=="yes", PROGRAM="/bin/sh -c 'X=%k; X=$${X#usbdev}; B=$${X%%%%.*}; D=$${X#*.}; logger -p user.info loading HP Device $$B $$D; printf %%03i:%%03i $$B $$D'", RUN+="/bin/sh -c '/usr/bin/python hp-config_usb_printer %c '"
|
||||
|
||||
-# This rule will add the printer and install plugin
|
||||
-ENV{hp_test}=="yes", PROGRAM="/bin/sh -c 'logger -p user.info loading HP Device $env{BUSNUM} $env{DEVNUM}'", RUN+="/bin/sh -c 'if [ -f /usr/bin/systemctl ]; then /usr/bin/systemctl --no-block start hplip-printer@$env{BUSNUM}:$env{DEVNUM}.service; else /usr/bin/nohup /usr/bin/python /usr/bin/hp-config_usb_printer $env{BUSNUM}:$env{DEVNUM} ; fi'"
|
||||
-
|
||||
# If sane-bankends is installed add hpaio backend support to dll.conf if needed.
|
||||
ENV{sane_hpaio}=="yes", RUN+="/bin/sh -c 'grep -q ^#hpaio /etc/sane.d/dll.conf;if [ $$? -eq 0 ];then sed -i -e s/^#hpaio/hpaio/ /etc/sane.d/dll.conf;else grep -q ^hpaio /etc/sane.d/dll.conf;if [ $$? -ne 0 ];then echo hpaio >>/etc/sane.d/dll.conf;fi;fi'"
|
||||
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
diff -up hplip-3.10.9/io/hpmud/pml.c.CVE-2010-4267 hplip-3.10.9/io/hpmud/pml.c
|
||||
--- hplip-3.10.9/io/hpmud/pml.c.CVE-2010-4267 2010-09-26 18:07:25.000000000 +0100
|
||||
+++ hplip-3.10.9/io/hpmud/pml.c 2011-01-17 17:21:26.018127900 +0000
|
||||
@@ -504,6 +504,8 @@ enum HPMUD_RESULT hpmud_get_pml(HPMUD_DE
|
||||
p += 2; /* eat type and length */
|
||||
}
|
||||
|
||||
+ if (dLen > buf_size)
|
||||
+ dLen = buf_size;
|
||||
memcpy(buf, p, dLen);
|
||||
*bytes_read = dLen;
|
||||
*type = dt;
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
diff -up hplip-3.10.9/ui4/printsettingstoolbox.py.UnicodeDecodeError hplip-3.10.9/ui4/printsettingstoolbox.py
|
||||
--- hplip-3.10.9/ui4/printsettingstoolbox.py.UnicodeDecodeError 2010-09-26 19:07:19.000000000 +0200
|
||||
+++ hplip-3.10.9/ui4/printsettingstoolbox.py 2010-10-22 15:01:13.000000000 +0200
|
||||
@@ -459,7 +459,7 @@ class PrintSettingsToolbox(QToolBox):
|
||||
|
||||
self.beginControlGroup(g, QString(text))
|
||||
|
||||
- log.debug(" Text: %s" % unicode(text))
|
||||
+ log.debug(" Text: %s" % repr(text))
|
||||
log.debug("Num subgroups: %d" % num_subgroups)
|
||||
|
||||
options = cups.getOptionList(g)
|
||||
|
|
@ -1,188 +0,0 @@
|
|||
diff -up hplip-3.12.6/prnt/hpcups/HPCupsFilter.cpp.dbglog-newline hplip-3.12.6/prnt/hpcups/HPCupsFilter.cpp
|
||||
--- hplip-3.12.6/prnt/hpcups/HPCupsFilter.cpp.dbglog-newline 2012-06-19 11:01:38.000000000 +0200
|
||||
+++ hplip-3.12.6/prnt/hpcups/HPCupsFilter.cpp 2012-06-19 11:02:52.150529477 +0200
|
||||
@@ -440,7 +440,7 @@ DRIVER_ERROR HPCupsFilter::startPage (cu
|
||||
m_DBusComm.sendEvent(EVENT_PRINT_FAILED_MISSING_PLUGIN, "Plugin missing", m_JA.job_id, m_JA.user_name);
|
||||
|
||||
}
|
||||
- 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;
|
||||
@@ -533,7 +533,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;
|
||||
@@ -543,7 +543,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;
|
||||
@@ -678,7 +678,7 @@ int HPCupsFilter::processRasterData(cups
|
||||
//Need to revisit to crosscheck if it is a firmware issue.
|
||||
|
||||
*m_pPrinterBuffer = 0x01;
|
||||
- dbglog("First raster data plane.." );
|
||||
+ dbglog("First raster data plane..\n" );
|
||||
}
|
||||
|
||||
if (this->isBlankRaster((BYTE *) m_pPrinterBuffer, &cups_header)) {
|
||||
diff -up hplip-3.12.6/prnt/hpcups/Lidil.cpp.dbglog-newline hplip-3.12.6/prnt/hpcups/Lidil.cpp
|
||||
--- hplip-3.12.6/prnt/hpcups/Lidil.cpp.dbglog-newline 2012-06-18 12:40:17.000000000 +0200
|
||||
+++ hplip-3.12.6/prnt/hpcups/Lidil.cpp 2012-06-19 11:01:39.598521705 +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;
|
||||
}
|
||||
|
||||
@@ -166,7 +166,7 @@ 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;
|
||||
}
|
||||
|
||||
@@ -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\n");
|
||||
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)
|
||||
{
|
||||
- dbglog("allocateSwathBuffers failed, err = %d", err);
|
||||
+ dbglog("allocateSwathBuffers failed, err = %d\n", err);
|
||||
return err;
|
||||
}
|
||||
|
||||
@@ -625,7 +625,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++)
|
||||
@@ -635,7 +635,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.12.6/prnt/hpcups/Pcl3.cpp.dbglog-newline hplip-3.12.6/prnt/hpcups/Pcl3.cpp
|
||||
--- hplip-3.12.6/prnt/hpcups/Pcl3.cpp.dbglog-newline 2012-06-18 12:40:17.000000000 +0200
|
||||
+++ hplip-3.12.6/prnt/hpcups/Pcl3.cpp 2012-06-19 11:01:39.599521691 +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.12.6/prnt/hpcups/Pcl3Gui.cpp.dbglog-newline hplip-3.12.6/prnt/hpcups/Pcl3Gui.cpp
|
||||
--- hplip-3.12.6/prnt/hpcups/Pcl3Gui.cpp.dbglog-newline 2012-06-18 12:40:17.000000000 +0200
|
||||
+++ hplip-3.12.6/prnt/hpcups/Pcl3Gui.cpp 2012-06-19 11:01:39.599521691 +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;
|
||||
}
|
||||
|
||||
|
|
@ -1,18 +0,0 @@
|
|||
diff -up hplip-3.10.9/ui4/sendfaxdialog.py~ hplip-3.10.9/ui4/sendfaxdialog.py
|
||||
--- hplip-3.10.9/ui4/sendfaxdialog.py~ 2010-09-26 18:07:19.000000000 +0100
|
||||
+++ hplip-3.10.9/ui4/sendfaxdialog.py 2010-12-13 16:44:56.857648866 +0000
|
||||
@@ -915,8 +915,12 @@ class SendFaxDialog(QDialog, Ui_Dialog):
|
||||
def CheckTimer_timeout(self):
|
||||
if not self.busy:
|
||||
#log.debug("Checking for incoming faxes...")
|
||||
- device_uri, printer_name, event_code, username, job_id, title, timedate, fax_file = \
|
||||
- self.service.CheckForWaitingFax(self.device_uri, prop.username, self.last_job_id)
|
||||
+ try:
|
||||
+ device_uri, printer_name, event_code, username, job_id, title, timedate, fax_file = \
|
||||
+ self.service.CheckForWaitingFax(self.device_uri, prop.username, self.last_job_id)
|
||||
+ except Exception, e:
|
||||
+ log.debug("Exception caught: %s" % e)
|
||||
+ fax_file = None
|
||||
|
||||
if fax_file:
|
||||
self.last_job_id = 0
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
diff -up hplip-3.9.8/ui4/setupdialog.py.discovery-method hplip-3.9.8/ui4/setupdialog.py
|
||||
--- hplip-3.9.8/ui4/setupdialog.py.discovery-method 2009-08-04 22:37:22.000000000 +0100
|
||||
+++ hplip-3.9.8/ui4/setupdialog.py 2009-09-16 15:34:36.509431266 +0100
|
||||
@@ -171,6 +171,7 @@ class SetupDialog(QDialog, Ui_Dialog):
|
||||
QTimer.singleShot(0, self.showRemovePage)
|
||||
else:
|
||||
if self.skip_discovery:
|
||||
+ self.discovery_method = 1 # mDNS
|
||||
QTimer.singleShot(0, self.showDevicesPage)
|
||||
else:
|
||||
QTimer.singleShot(0, self.showDiscoveryPage)
|
||||
|
|
@ -1,45 +0,0 @@
|
|||
diff -up hplip-3.11.10/scan/sane/hpaio.c~ hplip-3.11.10/scan/sane/hpaio.c
|
||||
--- hplip-3.11.10/scan/sane/hpaio.c~ 2011-10-02 04:04:48.000000000 +0100
|
||||
+++ hplip-3.11.10/scan/sane/hpaio.c 2011-10-20 16:00:38.016534755 +0100
|
||||
@@ -272,25 +272,28 @@ static int DevDiscovery(int localOnly)
|
||||
}
|
||||
}
|
||||
|
||||
- /* Ignore localOnly flag (used by saned) and always look for network all-in-one scan devices (defined by cups). */
|
||||
- cnt = GetCupsPrinters(&cups_printer);
|
||||
- for (i=0; i<cnt; i++)
|
||||
+ /* Check localOnly flag (used by saned) to decide whether to look for network all-in-one scan devices (defined by cups). */
|
||||
+ if (!localOnly)
|
||||
{
|
||||
- hpmud_query_model(cups_printer[i], &ma);
|
||||
- if (ma.scantype > 0)
|
||||
- {
|
||||
+ cnt = GetCupsPrinters(&cups_printer);
|
||||
+ for (i=0; i<cnt; i++)
|
||||
+ {
|
||||
+ hpmud_query_model(cups_printer[i], &ma);
|
||||
+ if (ma.scantype > 0)
|
||||
+ {
|
||||
hpmud_get_uri_model(cups_printer[i], model, sizeof(model));
|
||||
AddDeviceList(cups_printer[i], model, &DeviceList);
|
||||
total++;
|
||||
- }
|
||||
- else
|
||||
- {
|
||||
+ }
|
||||
+ else
|
||||
+ {
|
||||
DBG(6,"unsupported scantype=%d %s\n", ma.scantype, cups_printer[i]);
|
||||
- }
|
||||
- free(cups_printer[i]);
|
||||
+ }
|
||||
+ free(cups_printer[i]);
|
||||
+ }
|
||||
+ if (cups_printer)
|
||||
+ free(cups_printer);
|
||||
}
|
||||
- if (cups_printer)
|
||||
- free(cups_printer);
|
||||
|
||||
bugout:
|
||||
return total;
|
||||
|
|
@ -1,28 +0,0 @@
|
|||
--- hplip-3.12.6/prnt/hpcups/HPCupsFilter.cpp.mucks-with-spooldir 2012-06-18 12:40:17.000000000 +0200
|
||||
+++ hplip-3.12.6/prnt/hpcups/HPCupsFilter.cpp 2012-06-26 18:11:53.720261545 +0200
|
||||
@@ -474,25 +474,6 @@ int HPCupsFilter::StartPrintJob(int arg
|
||||
|
||||
getLogLevel();
|
||||
m_JA.job_id = atoi(argv[1]);
|
||||
- FILE *fp;
|
||||
- char dFileName[32];
|
||||
- memset(dFileName, 0, sizeof(dFileName));
|
||||
- m_JA.job_id = atoi(argv[1]);
|
||||
- snprintf (dFileName, sizeof(dFileName), "/var/spool/cups/d%05d-001", m_JA.job_id);
|
||||
- if ((fp = fopen (dFileName, "r")))
|
||||
- {
|
||||
- char line[258];
|
||||
- for (int i = 0; i < 10; i++)
|
||||
- {
|
||||
- fgets (line, 256, fp);
|
||||
- if (!strncmp (line, "%%Pages:", 8))
|
||||
- {
|
||||
- sscanf (line+9, "%d", &m_JA.total_pages);
|
||||
- break;
|
||||
- }
|
||||
- }
|
||||
- fclose (fp);
|
||||
- }
|
||||
|
||||
m_ppd = ppdOpenFile(getenv("PPD"));
|
||||
if (m_ppd == NULL) {
|
||||
|
|
@ -1,23 +0,0 @@
|
|||
diff -up hplip-3.10.9/ui4/systemtray.py.notification-exception hplip-3.10.9/ui4/systemtray.py
|
||||
--- hplip-3.10.9/ui4/systemtray.py.notification-exception 2011-01-05 10:45:57.000000000 +0100
|
||||
+++ hplip-3.10.9/ui4/systemtray.py 2011-01-05 12:34:18.000000000 +0100
|
||||
@@ -27,6 +27,7 @@ import os
|
||||
import signal
|
||||
import os.path
|
||||
import time
|
||||
+import gobject
|
||||
|
||||
|
||||
# Local
|
||||
@@ -662,7 +663,10 @@ class SystemTrayApp(QApplication):
|
||||
else:
|
||||
n.set_timeout(TRAY_MESSAGE_DELAY)
|
||||
|
||||
- n.show()
|
||||
+ try:
|
||||
+ n.show()
|
||||
+ except gobject.GError:
|
||||
+ log.error("Failed to show notification!")
|
||||
|
||||
else: # Use "standard" message bubbles
|
||||
icon = ERROR_STATE_TO_ICON.get(error_state, QSystemTrayIcon.Information)
|
||||
|
|
@ -1,24 +0,0 @@
|
|||
diff -up hplip-3.10.9/base/device.py.raw_deviceID-traceback hplip-3.10.9/base/device.py
|
||||
--- hplip-3.10.9/base/device.py.raw_deviceID-traceback 2010-10-18 17:22:55.138868192 +0100
|
||||
+++ hplip-3.10.9/base/device.py 2010-10-18 17:24:02.965869220 +0100
|
||||
@@ -1368,6 +1368,8 @@ class Device(object):
|
||||
|
||||
def getDeviceID(self):
|
||||
needs_close = False
|
||||
+ self.raw_deviceID = ''
|
||||
+ self.deviceID = {}
|
||||
if self.io_state != IO_STATE_HP_OPEN:
|
||||
try:
|
||||
self.open()
|
||||
@@ -1377,10 +1379,7 @@ class Device(object):
|
||||
|
||||
result_code, data = hpmudext.get_device_id(self.device_id)
|
||||
|
||||
- if result_code != hpmudext.HPMUD_R_OK:
|
||||
- self.raw_deviceID = ''
|
||||
- self.deviceID = {}
|
||||
- else:
|
||||
+ if result_code == hpmudext.HPMUD_R_OK:
|
||||
self.raw_deviceID = data
|
||||
self.deviceID = parseDeviceID(data)
|
||||
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
diff -up hplip-3.10.2/prnt/hpcups/LJColor.h.skip-blank-lines hplip-3.10.2/prnt/hpcups/LJColor.h
|
||||
--- hplip-3.10.2/prnt/hpcups/LJColor.h.skip-blank-lines 2010-02-24 23:04:09.000000000 +0000
|
||||
+++ hplip-3.10.2/prnt/hpcups/LJColor.h 2010-04-15 21:46:48.375754707 +0100
|
||||
@@ -48,6 +48,7 @@ public:
|
||||
DRIVER_ERROR Configure(Pipeline **pipeline);
|
||||
DRIVER_ERROR EndJob();
|
||||
DRIVER_ERROR FormFeed();
|
||||
+ bool CanSkipRasters() {return false;}
|
||||
protected:
|
||||
virtual DRIVER_ERROR addJobSettings();
|
||||
void configureRasterData();
|
||||
|
|
@ -1,18 +0,0 @@
|
|||
diff -up hplip-3.12.11/ui4/systemtray.py.systray-dbus-exception hplip-3.12.11/ui4/systemtray.py
|
||||
--- hplip-3.12.11/ui4/systemtray.py.systray-dbus-exception 2012-11-20 10:51:40.000000000 +0100
|
||||
+++ hplip-3.12.11/ui4/systemtray.py 2012-11-27 10:08:51.333805871 +0100
|
||||
@@ -802,7 +802,13 @@ def run(read_pipe):
|
||||
log.set_module("hp-systray(qt4)")
|
||||
log.debug("PID=%d" % os.getpid())
|
||||
|
||||
- app = SystemTrayApp(sys.argv, read_pipe)
|
||||
+ try:
|
||||
+ app = SystemTrayApp(sys.argv, read_pipe)
|
||||
+ except DBusException, e:
|
||||
+ # No session bus
|
||||
+ log.debug("Caught exception: %s" % e)
|
||||
+ sys.exit(1)
|
||||
+
|
||||
app.setQuitOnLastWindowClosed(False) # If not set, settings dlg closes app
|
||||
|
||||
i = 0
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
diff -up hplip-3.11.1/ui4/wifisetupdialog.py.wifisetup hplip-3.11.1/ui4/wifisetupdialog.py
|
||||
--- hplip-3.11.1/ui4/wifisetupdialog.py.wifisetup 2011-01-19 06:18:20.000000000 +0100
|
||||
+++ hplip-3.11.1/ui4/wifisetupdialog.py 2011-03-01 15:39:02.000000000 +0100
|
||||
@@ -301,7 +301,7 @@ class WifiSetupDialog(QDialog, Ui_Dialog
|
||||
self.dev.close()
|
||||
endWaitCursor()
|
||||
|
||||
- self.num_networks = self.networks['numberofscanentries']
|
||||
+ self.num_networks = self.networks.get('numberofscanentries')
|
||||
self.clearNetworksTable()
|
||||
|
||||
if self.num_networks:
|
||||
|
|
@ -1,18 +0,0 @@
|
|||
#! /bin/sh /usr/share/dpatch/dpatch-run
|
||||
## make-commafy-correctly-work-with-python-2.dpatch by <till.kamppeter@gmail.com>
|
||||
##
|
||||
## All lines beginning with `## DP:' are a description of the patch.
|
||||
## DP: No description.
|
||||
|
||||
@DPATCH@
|
||||
--- a/base/utils.py
|
||||
+++ b/base/utils.py
|
||||
@@ -462,7 +462,7 @@
|
||||
|
||||
|
||||
def commafy(val):
|
||||
- return unicode(locale.format("%d", val, grouping=True))
|
||||
+ return locale.format("%d", val, grouping=True).decode(locale.getpreferredencoding())
|
||||
|
||||
|
||||
def format_bytes(s, show_bytes=False):
|
||||
|
|
@ -1,65 +0,0 @@
|
|||
#! /bin/sh /usr/share/dpatch/dpatch-run
|
||||
## try_libhpmud.so.0.dpatch by <evgeni@debian.org>
|
||||
##
|
||||
## All lines beginning with `## DP:' are a description of the patch.
|
||||
## DP: Try libhpmud.so.0 after libhpmud.so
|
||||
|
||||
@DPATCH@
|
||||
|
||||
--- a/scan/sane/marvell.c
|
||||
+++ b/scan/sane/marvell.c
|
||||
@@ -60,8 +60,14 @@
|
||||
int stat=1;
|
||||
|
||||
/* Load hpmud manually with symbols exported. Otherwise the plugin will not find it. */
|
||||
- if ((ps->hpmud_handle = load_library("libhpmud.so")) == NULL)
|
||||
- goto bugout;
|
||||
+ if ((ps->hpmud_handle = dlopen("libhpmud.so", RTLD_LAZY|RTLD_GLOBAL)) == NULL)
|
||||
+ {
|
||||
+ if ((ps->hpmud_handle = dlopen("libhpmud.so.0", RTLD_LAZY|RTLD_GLOBAL)) == NULL)
|
||||
+ {
|
||||
+ BUG("unable to load restricted library: %s\n", dlerror());
|
||||
+ goto bugout;
|
||||
+ }
|
||||
+ }
|
||||
|
||||
/* Load math library manually with symbols exported (Ubuntu 8.04). Otherwise the plugin will not find it. */
|
||||
if ((ps->math_handle = load_library("libm.so")) == NULL)
|
||||
--- a/scan/sane/soap.c
|
||||
+++ b/scan/sane/soap.c
|
||||
@@ -68,8 +68,14 @@
|
||||
int stat=1;
|
||||
|
||||
/* Load hpmud manually with symbols exported. Otherwise the plugin will not find it. */
|
||||
- if ((ps->hpmud_handle = load_library("libhpmud.so")) == NULL)
|
||||
- goto bugout;
|
||||
+ if ((ps->hpmud_handle = dlopen("libhpmud.so", RTLD_LAZY|RTLD_GLOBAL)) == NULL)
|
||||
+ {
|
||||
+ if ((ps->hpmud_handle = dlopen("libhpmud.so.0", RTLD_LAZY|RTLD_GLOBAL)) == NULL)
|
||||
+ {
|
||||
+ BUG("unable to load restricted library: %s\n", dlerror());
|
||||
+ goto bugout;
|
||||
+ }
|
||||
+ }
|
||||
|
||||
/* Load math library manually with symbols exported (Ubuntu 8.04). Otherwise the plugin will not find it. */
|
||||
if ((ps->math_handle = load_library("libm.so")) == NULL)
|
||||
--- a/scan/sane/soapht.c
|
||||
+++ b/scan/sane/soapht.c
|
||||
@@ -62,8 +62,14 @@
|
||||
int stat=1;
|
||||
|
||||
/* Load hpmud manually with symbols exported. Otherwise the plugin will not find it. */
|
||||
- if ((ps->hpmud_handle = load_library("libhpmud.so.0")) == NULL)
|
||||
- goto bugout;
|
||||
+ if ((ps->hpmud_handle = dlopen("libhpmud.so", RTLD_LAZY|RTLD_GLOBAL)) == NULL)
|
||||
+ {
|
||||
+ if ((ps->hpmud_handle = dlopen("libhpmud.so.0", RTLD_LAZY|RTLD_GLOBAL)) == NULL)
|
||||
+ {
|
||||
+ BUG("unable to load restricted library: %s\n", dlerror());
|
||||
+ goto bugout;
|
||||
+ }
|
||||
+ }
|
||||
|
||||
/* Load math library manually with symbols exported (Ubuntu 8.04). Otherwise the plugin will not find it. */
|
||||
if ((ps->math_handle = load_library("libm.so")) == NULL)
|
||||
Loading…
Add table
Reference in a new issue