Fix compilation with gcc-4 on 64bit platforms. Patch by Dario Birtic <dariobirtic AT gmx DOT net>; bug #112130

(Portage version: 2.1_pre3-r1)

4 files changed, 79 insertions, 8 deletions

diff --git a/net-print/hpijs/ChangeLog b/net-print/hpijs/ChangeLog
index f467252f5310..b85282c2a5da 100644
--- a/net-print/hpijs/ChangeLog
+++ b/net-print/hpijs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-print/hpijs
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hpijs/ChangeLog,v 1.42 2005/12/23 10:21:05 corsair Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-print/hpijs/ChangeLog,v 1.43 2006/01/03 01:53:53 halcy0n Exp $
+
+  03 Jan 2006; Mark Loeser <halcy0n@gentoo.org>
+  files/hpijs-1.7.1-gcc4.patch:
+  Fix compilation with gcc-4 on 64bit platforms. Patch by Dario Birtic
+  <dariobirtic AT gmx DOT net>; bug #112130
 
   23 Dec 2005; Markus Rothe <corsair@gentoo.org> hpijs-1.7.1.ebuild:
   Added ~ppc64
diff --git a/net-print/hpijs/Manifest b/net-print/hpijs/Manifest
index 5f7231cf46aa..9c5d8079e964 100644
--- a/net-print/hpijs/Manifest
+++ b/net-print/hpijs/Manifest
@@ -1,9 +1,9 @@
 MD5 a4d8ebe67a420a9a244316b84e1d51f3 ChangeLog 4489
-MD5 29c3dda867492a08ea041bbc009fbece hpijs-1.5.ebuild 2072
-MD5 d9cc65dd79ad59f29206a59579c7a72d hpijs-1.7.1.ebuild 2210
-MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
 MD5 4a45d7f2afffa6ae0b5a8c27d7608ddc files/digest-hpijs-1.5 143
-MD5 001779aa38e92ba16c9ee47f6c0051d9 files/digest-hpijs-1.7.1 144
+MD5 d28dee7fe153d24f8e1291eae3c32ebf files/digest-hpijs-1.7.1 144
 MD5 153b11771cdc5889cbe726925c862292 files/hpijs-1.4.1-rss.1.patch 6182
 MD5 f332f0c4b395ed9a2c8d89cf38787447 files/hpijs-1.5-gcc34.patch 1482
-MD5 b4f87a9b64a8c5dc510112a789429ea9 files/hpijs-1.7.1-gcc4.patch 348
+MD5 fc04360159f7f34bb7c13dca60aa9372 files/hpijs-1.7.1-gcc4.patch 2843
+MD5 29c3dda867492a08ea041bbc009fbece hpijs-1.5.ebuild 2072
+MD5 d9cc65dd79ad59f29206a59579c7a72d hpijs-1.7.1.ebuild 2210
+MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
diff --git a/net-print/hpijs/files/digest-hpijs-1.7.1 b/net-print/hpijs/files/digest-hpijs-1.7.1
index 863da82ec5d5..f0a514c44d06 100644
--- a/net-print/hpijs/files/digest-hpijs-1.7.1
+++ b/net-print/hpijs/files/digest-hpijs-1.7.1
@@ -1,2 +1,2 @@
-MD5 cba40858e27204db0211c559bd606aaa hpijs-1.7.1.tar.gz 845193
 MD5 08810fcea2e65afd4f2ca90d8dc1ee25 foomatic-db-hpijs-1.5-20041220.tar.gz 86491
+MD5 cba40858e27204db0211c559bd606aaa hpijs-1.7.1.tar.gz 845193
diff --git a/net-print/hpijs/files/hpijs-1.7.1-gcc4.patch b/net-print/hpijs/files/hpijs-1.7.1-gcc4.patch
index 47c16ca3b9fb..ec162f0c5165 100644
--- a/net-print/hpijs/files/hpijs-1.7.1-gcc4.patch
+++ b/net-print/hpijs/files/hpijs-1.7.1-gcc4.patch
@@ -9,3 +9,69 @@ diff -ur hpijs-1.7.1-orig/printerproxy.h hpijs-1.7.1/printerproxy.h
  
  
  //PrinterProxy
