diff options
| author | Luiz Angelo Daros de Luca <luizluca@gmail.com> | 2019-12-19 02:38:07 -0300 |
|---|---|---|
| committer | Luiz Angelo Daros de Luca <luizluca@gmail.com> | 2019-12-21 20:44:06 -0300 |
| commit | 9c901e1bd10ee4d6a58e1e2cdd1c297483caf99e (patch) | |
| tree | e692ebbc092f4a1534d80b9ac40746e9e57c2a4f /utils/hplip/patches | |
| parent | 1858cb5ff5d8d275dd9704e3f70e6ba5fbf0075d (diff) | |
hplip: bump to 3.19.12
Signed-off-by: Luiz Angelo Daros de Luca <luizluca@gmail.com>
Diffstat (limited to 'utils/hplip/patches')
| -rw-r--r-- | utils/hplip/patches/010-libusb_fix.patch | 2 | ||||
| -rw-r--r-- | utils/hplip/patches/020-remove_cups_dep_on_scan.patch | 11 |
2 files changed, 6 insertions, 7 deletions
diff --git a/utils/hplip/patches/010-libusb_fix.patch b/utils/hplip/patches/010-libusb_fix.patch index 05ba40060..3862aec97 100644 --- a/utils/hplip/patches/010-libusb_fix.patch +++ b/utils/hplip/patches/010-libusb_fix.patch @@ -1,6 +1,6 @@ --- a/configure.in +++ b/configure.in -@@ -598,6 +598,10 @@ if test "$class_driver" = "no" && test "$hpijs_only_build" = "no" && test "$hpcu +@@ -601,6 +601,10 @@ if test "$class_driver" = "no" && test " else AC_CHECK_LIB([usb-1.0], [libusb_init], [LIBS="$LIBS"], [AC_MSG_ERROR([cannot find libusb 1.0 support], 2)]) AC_CHECK_HEADERS(libusb-1.0/libusb.h, ,[AC_MSG_ERROR([cannot find libusb-1.0-devel support], 11)]) diff --git a/utils/hplip/patches/020-remove_cups_dep_on_scan.patch b/utils/hplip/patches/020-remove_cups_dep_on_scan.patch index 3951e3bd2..c3aba2a2f 100644 --- a/utils/hplip/patches/020-remove_cups_dep_on_scan.patch +++ b/utils/hplip/patches/020-remove_cups_dep_on_scan.patch @@ -19,7 +19,7 @@ #include "hpmud.h" #include "hp_ipp.h" #include "soap.h" -@@ -145,98 +144,6 @@ static int GetUriLine(char *buf, char *uri, char **tail) +@@ -145,98 +144,6 @@ static int GetUriLine(char *buf, char *u return i; } @@ -126,13 +126,13 @@ char* token = NULL; enum HPMUD_RESULT stat; -@@ -304,34 +210,6 @@ static int DevDiscovery(int localOnly) +@@ -304,33 +210,6 @@ static int DevDiscovery(int localOnly) total += AddDevice(uri); } - + memset(message, 0, sizeof(message)); - /* Look for Network Scan devices if localonly flag if FALSE. */ - if (!localOnly) -- { +- { - /* Look for all-in-one scan devices for which print queue created */ - cnt = GetCupsPrinters(&cups_printer); - for (i=0; i<cnt; i++) @@ -157,7 +157,6 @@ - SendScanEvent("hpaio:/net/HP_Scan_Devices?ip=1.1.1.1", EVENT_ERROR_NO_PROBED_DEVICES_FOUND); - } - } -- + bugout: return total; - } |