rpms/centericq/devel centericq-src.patch, 1.1, 1.2 centericq.spec, 1.15, 1.16

[Andreas Bierfert (awjb)]

Author: awjb

Update of /cvs/extras/rpms/centericq/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1062

Modified Files:
	centericq-src.patch centericq.spec 
Log Message:
- hopefully last x86_64 build fixes


centericq-src.patch:

Index: centericq-src.patch
===================================================================
RCS file: /cvs/extras/rpms/centericq/devel/centericq-src.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- centericq-src.patch	29 May 2005 20:49:15 -0000	1.1
+++ centericq-src.patch	29 May 2005 22:34:52 -0000	1.2
@@ -45,3 +45,59 @@
  
  	    switch(b) {
  		case 0:
+--- src/icqface.cc.orig	2005-02-03 00:26:11.000000000 +0100
++++ src/icqface.cc	2005-05-30 00:28:16.000000000 +0200
+@@ -392,7 +392,7 @@
+ 
+     m.scale();
+     m.idle = &menuidle;
+-    i = (int) m.getref(m.open()-1);
++    i = (size_t) m.getref(m.open()-1);
+     m.close();
+ 
+     if(i) lastr = i;
+@@ -441,7 +441,7 @@
+ 
+     if(i) {
+ 	lastitem = i-1;
+-	r = (int) m.getref(lastitem);
++	r = (size_t) m.getref(lastitem);
+     }
+ 
+     return r;
+@@ -467,7 +467,7 @@
+ 	    g = 0;
+ 	}
+ 	
+-	if((unsigned int) c < 100) c = 0;
++	if(unsigned int)((size_t) c) < 100) c = 0;
+ 
+ 	if(i) {
+ 	    switch(action = extk) {
+@@ -1430,7 +1430,7 @@
+ 	m.scale();
+ 
+ 	i = m.open();
+-	choice = (int) m.getref(i-1);
++	choice = (size_t) m.getref(i-1);
+ 
+ 	m.close();
+     }
+@@ -1485,7 +1485,7 @@
+ 	m.close();
+ 
+ 	if(r = i) {
+-	    st = (imstatus) ((int) m.getref(i-1));
++	    st = (imstatus) ((size_t) m.getref(i-1));
+ 	}
+     }
+ 
+@@ -2078,7 +2078,7 @@
+ 			    c = (icqcontact *) cm->getref(i);
+ 			}
+ 
+-			if((unsigned int) c > 100) {
++			if((unsigned int)((size_t) c) > 100) {
+ 			    string current = c->getdispnick();
+ 			    len = current.size();
+ 			    if(len > nick.size()) len = nick.size();


Index: centericq.spec
===================================================================
RCS file: /cvs/extras/rpms/centericq/devel/centericq.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- centericq.spec	29 May 2005 20:49:15 -0000	1.15
+++ centericq.spec	29 May 2005 22:34:52 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           centericq
 Version:        4.20.0
-Release:        8
+Release:        9
 
 Summary:        Text mode menu- and window-driven IM
 
@@ -61,6 +61,10 @@
 
 %changelog
 * Sun May 29 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+4.20.0-9
+- hopefully the last x86_64 build fixes...
+
+* Sun May 29 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 4.20.0-8
 - and again more size_t fixes in src