+--- hpijs-1.7.1-orig/ljcolor.cpp.orig 2005-11-11 02:03:26.000000000 +0100
++++ hpijs-1.7.1/ljcolor.cpp 2005-11-11 02:04:11.000000000 +0100
+@@ -286,7 +286,7 @@
+ 
+     if (thePrinter->IOMode.bStatus)
+     {
+-        sprintf (res, "@PJL JOB NAME = \"%d\"\015\012", (int) (thePrinter));
++        sprintf (res, "@PJL JOB NAME = \"%ld\"\015\012", (long) (thePrinter));
+         err = thePrinter->Send ((const BYTE *) res, strlen (res));
+         ERRCHECK;
+     }
+@@ -396,8 +396,8 @@
+     DRIVER_ERROR    err = NO_ERROR;
+     if (thePrinter->IOMode.bStatus)
+     {
+-        sprintf (szBuff, "\033E\033%%-12345X@PJL EOJ NAME = \"%d\"\015\012@PJL RESET\015\012",
+-                 (int) (thePrinter));
++        sprintf (szBuff, "\033E\033%%-12345X@PJL EOJ NAME = \"%ld\"\015\012@PJL RESET\015\012",
++                 (long) (thePrinter));
+         err = thePrinter->Send ((const BYTE *) szBuff, strlen (szBuff));
+         ERRCHECK;
+     }
+@@ -575,8 +575,8 @@
+         tmpStr += 6;
+         while (*tmpStr < '0' || *tmpStr > '9')
+             tmpStr++;
+-        sscanf (tmpStr, "%d", &iErrorCode);
+-        if (iErrorCode != (int) (this))
++        sscanf (tmpStr, "%ld", &iErrorCode);
++        if (iErrorCode != (long) (this))
+             return DISPLAY_PRINTING;
+     }
+ 
+--- hpijs-1.7.1-orig/ljmono.cpp	2004-10-15 01:08:51.000000000 +0200
++++ hpijs-1.7.1/ljmono.cpp	2005-11-11 02:02:22.000000000 +0100
+@@ -185,7 +185,7 @@
+ 
+     if (thePrinter->IOMode.bStatus)
+     {
+-        sprintf (res, "@PJL JOB NAME = \"%d\"\015\012", (int) (thePrinter));
++        sprintf (res, "@PJL JOB NAME = \"%ld\"\015\012", (long) (thePrinter));
+         err = thePrinter->Send ((const BYTE *) res, strlen (res));
+         ERRCHECK;
+ 
+@@ -270,8 +270,8 @@
+     DRIVER_ERROR    err = NO_ERROR;
+     if (thePrinter->IOMode.bStatus)
+     {
+-        sprintf (szBuff, "\033E\033%%-12345X@PJL EOJ NAME = \"%d\"\015\012@PJL RESET\015\012",
+-                (int) (thePrinter));
++        sprintf (szBuff, "\033E\033%%-12345X@PJL EOJ NAME = \"%ld\"\015\012@PJL RESET\015\012",
++                (long) (thePrinter));
+         err = thePrinter->Send ((const BYTE *) szBuff, strlen (szBuff));
+     }
+ 
+@@ -340,8 +340,8 @@
+         tmpStr += 6;
+         while (*tmpStr < '0' || *tmpStr > '9')
+             tmpStr++;
+-        sscanf (tmpStr, "%d", &iErrorCode);
+-        if (iErrorCode != (int) (this))
++        sscanf (tmpStr, "%ld", &iErrorCode);
++        if (iErrorCode != (long) (this))
+             return DISPLAY_PRINTING;
+     }
+