wok rev 3470
Up: hplip, patch for glibc210; compress non-gz ppd files
author | Rohit Joshi <jozee@slitaz.org> |
---|---|
date | Tue Jun 16 14:48:22 2009 +0000 (2009-06-16) |
parents | aab008b12bb3 |
children | a821168447a7 |
files | hplip/receipt hplip/stuff/hplip-3.9.4b-glibc210.u |
line diff
1.1 --- a/hplip/receipt Tue Jun 16 12:44:03 2009 +0000 1.2 +++ b/hplip/receipt Tue Jun 16 14:48:22 2009 +0000 1.3 @@ -1,21 +1,29 @@ 1.4 # SliTaz package receipt. 1.5 1.6 PACKAGE="hplip" 1.7 -VERSION="3.9.2" 1.8 +VERSION="3.9.4b" 1.9 CATEGORY="system-tools" 1.10 SHORT_DESC="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet" 1.11 MAINTAINER="jozee@slitaz.org" 1.12 DEPENDS="ghostscript python cups dbus-python libusb jpeg tiff sane-backends" 1.13 -BUILD_DEPENDS="ghostscript-dev dbus-python-dev sane-backends-dev sane-backends pkg-config libusb-dev jpeg-dev cups-dev dbus-dev tiff-dev" 1.14 +BUILD_DEPENDS="ghostscript-dev dbus-python-dev sane-backends-dev sane-backends pkg-config libusb-dev jpeg-dev cups-dev dbus-dev tiff-dev python python-dev dbus-python" 1.15 TARBALL="$PACKAGE-$VERSION.tar.gz" 1.16 WEB_SITE="http://hplipopensource.com" 1.17 WGET_URL="http://downloads.sourceforge.net/sourceforge/hplip/$TARBALL" 1.18 1.19 -# Rules to configure and make the package. 1.20 +# Rules to configure and make the package. --prefix=/usr \ 1.21 compile_rules() 1.22 { 1.23 cd $src 1.24 - ./configure \ 1.25 + while read file; do 1.26 + [ -f done.$file ] && continue 1.27 + echo "Apply $file..." 1.28 + patch -p0 < ../stuff/$PACKAGE-$VERSION-$file || return 1 1.29 + touch done.$file 1.30 + done <<EOT 1.31 + glibc210.u 1.32 +EOT 1.33 + ./configure \ 1.34 --prefix=/usr \ 1.35 --sysconfdir=/etc \ 1.36 --disable-network-build \ 1.37 @@ -46,9 +54,8 @@ 1.38 $_pkg/usr/share/ppd \ 1.39 $fs/usr/share 1.40 1.41 - 1.42 - # remove non zipped ppd files 1.43 - rm -rf $fs/usr/share/ppd/HP/*.ppd 1.44 + # compress snon zipped ppd files 1.45 + find $fs/usr/share/ppd/HP -name "*.ppd" | xargs gzip -n9 1.46 1.47 # remove autostart of hp-daemon 1.48 rm -rf $fs/etc/sane.d
2.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 2.2 +++ b/hplip/stuff/hplip-3.9.4b-glibc210.u Tue Jun 16 14:48:22 2009 +0000 2.3 @@ -0,0 +1,22 @@ 2.4 +--- prnt/hpijs/registry.cpp.orig 2009-04-29 22:41:07.000000000 +0200 2.5 ++++ prnt/hpijs/registry.cpp 2009-06-02 14:17:09.000000000 +0200 2.6 +@@ -292,7 +292,7 @@ DRIVER_ERROR DeviceRegistry::SelectDevic 2.7 + device = eDJ3320; 2.8 + match = TRUE; 2.9 + } 2.10 +- char *cmdStr = strstr ((const char *) DevIDBuffer+2, "CMD:"); 2.11 ++ const char *cmdStr = strstr ((const char *) DevIDBuffer+2, "CMD:"); 2.12 + if (!cmdStr) 2.13 + { 2.14 + cmdStr = strstr ((const char *) DevIDBuffer+2, "COMMAND SET:"); 2.15 +--- prnt/hpijs/dj3320.cpp.orig 2009-04-29 22:41:07.000000000 +0200 2.16 ++++ prnt/hpijs/dj3320.cpp 2009-06-02 14:32:21.000000000 +0200 2.17 +@@ -429,7 +429,7 @@ DISPLAY_STATUS DJ3320::ParseError (BYTE 2.18 + pLDLEncap->bNewStatus = FALSE; 2.19 + 2.20 + // First 10 bytes of m_pbyReadBuff are packet header. Status query from printer has $S: 2.21 +- if ((pcStr = strstr((const char*)pLDLEncap->byStatusBuff + 10, "$S:")) == NULL) 2.22 ++ if ((pcStr = strstr((char*)pLDLEncap->byStatusBuff + 10, "$S:")) == NULL) 2.23 + { 2.24 + m_dsCurrentStatus = DISPLAY_COMM_PROBLEM; 2.25 + return DISPLAY_COMM_PROBLEM;