Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 98209 Details for
Bug 149276
centericq-4.21.0-r2 fails to emerge
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
this fixes the
centericq-4.21.0-intptr_t.diff (text/plain), 7.14 KB, created by
Martin Ostrica
on 2006-09-27 03:09:36 UTC
(
hide
)
Description:
this fixes the
Filename:
MIME Type:
Creator:
Martin Ostrica
Created:
2006-09-27 03:09:36 UTC
Size:
7.14 KB
patch
obsolete
>diff -Nuar ./centericq-4.21.0-r2/work/centericq-4.21.0/kkconsui-0.1/src/texteditor.cc ./centericq-4.21.0-r3/work/centericq-4.21.0/kkconsui-0.1/src/texteditor.cc >--- ./centericq-4.21.0-r2/work/centericq-4.21.0/kkconsui-0.1/src/texteditor.cc 2003-09-09 23:51:33.000000000 +0200 >+++ ./centericq-4.21.0-r3/work/centericq-4.21.0/kkconsui-0.1/src/texteditor.cc 2006-09-27 11:51:55.000000000 +0200 >@@ -1721,7 +1721,7 @@ > else f = strstr(p+plus, needle); > > if(f) { >- *col = (int) (f-p); >+ *col = (intptr_t) (f-p); > *line = i; > return true; > } >@@ -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 -Nuar ./centericq-4.21.0-r2/work/centericq-4.21.0/kkstrtext-0.1/kkstrtext.cc ./centericq-4.21.0-r3/work/centericq-4.21.0/kkstrtext-0.1/kkstrtext.cc >--- ./centericq-4.21.0-r2/work/centericq-4.21.0/kkstrtext-0.1/kkstrtext.cc 2006-09-27 11:53:59.000000000 +0200 >+++ ./centericq-4.21.0-r3/work/centericq-4.21.0/kkstrtext-0.1/kkstrtext.cc 2006-09-27 11:52:14.000000000 +0200 >@@ -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; >diff -Nuar ./centericq-4.21.0-r2/work/centericq-4.21.0/src/icqdialogs.cc ./centericq-4.21.0-r3/work/centericq-4.21.0/src/icqdialogs.cc >--- ./centericq-4.21.0-r2/work/centericq-4.21.0/src/icqdialogs.cc 2006-09-27 11:53:59.000000000 +0200 >+++ ./centericq-4.21.0-r3/work/centericq-4.21.0/src/icqdialogs.cc 2006-09-27 11:52:30.000000000 +0200 >@@ -93,7 +93,7 @@ > dx = (COLS-sizeDlg.width)/2+sizeDlg.width; > dy = (LINES-sizeDlg.height)/2+sizeDlg.height; > >- db.setwindow(new textwindow(dx-(int) (sizeDlg.width*0.6), dy-(int) (sizeDlg.height*0.6), >+ db.setwindow(new textwindow(dx-(intptr_t) (sizeDlg.width*0.6), dy-(intptr_t) (sizeDlg.height*0.6), > dx, dy, conf.getcolor(cp_dialog_frame), 0, conf.getcolor(cp_dialog_highlight), > _(" Search profiles "))); > >@@ -883,7 +883,7 @@ > m.idle = &menuidle; > > for(i = 0; i < abstracthook::Country_table_size; i++) { >- m.additem(0, (int) abstracthook::Country_table[i].code, >+ m.additem(0, (intptr_t) abstracthook::Country_table[i].code, > (string) " " + abstracthook::Country_table[i].name); > > if(abstracthook::Country_table[i].code == f) { >@@ -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) { >@@ -922,7 +922,7 @@ > > m.additemf(" %s", _("none")); > >- for(i = 1; i <= ((int) ICQ2000::GROUP_SEEKINGMEN); i++) { >+ for(i = 1; i <= ((intptr_t) ICQ2000::GROUP_SEEKINGMEN); i++) { > m.additemf(" %s", strrandomgroup(i)); > } > >@@ -939,14 +939,14 @@ > m.idle = &menuidle; > > for(imgender i = genderUnspec; i != imgender_size; i++) { >- m.additemf(0, (int) i, " %s", strgender(i)); >+ m.additemf(0, (intptr_t) i, " %s", strgender(i)); > if(i == f) m.setpos(m.getcount()-1); > } > > 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) { >@@ -960,14 +960,14 @@ > if(i == ICQ2000::RANGE_NORANGE) > p = _("none"); > >- m.additemf(0, (int) i, " %s", p); >+ m.additemf(0, (intptr_t) i, " %s", p); > if(i == r) m.setpos(m.getcount()-1); > } > > 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: >@@ -1806,7 +1806,7 @@ > } > > void icqface::invokelist(string &s, vector<string> &v, const string &def, textwindow *w) { >- int delems = (int) ((w->y2-w->y1)/2); >+ int delems = (intptr_t) ((w->y2-w->y1)/2); > int vmax = v.size() > delems ? delems : v.size(); > if(vmax < 2) return; > vmax++; >diff -Nuar ./centericq-4.21.0-r2/work/centericq-4.21.0/src/icqface.cc ./centericq-4.21.0-r3/work/centericq-4.21.0/src/icqface.cc >--- ./centericq-4.21.0-r2/work/centericq-4.21.0/src/icqface.cc 2006-09-27 11:53:59.000000000 +0200 >+++ ./centericq-4.21.0-r3/work/centericq-4.21.0/src/icqface.cc 2006-09-27 11:52:44.000000000 +0200 >@@ -153,14 +153,14 @@ > sizeBigDlg.width = COLS-10; > sizeBigDlg.height = LINES-7; > >- sizeWArea.x1 = (int) (COLS*0.32); >+ sizeWArea.x1 = (intptr_t) (COLS*0.32); > if(sizeWArea.x1 < 25) > sizeWArea.x1 = 25; > > sizeWArea.x2 = COLS-1; > sizeWArea.y1 = 1; > >- sizeWArea.y2 = LINES - ((int) (LINES/4)); >+ sizeWArea.y2 = LINES - ((intptr_t) (LINES/4)); > if(sizeWArea.y2 > LINES-6) > sizeWArea.y2 = LINES-6; > >@@ -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((unsigned intptr_t) c < 100) c = 0; > > if(i) { > switch(action = extk) { >@@ -1075,9 +1075,9 @@ > } else if(c->getdesc() != contactroot) { > int days, hours, minutes, tdiff = timer_current-ls; > >- days = (int) (tdiff/86400); >- hours = (int) ((tdiff-days*86400)/3600); >- minutes = (int) ((tdiff-days*8600-hours*3600)/60); >+ days = (intptr_t) (tdiff/86400); >+ hours = (intptr_t) ((tdiff-days*86400)/3600); >+ minutes = (intptr_t) ((tdiff-days*8600-hours*3600)/60); > > if(days) buf = i2str(days) + " " + _("days"); > >@@ -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)); > } > } > >@@ -2132,7 +2132,7 @@ > c = (icqcontact *) cm->getref(i); > } > >- if((unsigned int) c > 100) { >+ if((unsigned intptr_t) c > 100) { > string current = c->getdispnick(); > len = current.size(); > if(len > nick.size()) len = nick.size(); >@@ -2680,7 +2680,7 @@ > muins.clear(); > muins.push_back(passinfo); > >- chatlines = (int) ((sizeWArea.y2-sizeWArea.y1)*0.75); >+ chatlines = (intptr_t) ((sizeWArea.y2-sizeWArea.y1)*0.75); > // workarealine(sizeWArea.y1+chatlines+1); > > editor.addscheme(cp_main_text, cp_main_text, 0, 0);
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=98209">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 149276
: 98209
