rpms/centericq/devel centericq-kkconsui.patch, 1.2, 1.3 centericq-src.patch, 1.3, 1.4 centericq.spec, 1.16, 1.17
Andreas Bierfert (awjb)
fedora-extras-commits at redhat.com
Mon May 30 08:24:40 UTC 2005
Author: awjb
Update of /cvs/extras/rpms/centericq/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14736
Modified Files:
centericq-kkconsui.patch centericq-src.patch centericq.spec
Log Message:
- cleanup x86_64 patches
centericq-kkconsui.patch:
Index: centericq-kkconsui.patch
===================================================================
RCS file: /cvs/extras/rpms/centericq/devel/centericq-kkconsui.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- centericq-kkconsui.patch 26 May 2005 20:47:07 -0000 1.2
+++ centericq-kkconsui.patch 30 May 2005 08:24:38 -0000 1.3
@@ -1,16 +1,16 @@
---- kkconsui-0.1/src/texteditor.cc.orig 2003-09-09 23:51:33.000000000 +0200
-+++ kkconsui-0.1/src/texteditor.cc 2005-05-26 22:30:27.000000000 +0200
+--- 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 *(size_t *) p1 != (size_t) p2;
++ return *(intptr_t *) p1 != (intptr_t) p2;
}
int texteditor::findhighline(void *p1, void *p2) {
- return *(int *) p1 != ((highline *) p2)->line;
-+ return *(size_t *) p1 != ((highline *) p2)->line;
++ return *(intptr_t *) p1 != ((highline *) p2)->line;
}
void texteditor::shiftmarkedblock(int delta) {
centericq-src.patch:
Index: centericq-src.patch
===================================================================
RCS file: /cvs/extras/rpms/centericq/devel/centericq-src.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- centericq-src.patch 29 May 2005 22:44:03 -0000 1.3
+++ centericq-src.patch 30 May 2005 08:24:38 -0000 1.4
@@ -1,11 +1,11 @@
---- src/icqdialogs.cc.orig 2005-05-29 22:41:50.000000000 +0200
-+++ src/icqdialogs.cc 2005-05-29 22:45:10.000000000 +0200
+--- 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) ((size_t) m.getref(i-1));
++ if(i) f = (unsigned short) ((intptr_t) m.getref(i-1));
}
void icqface::selectlanguage(unsigned short &f) {
@@ -14,7 +14,7 @@
m.close();
- if(i) f = (imgender) ((int) m.getref(i-1));
-+ if(i) f = (imgender) ((size_t) m.getref(i-1));
++ if(i) f = (imgender) ((intptr_t) m.getref(i-1));
}
void icqface::selectagerange(ICQ2000::AgeRange &r) {
@@ -23,7 +23,7 @@
m.close();
- if(i) r = (ICQ2000::AgeRange) ((int) m.getref(i-1));
-+ if(i) r = (ICQ2000::AgeRange) ((size_t) m.getref(i-1));
++ if(i) r = (ICQ2000::AgeRange) ((intptr_t) m.getref(i-1));
}
bool icqface::edit(string &txt, const string &header) {
@@ -32,7 +32,7 @@
void *p;
finished = !db.open(n, b, &p);
- i = (int) p;
-+ i = (size_t) p;
++ i = (intptr_t) p;
if(!finished)
switch(b) {
@@ -41,18 +41,18 @@
if(!db.gettree()->isnode(db.gettree()->getid(np-1)))
- it = transfers.begin() + (int) db.getmenu()->getref(n-1);
-+ it = transfers.begin() + (size_t) 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 00:41:29.000000000 +0200
-+++ src/icqface.cc 2005-05-30 00:42:06.000000000 +0200
+--- 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 = (size_t) m.getref(m.open()-1);
++ i = (intptr_t) m.getref(m.open()-1);
m.close();
if(i) lastr = i;
@@ -61,7 +61,7 @@
if(i) {
lastitem = i-1;
- r = (int) m.getref(lastitem);
-+ r = (size_t) m.getref(lastitem);
++ r = (intptr_t) m.getref(lastitem);
}
return r;
@@ -70,7 +70,7 @@
}
- if((unsigned int) c < 100) c = 0;
-+ if((unsigned int)((size_t) c) < 100) c = 0;
++ if((uintptr_t)c < 100) c = 0;
if(i) {
switch(action = extk) {
@@ -79,7 +79,7 @@
i = m.open();
- choice = (int) m.getref(i-1);
-+ choice = (size_t) m.getref(i-1);
++ choice = (intptr_t) m.getref(i-1);
m.close();
}
@@ -88,7 +88,7 @@
if(r = i) {
- st = (imstatus) ((int) m.getref(i-1));
-+ st = (imstatus) ((size_t) m.getref(i-1));
++ st = (imstatus) ((intptr_t) m.getref(i-1));
}
}
@@ -97,7 +97,7 @@
}
- if((unsigned int) c > 100) {
-+ if((unsigned int)((size_t) c) > 100) {
++ if((uintptr_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.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- centericq.spec 29 May 2005 22:34:52 -0000 1.16
+++ centericq.spec 30 May 2005 08:24:38 -0000 1.17
@@ -1,6 +1,6 @@
Name: centericq
Version: 4.20.0
-Release: 9
+Release: 10
Summary: Text mode menu- and window-driven IM
@@ -60,6 +60,10 @@
%{_mandir}/man1/*
%changelog
+* Mon May 30 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+4.20.0-10
+- cleanup the x86_64 build fixes...
+
* Sun May 29 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
4.20.0-9
- hopefully the last x86_64 build fixes...
More information about the fedora-extras-commits
mailing list