aboutsummaryrefslogtreecommitdiff
path: root/utils/hplip/patches
diff options
context:
space:
mode:
authorLuiz Angelo Daros de Luca <luizluca@gmail.com>2019-04-29 23:33:28 -0300
committerLuiz Angelo Daros de Luca <luizluca@gmail.com>2019-04-30 00:42:49 -0300
commitfedc5cf5a45cd1cd6a4440724729c46d61ac3523 (patch)
treea32df85079b07efe4df2cb911de31c0ebae2443c /utils/hplip/patches
parent57c8837af1f8c1a93788f180f5aeec8c01a361af (diff)
hplip: bump to 3.19.3
040-fix_bool.patch: fixed upstream 060-fix-uclibc.patch: workaround for uclibc build (arc_arc700) Signed-off-by: Luiz Angelo Daros de Luca <luizluca@gmail.com>
Diffstat (limited to 'utils/hplip/patches')
-rw-r--r--utils/hplip/patches/040-fix_bool.patch31
-rw-r--r--utils/hplip/patches/060-fix-uclibc.patch15
2 files changed, 15 insertions, 31 deletions
diff --git a/utils/hplip/patches/040-fix_bool.patch b/utils/hplip/patches/040-fix_bool.patch
deleted file mode 100644
index eab984e8c..000000000
--- a/utils/hplip/patches/040-fix_bool.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-https://bugs.launchpad.net/hplip/+bug/1778626
-
---- a/prnt/hpcups/genPCLm.cpp
-+++ b/prnt/hpcups/genPCLm.cpp
-@@ -171,7 +171,7 @@ Defines
- #define rgb_2_gray(r,g,b) (ubyte)(0.299*(double)r+0.587*(double)g+0.114*(double)b)
-
- // Note: this is required for debugging
--boolean writeOutputFile(int numBytes, ubyte *ptr, char *user_name);
-+bool writeOutputFile(int numBytes, ubyte *ptr, char *user_name);
-
- /*
- ********************************************* Helper Routines **************************
-@@ -343,7 +343,7 @@ bool PCLmGenerator::addKids(sint32 kidObj)
- return(true);
- }
-
--boolean writeOutputFile(int numBytes, ubyte *ptr, char *user_name)
-+bool writeOutputFile(int numBytes, ubyte *ptr, char *user_name)
- {
- FILE *outputFile;
- char outFileName[MAX_FILE_PATH_LEN];
-@@ -1074,7 +1074,7 @@ void PCLmGenerator::writePDFGrammarPage(int imageWidth, int imageHeight, int num
- * Limitations:
- * -
- *****************************************************************************************/
--boolean prepImageForBacksideDuplex(ubyte *imagePtr, sint32 imageHeight, sint32 imageWidth, sint32 numComponents)
-+bool prepImageForBacksideDuplex(ubyte *imagePtr, sint32 imageHeight, sint32 imageWidth, sint32 numComponents)
- {
- sint32 numBytes=imageHeight*imageWidth*numComponents;
- ubyte *head, *tail, t0, t1, t2;
diff --git a/utils/hplip/patches/060-fix-uclibc.patch b/utils/hplip/patches/060-fix-uclibc.patch
new file mode 100644
index 000000000..d941d83af
--- /dev/null
+++ b/utils/hplip/patches/060-fix-uclibc.patch
@@ -0,0 +1,15 @@
+Fix missing definition of uint64_t while compiling
+under uclibc
+
+https://bugs.launchpad.net/hplip/+bug/1826965
+
+--- a/scan/sane/OrbliteScan/LinuxCommon.h
++++ b/scan/sane/OrbliteScan/LinuxCommon.h
+@@ -2,6 +2,7 @@
+ #define H_LinuxCommon
+
+ #include <sys/types.h>
++#include <stdint.h>
+
+ /* Common typedefs for Linux */
+