[arch-commits] Commit in hplip/trunk (PKGBUILD hplip-3.9.4b-gcc44.patch)

[Andrea Scarpino]

    Date: Friday, September 4, 2009 @ 11:51:55
  Author: andrea
Revision: 51026

upgpkg: hplip 3.9.8-1
    foomatic-db-hpijs is need nomore cause of foomatic-db 4.0.3

Modified:
  hplip/trunk/PKGBUILD
Deleted:
  hplip/trunk/hplip-3.9.4b-gcc44.patch

--------------------------+
 PKGBUILD                 |   12 ++++++------
 hplip-3.9.4b-gcc44.patch |   36 ------------------------------------
 2 files changed, 6 insertions(+), 42 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-09-04 15:50:35 UTC (rev 51025)
+++ PKGBUILD	2009-09-04 15:51:55 UTC (rev 51026)
@@ -3,24 +3,25 @@
 # Contributor: Morgan LEFIEUX <comete at archlinuxfr.org>
 
 pkgname=hplip
-pkgver=3.9.6b
-pkgrel=2
+pkgver=3.9.8
+pkgrel=1
 pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet."
 arch=('i686' 'x86_64')
 url="http://hplipopensource.com"
 license=('GPL')
 makedepends=('pyqt' 'pkgconfig' 'sane' 'rpcbind' 'dbus-python' 'cups')
-depends=('python' 'ghostscript>=8.64-6' 'foomatic-db' 'foomatic-db-hpijs' \
-         'foomatic-db-engine' 'libcups>=1.3.10-3' 'net-snmp>=5.4')
+depends=('python' 'ghostscript>=8.64-6' 'foomatic-db' 'foomatic-db-engine'
+	'libcups>=1.3.10-3' 'net-snmp>=5.4')
 replaces=('hpijs')
 options=('!libtool')
 install=hplip.install
-source=(http://downloads.sourceforge.net/sourceforge/hplip/$pkgname-$pkgver.tar.gz)
+source=(http://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz)
 optdepends=('cups: for printing support'
             'dbus-python: for dbus support'
             'sane: for scanner support'
             'portmap: for network support'
             'pyqt: for running hp-toolbox')
+md5sums=('cb1cf49c5f062993b78fc2768f531ed8')
 
 build() {
  cd $srcdir/$pkgname-$pkgver
@@ -41,4 +42,3 @@
  # remove lp user, it's not used on archlinux
  sed -i 's|OWNER="lp", ||g' $pkgdir/lib/udev/rules.d/55-hpmud.rules
 }
-md5sums=('49a87fe7d7a57a075ed9631113cee662')

Deleted: hplip-3.9.4b-gcc44.patch
===================================================================
--- hplip-3.9.4b-gcc44.patch	2009-09-04 15:50:35 UTC (rev 51025)
+++ hplip-3.9.4b-gcc44.patch	2009-09-04 15:51:55 UTC (rev 51026)
@@ -1,36 +0,0 @@
-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;