Author: arekm Date: Wed Jul 15 07:08:58 2009 GMT Module: packages Tag: HEAD ---- Log message: - rel 4; build fixed
---- Files affected: packages/hplip: hplip.spec (1.52 -> 1.53) , hplip-build.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/hplip/hplip.spec diff -u packages/hplip/hplip.spec:1.52 packages/hplip/hplip.spec:1.53 --- packages/hplip/hplip.spec:1.52 Sun Jul 12 15:20:44 2009 +++ packages/hplip/hplip.spec Wed Jul 15 09:08:53 2009 @@ -10,12 +10,13 @@ Summary(pl.UTF-8): Serwer dla drukarek HP Inkjet Name: hplip Version: 2.8.10 -Release: 3 +Release: 4 License: BSD, GPL v2 and MIT Group: Applications/System Source0: http://dl.sourceforge.net/hplip/%{name}-%{version}.tar.gz # Source0-md5: a9ad78c4f0d884caac6b176b3cb9bf21 Patch0: %{name}-ui-optional.patch +Patch1: %{name}-build.patch URL: http://hplip.sourceforge.net/ BuildRequires: autoconf BuildRequires: automake @@ -132,6 +133,7 @@ %prep %setup -q #%patch0 -p1 +%patch1 -p1 sed -i -e's,^#!/usr/bin/env python$,#!/usr/bin/python,' *.py %build @@ -298,6 +300,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.53 2009/07/15 07:08:53 arekm +- rel 4; build fixed + Revision 1.52 2009/07/12 13:20:44 arekm - release 3 ================================================================ Index: packages/hplip/hplip-build.patch diff -u /dev/null packages/hplip/hplip-build.patch:1.1 --- /dev/null Wed Jul 15 09:08:58 2009 +++ packages/hplip/hplip-build.patch Wed Jul 15 09:08:53 2009 @@ -0,0 +1,26 @@ +--- hplip-2.8.10/prnt/hpijs/registry.cpp~ 2008-10-31 23:27:44.000000000 +0100 ++++ hplip-2.8.10/prnt/hpijs/registry.cpp 2009-07-15 09:05:58.048526893 +0200 +@@ -285,10 +285,10 @@ + device = eDJ3320; + match = TRUE; + } +- char *cmdStr = strstr ((const char *) DevIDBuffer+2, "CMD:"); ++ char *cmdStr = (char *)strstr ((const char *) DevIDBuffer+2, "CMD:"); + if (!cmdStr) + { +- cmdStr = strstr ((const char *) DevIDBuffer+2, "COMMAND SET:"); ++ cmdStr = (char *)strstr ((const char *) DevIDBuffer+2, "COMMAND SET:"); + } + if (!match && cmdStr && (strstr ((const char *) cmdStr+4, "POSTSCRIPT") || + strstr ((const char *) cmdStr+4, "PostScript") || +--- hplip-2.8.10/prnt/hpijs/dj3320.cpp~ 2008-10-31 23:27:44.000000000 +0100 ++++ hplip-2.8.10/prnt/hpijs/dj3320.cpp 2009-07-15 09:07:37.832654493 +0200 +@@ -429,7 +429,7 @@ + pLDLEncap->bNewStatus = FALSE; + + // First 10 bytes of m_pbyReadBuff are packet header. Status query from printer has $S: +- if ((pcStr = strstr((const char*)pLDLEncap->byStatusBuff + 10, "$S:")) == NULL) ++ if ((pcStr = (char *)strstr((const char*)pLDLEncap->byStatusBuff + 10, "$S:")) == NULL) + { + m_dsCurrentStatus = DISPLAY_COMM_PROBLEM; + return DISPLAY_COMM_PROBLEM; ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/hplip/hplip.spec?r1=1.52&r2=1.53&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
