[pkgsrc/trunk]: pkgsrc/misc/kdeutils2 Rename a variable to make this compile ...

[kristerw <kristerw%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/be662e0c31fd
branches:  trunk
changeset: 472333:be662e0c31fd
user:      kristerw <kristerw%pkgsrc.org@localhost>
date:      Thu Apr 08 19:37:19 2004 +0000

description:
Rename a variable to make this compile when using gcc 3.3 too.

diffstat:

 misc/kdeutils2/distinfo         |   3 ++-
 misc/kdeutils2/patches/patch-aj |  28 ++++++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 1 deletions(-)

diffs (46 lines):

diff -r 5760712995dc -r be662e0c31fd misc/kdeutils2/distinfo
--- a/misc/kdeutils2/distinfo   Thu Apr 08 19:17:04 2004 +0000
+++ b/misc/kdeutils2/distinfo   Thu Apr 08 19:37:19 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2002/11/28 03:36:42 markd Exp $
+$NetBSD: distinfo,v 1.9 2004/04/08 19:37:19 kristerw Exp $
 
 SHA1 (kdeutils-2.2.2.tar.bz2) = 3cd4ef2fbe4cf04a9fecc54ab6863f687ee1ae83
 Size (kdeutils-2.2.2.tar.bz2) = 1466910 bytes
@@ -11,3 +11,4 @@
 SHA1 (patch-ag) = d494f9459b903cb1a49633741643b705ae15386a
 SHA1 (patch-ah) = 8a9608147abc72a000f79c4b94402bf57b56ce6f
 SHA1 (patch-ai) = 4608e652bf8d34d1ae7fa90c07d41f691ec7032f
+SHA1 (patch-aj) = 3ebf7c819c801df182e24673cc9461e63c723add
diff -r 5760712995dc -r be662e0c31fd misc/kdeutils2/patches/patch-aj
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/misc/kdeutils2/patches/patch-aj   Thu Apr 08 19:37:19 2004 +0000
@@ -0,0 +1,28 @@
+$NetBSD: patch-aj,v 1.1 2004/04/08 19:37:19 kristerw Exp $
+
+--- klprfax/klprfax/klprfax.cpp.orig   2004-04-08 21:19:09.000000000 +0200
++++ klprfax/klprfax/klprfax.cpp        2004-04-08 21:20:44.000000000 +0200
+@@ -37,7 +37,7 @@
+ AddressBook::ErrorCode err;
+ AddressBook   *bk;
+ int            n,i;
+-QString        name,fax0,fax1,fax2,fax3;
++QString        name2,fax0,fax1,fax2,fax3;
+ QString        nil="";
+ 
+    app=_app;
+@@ -74,12 +74,12 @@
+                      AddressBook::Entry e;
+      err=bk->getKey(i,k);
+      err=bk->getEntry(k,e);
+-     if (NameFax(e,name,fax0,fax1,fax2,fax3)) {klprfax_widget *tmp;
++     if (NameFax(e,name2,fax0,fax1,fax2,fax3)) {klprfax_widget *tmp;
+ 
+       rows+=1;if (rows>=names->numRows()) { names->setNumRows(rows+1); }
+ 
+       tmp=new klprfax_widget(rows,0,names);
+-      tmp->add(name);
++      tmp->add(name2);
+       tmp->commit();
+       tmp->adjustSize();
+       if (tmp->width()>col0) { col0=tmp->widget()->width()+5; }