rpms/centericq/FC-3 centericq-kkconsui.patch, NONE, 1.1 centericq-kkstrtext.patch, NONE, 1.1 centericq-libyahoo.patch, NONE, 1.1 centericq-src.patch, NONE, 1.1

[Andreas Bierfert (awjb)]

Author: awjb

Update of /cvs/extras/rpms/centericq/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4114

Added Files:
	centericq-kkconsui.patch centericq-kkstrtext.patch 
	centericq-libyahoo.patch centericq-src.patch 
Log Message:
- forgot about patches


centericq-kkconsui.patch:

--- NEW FILE centericq-kkconsui.patch ---
--- kkconsui-0.1/src/texteditor.cc.orig	2005-05-30 10:07:58.000000000 +0200
+++ kkconsui-0.1/src/texteditor.cc	2005-05-30 10:09:38.000000000 +0200
@@ -1940,11 +1940,11 @@
 }
 
 int texteditor::findint(void *p1, void *p2) {
-    return *(int *) p1 != (int) p2;
+    return *(intptr_t *) p1 != (intptr_t) p2;
 }
 
 int texteditor::findhighline(void *p1, void *p2) {
-    return *(int *) p1 != ((highline *) p2)->line;
+    return *(intptr_t *) p1 != ((highline *) p2)->line;
 }
 
 void texteditor::shiftmarkedblock(int delta) {

centericq-kkstrtext.patch:

--- NEW FILE centericq-kkstrtext.patch ---
--- kkstrtext-0.1/kkstrtext.cc.orig	2005-05-29 09:23:07.000000000 +0200
+++ kkstrtext-0.1/kkstrtext.cc	2005-05-29 09:27:51.000000000 +0200
@@ -431,7 +431,7 @@
 }
 
 int intcompare(void *s1, void *s2) {
-    return (int) s1 != (int) s2;
+    return (size_t) s1 != (size_t) s2;
 }
 
 string i2str(int i) {
@@ -885,7 +885,7 @@
 #ifdef HAVE_ICONV
     iconv_t cd = iconv_open(tocs.c_str(), fromcs.c_str());
 
-    if(((int) cd) != -1) {
+    if(((size_t) cd) != -1) {
 	string r, text(atext);
 	size_t inleft, outleft, soutleft;
 	char *inbuf, *outbuf, *sinbuf, *soutbuf;

centericq-libyahoo.patch:

--- NEW FILE centericq-libyahoo.patch ---
--- libyahoo2-0.1/yahoo_util.h.orig	2005-05-23 21:07:43.000000000 +0200
+++ libyahoo2-0.1/yahoo_util.h	2005-05-23 21:30:10.000000000 +0200
@@ -68,10 +68,6 @@
 int strcasecmp(const char * s1, const char * s2);
 
 //char * strdup(const char *s);
-
-int snprintf(char *str, size_t size, const char *format, ...);
-int vsnprintf(char *str, size_t size, const char *format, va_list ap);
-
 #endif
 
 #ifndef TRUE

centericq-src.patch:

--- NEW FILE centericq-src.patch ---
--- src/icqdialogs.cc.orig	2005-05-30 10:16:12.000000000 +0200
+++ src/icqdialogs.cc	2005-05-30 10:18:08.000000000 +0200
@@ -894,7 +894,7 @@
     i = m.open();
     m.close();
 
-    if(i) f = (unsigned short) ((int) m.getref(i-1));
+    if(i) f = (unsigned short) ((intptr_t) m.getref(i-1));
 }
 
 void icqface::selectlanguage(unsigned short &f) {
@@ -946,7 +946,7 @@
     int i = m.open();
     m.close();
 
-    if(i) f = (imgender) ((int) m.getref(i-1));
+    if(i) f = (imgender) ((intptr_t) m.getref(i-1));
 }
 
 void icqface::selectagerange(ICQ2000::AgeRange &r) {
@@ -967,7 +967,7 @@
     int i = m.open();
     m.close();
 
-    if(i) r = (ICQ2000::AgeRange) ((int) m.getref(i-1));
+    if(i) r = (ICQ2000::AgeRange) ((intptr_t) m.getref(i-1));
 }
 
 bool icqface::edit(string &txt, const string &header) {
@@ -1254,7 +1254,7 @@
 
 	void *p;
 	finished = !db.open(n, b, &p);
-	i = (int) p;
+	i = (intptr_t) p;
 
 	if(!finished)
 	switch(b) {
@@ -1745,7 +1745,7 @@
 	    it = transfers.end();
 
 	    if(!db.gettree()->isnode(db.gettree()->getid(np-1)))
-		it = transfers.begin() + (int) db.getmenu()->getref(n-1);
+		it = transfers.begin() + (intptr_t) db.getmenu()->getref(n-1);
 
 	    switch(b) {
 		case 0:
--- src/icqface.cc.orig	2005-05-30 10:18:23.000000000 +0200
+++ src/icqface.cc	2005-05-30 10:22:18.000000000 +0200
@@ -392,7 +392,7 @@
 
     m.scale();
     m.idle = &menuidle;
-    i = (int) m.getref(m.open()-1);
+    i = (intptr_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 = (intptr_t) m.getref(lastitem);
     }
 
     return r;
@@ -467,7 +467,7 @@
 	    g = 0;
 	}
 	
-	if((unsigned int) c < 100) c = 0;
+	if((uintptr_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 = (intptr_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) ((intptr_t) m.getref(i-1));
 	}
     }
 
@@ -2078,7 +2078,7 @@
 			    c = (icqcontact *) cm->getref(i);
 			}
 
-			if((unsigned int) c > 100) {
+			if((uintptr_t)c > 100) {
 			    string current = c->getdispnick();
 			    len = current.size();
 			    if(len > nick.size()) len = nick.size();