rpms/hplip
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Include patch to make it build.

Browse Source
This commit is contained in:
Tim Waugh 2009-02-20 13:16:54 +00:00
parent ad006f5a23
commit 7b0dc5129e
2 changed files with 38 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
hplip-strstr-const.patch Normal file
View File

@ -0,0 +1,36 @@
diff -up hplip-3.9.2/prnt/hpijs/dj3320.cpp.strstr-const hplip-3.9.2/prnt/hpijs/dj3320.cpp
--- hplip-3.9.2/prnt/hpijs/dj3320.cpp.strstr-const 2009-02-20 00:38:04.000000000 +0000
+++ hplip-3.9.2/prnt/hpijs/dj3320.cpp 2009-02-20 11:27:51.000000000 +0000
@@ -403,7 +403,7 @@ DISPLAY_STATUS DJ3320::ParseError (BYTE
{
DRIVER_ERROR err = NO_ERROR;
BYTE byDevIDBuffer[DevIDBuffSize];
- char *pcStr = NULL;
+ const char *pcStr = NULL;
BYTE byStatus1, byStatus2;
memset(byDevIDBuffer, 0, sizeof(byDevIDBuffer));
diff -up hplip-3.9.2/prnt/hpijs/registry.cpp.strstr-const hplip-3.9.2/prnt/hpijs/registry.cpp
--- hplip-3.9.2/prnt/hpijs/registry.cpp.strstr-const 2009-02-20 00:38:04.000000000 +0000
+++ hplip-3.9.2/prnt/hpijs/registry.cpp 2009-02-20 11:27:00.000000000 +0000
@@ -292,15 +292,15 @@ DRIVER_ERROR DeviceRegistry::SelectDevic
device = eDJ3320;
match = TRUE;
}
- char *cmdStr = strstr ((const char *) DevIDBuffer+2, "CMD:");
+ const char *cmdStr = strstr ((const char *) DevIDBuffer+2, "CMD:");
if (!cmdStr)
{
cmdStr = strstr ((const char *) DevIDBuffer+2, "COMMAND SET:");
}
- if (!match && cmdStr && (strstr ((const char *) cmdStr+4, "POSTSCRIPT") ||
- strstr ((const char *) cmdStr+4, "PostScript") ||
- strstr ((const char *) cmdStr+4, "Postscript") ||
- strstr ((const char *) cmdStr+4, "postscript") ))
+ if (!match && cmdStr && (strstr (cmdStr+4, "POSTSCRIPT") ||
+ strstr (cmdStr+4, "PostScript") ||
+ strstr (cmdStr+4, "Postscript") ||
+ strstr (cmdStr+4, "postscript") ))
{
device = ePScript;
match = TRUE;

4
hplip.spec
View File

@ -1,7 +1,7 @@
Summary: HP Linux Imaging and Printing Project Summary: HP Linux Imaging and Printing Project
Name: hplip Name: hplip
Version: 3.9.2 Version: 3.9.2
Release: 1%{?dist} Release: 2%{?dist}
License: GPLv2+ and MIT License: GPLv2+ and MIT
Group: System Environment/Daemons Group: System Environment/Daemons
Conflicts: system-config-printer < 0.6.132 Conflicts: system-config-printer < 0.6.132
@ -326,7 +326,7 @@ fi
exit 0 exit 0
%changelog %changelog
* Fri Feb 20 2009 Tim Waugh <twaugh@redhat.com> 3.9.2-1 * Fri Feb 20 2009 Tim Waugh <twaugh@redhat.com> 3.9.2-2
- 3.9.2. No longer need systray or quit patches. - 3.9.2. No longer need systray or quit patches.
* Tue Jan 27 2009 Tim Waugh <twaugh@redhat.com> 2.8.12-7 * Tue Jan 27 2009 Tim Waugh <twaugh@redhat.com> 2.8.12-7