Fix build with gcc4.2

4 files changed, 146 insertions, 8 deletions

diff --git a/net-im/centericq/files/patch-kkconsui-0.1_src_texteditor.cc b/net-im/centericq/files/patch-kkconsui-0.1_src_texteditor.cc
index 98728fd5ec68..73373cc7a75f 100644
--- a/net-im/centericq/files/patch-kkconsui-0.1_src_texteditor.cc
+++ b/net-im/centericq/files/patch-kkconsui-0.1_src_texteditor.cc
@@ -1,5 +1,8 @@
---- kkconsui-0.1/src/texteditor.cc.orig	Wed Aug  9 12:23:58 2006
-+++ kkconsui-0.1/src/texteditor.cc	Wed Aug  9 12:24:17 2006
+
+$FreeBSD$
+
+--- kkconsui-0.1/src/texteditor.cc.orig
++++ kkconsui-0.1/src/texteditor.cc
 @@ -106,7 +106,7 @@
  	fread(p, st.st_size, 1, f);
  	p[st.st_size] = 0;
@@ -65,3 +68,12 @@
  		} else {
  		    if(next) nextlen = strlen(next); else nextlen = 0;
  		    char *newline = new char[nextlen+strlen(p)+1];
+@@ -1940,7 +1940,7 @@
+ }
+ 
+ int texteditor::findint(void *p1, void *p2) {
+-    return *(int *) p1 != (int) p2;
++    return *(int *) p1 != (intptr_t) p2;
+ }
+ 
+ int texteditor::findhighline(void *p1, void *p2) {
diff --git a/net-im/centericq/files/patch-kkstrtext-0.1_kkstrtext.cc b/net-im/centericq/files/patch-kkstrtext-0.1_kkstrtext.cc
index 10cd48931fd7..6cf4c4d43ac0 100644
--- a/net-im/centericq/files/patch-kkstrtext-0.1_kkstrtext.cc
+++ b/net-im/centericq/files/patch-kkstrtext-0.1_kkstrtext.cc
@@ -1,5 +1,8 @@
---- kkstrtext-0.1/kkstrtext.cc.orig	Wed Aug  9 10:44:43 2006
-+++ kkstrtext-0.1/kkstrtext.cc	Wed Aug  9 10:50:27 2006
+
+$FreeBSD$
+
+--- kkstrtext-0.1/kkstrtext.cc.orig
++++ kkstrtext-0.1/kkstrtext.cc
 @@ -154,7 +154,7 @@
      string r;
      char *buf = (char *) utf8_to_str(text.c_str());
@@ -27,6 +30,24 @@
  }
  
  void nothingfree(void *p) {
+@@ -431,7 +431,7 @@
+ }
+ 
+ int intcompare(void *s1, void *s2) {
+-    return (int) s1 != (int) s2;
++    return (intptr_t) s1 != (intptr_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(((intptr_t) cd) != -1) {
+ 	string r, text(atext);
+ 	size_t inleft, outleft, soutleft;
+ 	char *inbuf, *outbuf, *sinbuf, *soutbuf;
 @@ -907,8 +907,8 @@
  	    r += soutbuf;
  	    text.erase(0, text.size()-inleft);
diff --git a/net-im/centericq/files/patch-src_icqdialogs.cc b/net-im/centericq/files/patch-src_icqdialogs.cc
index 626a9f15bb9f..34fc6d081b8c 100644
--- a/net-im/centericq/files/patch-src_icqdialogs.cc
+++ b/net-im/centericq/files/patch-src_icqdialogs.cc
@@ -1,5 +1,8 @@
---- src/icqdialogs.cc	Fri Aug 18 04:42:04 2006
-+++ src/icqdialogs.cc.new	Fri Aug 18 04:44:07 2006
+
+$FreeBSD$
+
+--- src/icqdialogs.cc.orig
++++ src/icqdialogs.cc
 @@ -210,17 +210,17 @@
      switch(subj) {
  	case fsuser:
@@ -21,3 +24,48 @@
  	    break;
      }
  
+@@ -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) {
+@@ -1256,7 +1256,7 @@
+ 
+ 	void *p;
+ 	finished = !db.open(n, b, &p);
+-	i = (int) p;
++	i = (intptr_t) p;
+ 
+ 	if(!finished)
+ 	switch(b) {
+@@ -1750,7 +1750,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:
diff --git a/net-im/centericq/files/patch-src_icqface.cc b/net-im/centericq/files/patch-src_icqface.cc
index 8aef8e89ba5a..b21b48418e3a 100644
--- a/net-im/centericq/files/patch-src_icqface.cc
+++ b/net-im/centericq/files/patch-src_icqface.cc
@@ -1,5 +1,53 @@
---- src/icqface.cc.orig	Wed Aug  9 10:43:40 2006
-+++ src/icqface.cc	Wed Aug  9 10:44:14 2006
+
+$FreeBSD$
+
+--- src/icqface.cc.orig
++++ src/icqface.cc
+@@ -401,7 +401,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;
+@@ -450,7 +450,7 @@
+ 
+     if(i) {
+ 	lastitem = i-1;
+-	r = (int) m.getref(lastitem);
++	r = (intptr_t) m.getref(lastitem);
+     }
+ 
+     return r;
+@@ -513,7 +513,7 @@
+ 	    g = 0;
+ 	}
+ 	
+-	if((unsigned int) c < 100) c = 0;
++	if((intptr_t) c < 100) c = 0;
+ 
+ 	if(i) {
+ 	    switch(action = extk) {
+@@ -1484,7 +1484,7 @@
+ 	m.scale();
+ 
+ 	i = m.open();
+-	choice = (int) m.getref(i-1);
++	choice = (intptr_t) m.getref(i-1);
+ 
+ 	m.close();
+     }
+@@ -1539,7 +1539,7 @@
+ 	m.close();
+ 
+ 	if(r = i) {
+-	    st = (imstatus) ((int) m.getref(i-1));
++	    st = (imstatus) ((intptr_t) m.getref(i-1));
+ 	}
+     }
+ 
 @@ -2003,7 +2003,7 @@
  	    mvaddchnstr(i-1, sizeWArea.x1+1, logline, sizeWArea.x2-sizeWArea.x1);
  	}
@@ -9,3 +57,12 @@
  
  	if(text.size() > sizeWArea.x2-sizeWArea.x1-2) text.resize(sizeWArea.x2-sizeWArea.x1-2);
  	mvhline(LINES-3, sizeWArea.x1+2, ' ', sizeWArea.x2-sizeWArea.x1-2);
+@@ -2132,7 +2132,7 @@
+ 			    c = (icqcontact *) cm->getref(i);
+ 			}
+ 
+-			if((unsigned int) c > 100) {
++			if((intptr_t) c > 100) {
+ 			    string current = c->getdispnick();
+ 			    len = current.size();
+ 			    if(len > nick.size()) len = nick.size();