# HG changeset patch
# User Rohit Joshi <jozee@slitaz.org>
# Date 1245163702 0
# Node ID 9bb77afebf85e34242dfd8ba8141f4902f8de34f
# Parent  aab008b12bb37e8e83756ccecf84905000520daa
Up: hplip, patch for glibc210; compress non-gz ppd files

diff -r aab008b12bb3 -r 9bb77afebf85 hplip/receipt
--- a/hplip/receipt	Tue Jun 16 12:44:03 2009 +0000
+++ b/hplip/receipt	Tue Jun 16 14:48:22 2009 +0000
@@ -1,21 +1,29 @@
 # SliTaz package receipt.
 
 PACKAGE="hplip"
-VERSION="3.9.2" 
+VERSION="3.9.4b" 
 CATEGORY="system-tools"
 SHORT_DESC="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet"
 MAINTAINER="jozee@slitaz.org"
 DEPENDS="ghostscript python cups dbus-python libusb jpeg tiff sane-backends"
-BUILD_DEPENDS="ghostscript-dev dbus-python-dev sane-backends-dev sane-backends pkg-config libusb-dev jpeg-dev cups-dev dbus-dev tiff-dev"
+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"
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WEB_SITE="http://hplipopensource.com"
 WGET_URL="http://downloads.sourceforge.net/sourceforge/hplip/$TARBALL"
 
-# Rules to configure and make the package.
+# Rules to configure and make the package. --prefix=/usr \
 compile_rules()
 {
 	cd $src
-	./configure \
+	while read file; do
+    	[ -f done.$file ] && continue
+    	echo "Apply $file..."
+    	patch -p0 < ../stuff/$PACKAGE-$VERSION-$file || return 1
+	touch done.$file
+    done <<EOT
+	glibc210.u
+EOT
+	./configure  \
 		--prefix=/usr \
 		--sysconfdir=/etc \
 		--disable-network-build \
@@ -46,9 +54,8 @@
 		   $_pkg/usr/share/ppd \
 		   $fs/usr/share
 
-	
-	 # remove non zipped ppd files
- rm -rf $fs/usr/share/ppd/HP/*.ppd
+ # compress snon zipped ppd files
+    find $fs/usr/share/ppd/HP -name "*.ppd" | xargs gzip -n9
  
   # remove autostart of hp-daemon
   rm -rf $fs/etc/sane.d
diff -r aab008b12bb3 -r 9bb77afebf85 hplip/stuff/hplip-3.9.4b-glibc210.u
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/hplip/stuff/hplip-3.9.4b-glibc210.u	Tue Jun 16 14:48:22 2009 +0000
@@ -0,0 +1,22 @@
+--- prnt/hpijs/registry.cpp.orig	2009-04-29 22:41:07.000000000 +0200
++++ prnt/hpijs/registry.cpp	2009-06-02 14:17:09.000000000 +0200
+@@ -292,7 +292,7 @@ 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:");
+--- prnt/hpijs/dj3320.cpp.orig	2009-04-29 22:41:07.000000000 +0200
++++ prnt/hpijs/dj3320.cpp	2009-06-02 14:32:21.000000000 +0200
+@@ -429,7 +429,7 @@ DISPLAY_STATUS DJ3320::ParseError (BYTE
+             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 = strstr((char*)pLDLEncap->byStatusBuff + 10, "$S:")) == NULL)
+             {
+                 m_dsCurrentStatus = DISPLAY_COMM_PROBLEM;
+                 return DISPLAY_COMM_PROBLEM;