rpms/centericq/devel centericq-4.9.4-gcc34.patch, NONE, 1.1 centericq.spec, 1.4, 1.5
Michael Schwendt (mschwendt)
fedora-extras-commits at redhat.com
Fri Nov 12 21:50:02 UTC 2004
Changeset from: mschwendt
Update of /cvs/extras/rpms/centericq/devel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv12384
Modified Files:
centericq.spec
Added Files:
centericq-4.9.4-gcc34.patch
Log Message:
Fix build for FC3/GCC 3.4.
centericq-4.9.4-gcc34.patch:
--- NEW FILE centericq-4.9.4-gcc34.patch ---
diff -Nur centericq-4.9.4-orig/libicq2000-0.1/libicq2000/sigslot.h centericq-4.9.4/libicq2000-0.1/libicq2000/sigslot.h
--- centericq-4.9.4-orig/libicq2000-0.1/libicq2000/sigslot.h 2003-04-12 13:28:42.000000000 +0200
+++ centericq-4.9.4/libicq2000-0.1/libicq2000/sigslot.h 2004-11-12 21:17:56.885748800 +0100
@@ -789,8 +789,8 @@
public:
_connection1()
{
- pobject = NULL;
- pmemfun = NULL;
+ this->pobject = NULL;
+ this->pmemfun = NULL;
}
_connection1(dest_type* pobject, void (dest_type::*pmemfun)(arg1_type))
@@ -965,7 +965,7 @@
lock_block<mt_policy> lock(this);
_connection1<dest_type, arg1_type, mt_policy>* conn
= new _connection1<dest_type, arg1_type, mt_policy>(pclass, pmemfun);
- m_connected_slots.push_back(conn);
+ this->m_connected_slots.push_back(conn);
pclass->signal_connect(this);
}
@@ -973,15 +973,15 @@
{
lock_block<mt_policy> lock(this);
_sig_connection1<arg1_type, mt_policy>* conn = new _sig_connection1<arg1_type, mt_policy>(chainsig);
- m_connected_slots.push_back(conn);
+ this->m_connected_slots.push_back(conn);
chainsig.signal_connect(this);
}
void emit(arg1_type a1)
{
lock_block<mt_policy> lock(this);
- typename connections_list::const_iterator itNext, it = m_connected_slots.begin();
- typename connections_list::const_iterator itEnd = m_connected_slots.end();
+ typename _signal_base1<arg1_type, mt_policy>::connections_list::const_iterator itNext, it = this->m_connected_slots.begin();
+ typename _signal_base1<arg1_type, mt_policy>::connections_list::const_iterator itEnd = this->m_connected_slots.end();
while(it != itEnd)
{
@@ -997,8 +997,8 @@
void operator()(arg1_type a1)
{
lock_block<mt_policy> lock(this);
- typename connections_list::const_iterator itNext, it = m_connected_slots.begin();
- typename connections_list::const_iterator itEnd = m_connected_slots.end();
+ typename _signal_base1<arg1_type, mt_policy>::connections_list::const_iterator itNext, it = this->m_connected_slots.begin();
+ typename _signal_base1<arg1_type, mt_policy>::connections_list::const_iterator itEnd =this-> m_connected_slots.end();
while(it != itEnd)
{
diff -Nur centericq-4.9.4-orig/libicq2000-0.1/libicq2000/userinfoconstants.h centericq-4.9.4/libicq2000-0.1/libicq2000/userinfoconstants.h
--- centericq-4.9.4-orig/libicq2000-0.1/libicq2000/userinfoconstants.h 2002-07-15 09:42:58.000000000 +0200
+++ centericq-4.9.4/libicq2000-0.1/libicq2000/userinfoconstants.h 2004-11-12 22:21:59.000000000 +0100
@@ -442,6 +442,8 @@
range_60_above = 6
};
+AgeRange& operator++ (AgeRange& n, int);
+
static const char* const AgeRange_text[] = {
"none",
"18-22",
diff -Nur centericq-4.9.4-orig/libicq2000-0.1/src/userinfohelpers.cpp centericq-4.9.4/libicq2000-0.1/src/userinfohelpers.cpp
--- centericq-4.9.4-orig/libicq2000-0.1/src/userinfohelpers.cpp 2003-04-12 13:28:43.000000000 +0200
+++ centericq-4.9.4/libicq2000-0.1/src/userinfohelpers.cpp 2004-11-12 22:23:57.000000000 +0100
@@ -30,6 +30,11 @@
namespace ICQ2000
{
+ AgeRange& operator++ (AgeRange& n, int)
+ {
+ return n = AgeRange(n+1);
+ }
+
namespace UserInfoHelpers
{
string getSexIDtoString(Sex id)
diff -Nur centericq-4.9.4-orig/src/accountmanager.cc centericq-4.9.4/src/accountmanager.cc
--- centericq-4.9.4-orig/src/accountmanager.cc 2002-12-05 19:04:13.000000000 +0100
+++ centericq-4.9.4/src/accountmanager.cc 2004-11-12 21:17:56.888748344 +0100
@@ -75,7 +75,7 @@
for(fin = false; !fin; ) {
t.clear();
- for(pname = icq; pname != protocolname_size; (int) pname += 1) {
+ for(pname = icq; pname != protocolname_size; pname++ ) {
if(pname != infocard) {
account = conf.getourid(pname);
n = t.addnode(0, 0, 0, " " + conf.getprotocolname(pname) + " ");
diff -Nur centericq-4.9.4-orig/src/centericq.cc centericq-4.9.4/src/centericq.cc
--- centericq-4.9.4-orig/src/centericq.cc 2003-05-06 22:27:27.000000000 +0200
+++ centericq-4.9.4/src/centericq.cc 2004-11-12 21:17:56.893747584 +0100
@@ -67,7 +67,7 @@
if(p)
if(((string) p).substr(0, 2) == "ru")
- for(protocolname pname = icq; pname != protocolname_size; (int) pname += 1)
+ for(protocolname pname = icq; pname != protocolname_size; pname++ )
conf.setrussian(pname, true);
if(updateconf()) {
@@ -112,7 +112,7 @@
r = regmode = true;
- for(pname = icq; pname != protocolname_size; (int) pname += 1) {
+ for(pname = icq; pname != protocolname_size; pname++ ) {
if(!gethook(pname).getCapabs().count(hookcapab::optionalpassword)) {
if(!(ia = conf.getourid(pname)).empty()) {
if(ia.password.empty()) {
@@ -140,7 +140,7 @@
void centericq::inithooks() {
protocolname pname;
- for(pname = icq; pname != protocolname_size; (int) pname += 1) {
+ for(pname = icq; pname != protocolname_size; pname++ ) {
gethook(pname).init();
}
}
@@ -394,7 +394,7 @@
}
if(proceed)
- for(ipname = icq; ipname != protocolname_size; (int) ipname += 1) {
+ for(ipname = icq; ipname != protocolname_size; ipname++ ) {
if(!(ia = conf.getourid(ipname)).empty())
if((pname == proto_all) || (ipname == pname)) {
abstracthook &hook = gethook(ipname);
@@ -706,7 +706,7 @@
protocolname pname;
icqconf::imaccount ia;
- for(pname = icq; pname != protocolname_size; (int) pname += 1) {
+ for(pname = icq; pname != protocolname_size; pname++ ) {
ia = conf.getourid(pname);
if(!ia.empty()) {
@@ -719,7 +719,7 @@
f >> cst, f.close(), f.clear();
unlink(fname.c_str());
- for(st = offline; st != imstatus_size; (int) st += 1) {
+ for(st = offline; st != imstatus_size; st++ ) {
if(imstatus2char[st] == cst) {
gethook(pname).setstatus(st);
break;
@@ -1167,7 +1167,7 @@
if(!regmode) {
exectimers();
- for(pname = icq; pname != protocolname_size; (int) pname += 1) {
+ for(pname = icq; pname != protocolname_size; pname++ ) {
abstracthook &hook = gethook(pname);
if(hook.online()) {
@@ -1186,7 +1186,7 @@
keypressed = true;
time(&timer_keypress);
} else {
- for(pname = icq; pname != protocolname_size; (int) pname += 1) {
+ for(pname = icq; pname != protocolname_size; pname++ ) {
abstracthook &hook = gethook(pname);
if(hook.online())
@@ -1216,7 +1216,7 @@
nautoset = false;
}
- for(pname = icq; pname != protocolname_size; (int) pname += 1) {
+ for(pname = icq; pname != protocolname_size; pname++ ) {
abstracthook &hook = gethook(pname);
stcurrent = hook.getstatus();
@@ -1272,7 +1272,7 @@
*
*/
- for(pname = icq; pname != protocolname_size; (int) pname += 1) {
+ for(pname = icq; pname != protocolname_size; pname++ ) {
if(!conf.getourid(pname).empty()) {
abstracthook &hook = gethook(pname);
@@ -1368,7 +1368,7 @@
if(!conf.enoughdiskspace()) {
if(fonline) {
- for(pname = icq; pname != protocolname_size; (int) pname += 1)
+ for(pname = icq; pname != protocolname_size; pname++ )
gethook(pname).disconnect();
face.log(_("! free disk space is less than 10k, going offline"));
diff -Nur centericq-4.9.4-orig/src/hooks/abstracthook.cc centericq-4.9.4/src/hooks/abstracthook.cc
--- centericq-4.9.4-orig/src/hooks/abstracthook.cc 2003-05-06 22:27:28.000000000 +0200
+++ centericq-4.9.4/src/hooks/abstracthook.cc 2004-11-12 21:31:18.000000000 +0100
@@ -62,7 +62,7 @@
void abstracthook::setstatus(imstatus st) {
setautostatus(manualstatus = st);
- for(protocolname pname = icq; pname != protocolname_size; (int) pname += 1) {
+ for(protocolname pname = icq; pname != protocolname_size; pname++ ) {
if(&gethook(pname) == this) {
conf.savestatus(pname, manualstatus);
break;
diff -Nur centericq-4.9.4-orig/src/icqconf.cc centericq-4.9.4/src/icqconf.cc
--- centericq-4.9.4-orig/src/icqconf.cc 2003-05-09 15:13:49.000000000 +0200
+++ centericq-4.9.4/src/icqconf.cc 2004-11-12 22:04:26.000000000 +0100
@@ -51,7 +51,7 @@
savepwd = mailcheck = fenoughdiskspace = logtyping = true;
- for(protocolname pname = icq; pname != protocolname_size; (int) pname += 1) {
+ for(protocolname pname = icq; pname != protocolname_size; pname++) {
chatmode[pname] = true;
russian[pname] = false;
}
@@ -126,7 +126,7 @@
bool same = true;
string allmsg;
- for(protocolname ipname = icq; ipname != protocolname_size && same; (int) ipname += 1) {
+ for(protocolname ipname = icq; ipname != protocolname_size && same; ipname++) {
if(!getourid(ipname).empty()) {
buf = getawaymsg(ipname);
if(!buf.empty()) {
@@ -240,7 +240,7 @@
ptpmin = atoi(getword(buf, "-").c_str());
ptpmax = atoi(buf.c_str());
} else {
- for(pname = icq; pname != protocolname_size; (int) pname += 1) {
+ for(pname = icq; pname != protocolname_size; pname++) {
buf = getprotocolname(pname);
if(param.substr(0, buf.size()) == buf) {
im = getourid(pname);
@@ -284,7 +284,7 @@
param = "";
- for(protocolname pname = icq; pname != protocolname_size; (int) pname += 1)
+ for(protocolname pname = icq; pname != protocolname_size; pname++)
if(getchatmode(pname)) param += (string) " " + conf.getprotocolname(pname);
if(!param.empty())
@@ -292,7 +292,7 @@
param = "";
- for(protocolname pname = icq; pname != protocolname_size; (int) pname += 1)
+ for(protocolname pname = icq; pname != protocolname_size; pname++)
if(getrussian(pname)) param += (string) " " + conf.getprotocolname(pname);
if(!param.empty())
@@ -395,7 +395,7 @@
for(i = 0; i < clist.count; i++) {
c = (icqcontact *) clist.at(i);
- for(it = imevent::message; it != imevent::imeventtype_size; (int) it += 1) {
+ for(it = imevent::message; it != imevent::imeventtype_size; it++) {
c->setsound(it, "");
}
}
@@ -473,7 +473,7 @@
imcontact ic;
protocolname pname;
- for(pname = icq; pname != protocolname_size && skey != getprotocolname(pname); (int) pname += 1);
+ for(pname = icq; pname != protocolname_size && skey != getprotocolname(pname); pname++);
if(pname != protocolname_size) {
if(pname == icq) ic = imcontact(strtoul(suin.c_str(), 0, 0), pname);
@@ -717,7 +717,7 @@
if((ia = a.additional.find("status")) != a.additional.end()) {
if(!ia->second.empty()) {
- for(st = offline; st != imstatus_size && imstatus2char[st] != ia->second[0]; (int) st += 1);
+ for(st = offline; st != imstatus_size && imstatus2char[st] != ia->second[0]; st++);
if(st == imstatus_size) st = available;
}
}
@@ -845,7 +845,7 @@
} else {
protocolname pname;
- for(pname = icq; pname != protocolname_size; (int) pname += 1) {
+ for(pname = icq; pname != protocolname_size; pname++) {
if(getprotocolname(pname) == proto) {
cdest = imcontact(dest, pname);
break;
@@ -910,11 +910,11 @@
int rpid;
if(st) {
- for(pname = icq; pname != protocolname_size; (int) pname += 1)
+ for(pname = icq; pname != protocolname_size; pname++)
if(getprotocolname(pname) == proto)
break;
- for(imst = offline; imst != imstatus_size; (int) imst += 1)
+ for(imst = offline; imst != imstatus_size; imst++)
if(imstatus2char[imst] == st)
break;
@@ -981,11 +981,11 @@
string w;
protocolname pname;
- for(pname = icq; pname != protocolname_size; (int) pname += 1)
+ for(pname = icq; pname != protocolname_size; pname++)
p[pname] = buf.empty();
while(!(w = getword(buf)).empty()) {
- for(pname = icq; pname != protocolname_size; (int) pname += 1) {
+ for(pname = icq; pname != protocolname_size; pname++) {
if(getprotocolname(pname) == w) {
p[pname] = true;
break;
diff -Nur centericq-4.9.4-orig/src/icqcontact.cc centericq-4.9.4/src/icqcontact.cc
--- centericq-4.9.4-orig/src/icqcontact.cc 2002-12-15 22:02:11.000000000 +0100
+++ centericq-4.9.4/src/icqcontact.cc 2004-11-12 22:26:19.000000000 +0100
@@ -33,6 +33,11 @@
#include <time.h>
#include <libicq2000/userinfohelpers.h>
+imgender& operator++ (imgender& n, int)
+{
+ return n = imgender(n+1);
+}
+
icqcontact::icqcontact(const imcontact adesc) {
string fname, tname;
imevent::imeventtype ie;
@@ -44,7 +49,7 @@
finlist = true;
congratulated = false;
- for(ie = imevent::message; ie != imevent::imeventtype_size; (int) ie += 1)
+ for(ie = imevent::message; ie != imevent::imeventtype_size; ie++ )
sound[ie] = "";
cdesc = adesc;
diff -Nur centericq-4.9.4-orig/src/icqcontact.h centericq-4.9.4/src/icqcontact.h
--- centericq-4.9.4-orig/src/icqcontact.h 2002-12-16 20:15:49.000000000 +0100
+++ centericq-4.9.4/src/icqcontact.h 2004-11-12 22:26:18.000000000 +0100
@@ -18,6 +18,8 @@
imgender_size
};
+imgender& operator++ (imgender& n, int);
+
class icqcontact {
public:
struct basicinfo {
diff -Nur centericq-4.9.4-orig/src/icqcontacts.cc centericq-4.9.4/src/icqcontacts.cc
--- centericq-4.9.4-orig/src/icqcontacts.cc 2002-11-30 00:13:45.000000000 +0100
+++ centericq-4.9.4/src/icqcontacts.cc 2004-11-12 21:17:56.905745760 +0100
@@ -130,7 +130,7 @@
int i;
bool found;
- for(pname = icq; pname != protocolname_size; (int) pname += 1) {
+ for(pname = icq; pname != protocolname_size; pname++ ) {
if(!conf.getourid(pname).empty()) {
for(i = 0, found = false; i < count && !found; i++) {
c = (icqcontact *) at(i);
diff -Nur centericq-4.9.4-orig/src/icqdialogs.cc centericq-4.9.4/src/icqdialogs.cc
--- centericq-4.9.4-orig/src/icqdialogs.cc 2003-05-11 02:16:34.000000000 +0200
+++ centericq-4.9.4/src/icqdialogs.cc 2004-11-12 21:17:56.910745000 +0100
@@ -174,7 +174,7 @@
string tname, act;
imsearchparams ts;
- for(protocolname apname = icq; apname != protocolname_size; (int) apname += 1) {
+ for(protocolname apname = icq; apname != protocolname_size; apname++ ) {
if(!users)
if(!gethook(apname).getCapabs().count(hookcapab::conferencing))
continue;
@@ -850,7 +850,7 @@
m.setwindow(textwindow(4, LINES-8, 20, LINES-4, conf.getcolor(cp_dialog_menu)));
m.idle = &menuidle;
- for(imgender i = genderUnspec; i != imgender_size; (int) i += 1) {
+ for(imgender i = genderUnspec; i != imgender_size; i++ ) {
m.additemf(0, (int) i, " %s", strgender(i));
if(i == f) m.setpos(m.getcount()-1);
}
@@ -866,7 +866,7 @@
m.setwindow(textwindow(4, LINES-8, 18, LINES-3, conf.getcolor(cp_dialog_menu)));
m.idle = &menuidle;
- for(ICQ2000::AgeRange i = ICQ2000::range_NoRange; i <= ICQ2000::range_60_above; (int) i += 1) {
+ for(ICQ2000::AgeRange i = ICQ2000::range_NoRange; i <= ICQ2000::range_60_above; i++ ) {
const char *p = stragerange(i);
if(i == ICQ2000::range_NoRange)
@@ -1010,12 +1010,12 @@
bool chatmode[protocolname_size], rus[protocolname_size];
- for(pname = icq; pname != protocolname_size; (int) pname += 1) {
+ for(pname = icq; pname != protocolname_size; pname++ ) {
chatmode[pname] = conf.getchatmode(pname);
rus[pname] = conf.getrussian(pname);
}
- for(hasany = false, pname = icq; pname != protocolname_size && !hasany; (int) pname += 1)
+ for(hasany = false, pname = icq; pname != protocolname_size && !hasany; pname++ )
hasany = !conf.getourid(pname).empty();
dialogbox db;
@@ -1066,13 +1066,13 @@
t.addleaff(i, 0, 7, _(" Edit away message on status change : %s "), stryesno(askaway));
if(hasany) {
- for(tmp = "", pname = icq; pname != protocolname_size; (int) pname += 1)
+ for(tmp = "", pname = icq; pname != protocolname_size; pname++ )
if(chatmode[pname] && !conf.getourid(pname).empty())
tmp += conf.getprotocolname(pname) + " ";
t.addleaff(i, 0, 16, _(" Chat messaging mode for : %s"), tmp.c_str());
- for(tmp = "", pname = icq; pname != protocolname_size; (int) pname += 1)
+ for(tmp = "", pname = icq; pname != protocolname_size; pname++ )
if(rus[pname] && !conf.getourid(pname).empty())
tmp += conf.getprotocolname(pname) + " ";
@@ -1122,7 +1122,7 @@
break;
case 3:
if(hasany) selectproto(rus); else
- for(pname = icq; pname != protocolname_size; (int) pname += 1)
+ for(pname = icq; pname != protocolname_size; pname++ )
rus[pname] = !rus[pname];
break;
case 4:
@@ -1144,7 +1144,7 @@
case 15: mailcheck = !mailcheck; break;
case 16:
if(hasany) selectproto(chatmode); else
- for(pname = icq; pname != protocolname_size; (int) pname += 1)
+ for(pname = icq; pname != protocolname_size; pname++ )
chatmode[pname] = !chatmode[pname];
break;
@@ -1193,7 +1193,7 @@
conf.setmakelog(makelog);
conf.setaskaway(askaway);
- for(pname = icq; pname != protocolname_size; (int) pname += 1) {
+ for(pname = icq; pname != protocolname_size; pname++ ) {
conf.setchatmode(pname, chatmode[pname]);
conf.setrussian(pname, rus[pname]);
}
@@ -1233,7 +1233,7 @@
i = 0;
memcpy(achatmode, chatmode, sizeof(achatmode));
- for(pname = icq; pname != protocolname_size; (int) pname += 1)
+ for(pname = icq; pname != protocolname_size; pname++ )
if(!conf.getourid(pname).empty())
tempchatmode[i++] = pname;
diff -Nur centericq-4.9.4-orig/src/icqface.cc centericq-4.9.4/src/icqface.cc
--- centericq-4.9.4-orig/src/icqface.cc 2003-05-10 14:58:28.000000000 +0200
+++ centericq-4.9.4/src/icqface.cc 2004-11-12 22:15:20.000000000 +0100
@@ -209,7 +209,7 @@
protocolname pname;
icqconf::imaccount ia;
- for(pname = icq; pname != protocolname_size; (int) pname += 1) {
+ for(pname = icq; pname != protocolname_size; pname++) {
if(pname != infocard) {
ia = conf.getourid(pname);
@@ -1137,7 +1137,7 @@
""
};
- for(ipname = icq; ipname != protocolname_size; (int) ipname += 1) {
+ for(ipname = icq; ipname != protocolname_size; ipname++) {
ia = conf.getourid(ipname);
if(!ia.empty()) {
@@ -1442,7 +1442,7 @@
set<protocolname> ps;
if(cs == csvisible || cs == csinvisible) {
- for(protocolname pname = icq; pname != protocolname_size; (int) pname += 1)
+ for(protocolname pname = icq; pname != protocolname_size; pname++)
if(gethook(pname).getCapabs().count(hookcapab::visibility))
ps.insert(pname);
}
diff -Nur centericq-4.9.4-orig/src/imcontact.cc centericq-4.9.4/src/imcontact.cc
--- centericq-4.9.4-orig/src/imcontact.cc 2002-12-05 19:04:16.000000000 +0100
+++ centericq-4.9.4/src/imcontact.cc 2004-11-12 22:27:31.000000000 +0100
@@ -25,6 +25,16 @@
#include "imcontact.h"
#include "icqconf.h"
+protocolname& operator++ (protocolname& n, int)
+{
+ return n = protocolname(n+1);
+}
+
+imstatus& operator++ (imstatus& n, int)
+{
+ return n = imstatus(n+1);
+}
+
imcontact contactroot(0, icq);
imcontact::imcontact() {
diff -Nur centericq-4.9.4-orig/src/imcontact.h centericq-4.9.4/src/imcontact.h
--- centericq-4.9.4-orig/src/imcontact.h 2003-05-06 20:46:13.000000000 +0200
+++ centericq-4.9.4/src/imcontact.h 2004-11-12 22:27:31.000000000 +0100
@@ -16,6 +16,8 @@
protocolname_size
};
+protocolname& operator++ (protocolname& n, int);
+
enum imstatus {
offline = 0,
available,
@@ -28,6 +30,8 @@
imstatus_size
};
+imstatus& operator++ (imstatus& n, int);
+
static char imstatus2char[imstatus_size] = {
'_', 'o', 'i', 'f', 'd', 'c', 'n', 'a'
};
diff -Nur centericq-4.9.4-orig/src/imevents.cc centericq-4.9.4/src/imevents.cc
--- centericq-4.9.4-orig/src/imevents.cc 2002-11-23 02:16:56.000000000 +0100
+++ centericq-4.9.4/src/imevents.cc 2004-11-12 22:28:31.000000000 +0100
@@ -26,6 +26,17 @@
#include <strstream>
+imevent::imeventtype& operator++ (imevent::imeventtype& n, int)
+{
+ return n = imevent::imeventtype(n+1);
+}
+
+imevent::imdirection& operator++ (imevent::imdirection& n, int)
+{
+ return n = imevent::imdirection(n+1);
+}
+
+
// -- serialization constants -------------------------------------------------
static const string evlinebreak = "\r\n";
@@ -97,14 +108,14 @@
if(rdbuf == "\f")
getstring(f, rdbuf);
- for(direction = incoming; direction != imdirection_size; (int) direction += 1)
+ for(direction = incoming; direction != imdirection_size; direction++)
if(sdirection[direction] == rdbuf) break;
getstring(f, rdbuf);
type = imeventtype_size;
if(rdbuf != "") {
- for(type = message; type != imeventtype_size; (int) type += 1)
+ for(type = message; type != imeventtype_size; type++)
if(seventtype[type] == rdbuf) break;
}
diff -Nur centericq-4.9.4-orig/src/imevents.h centericq-4.9.4/src/imevents.h
--- centericq-4.9.4-orig/src/imevents.h 2002-09-23 22:02:51.000000000 +0200
+++ centericq-4.9.4/src/imevents.h 2004-11-12 22:28:31.000000000 +0100
@@ -60,6 +60,9 @@
virtual void read(ifstream &f);
};
+imevent::imeventtype& operator++ (imevent::imeventtype& n, int);
+imevent::imdirection& operator++ (imevent::imdirection& n, int);
+
class immessage: public imevent {
protected:
string text;
diff -Nur centericq-4.9.4-orig/src/imexternal.cc centericq-4.9.4/src/imexternal.cc
--- centericq-4.9.4-orig/src/imexternal.cc 2003-01-20 03:20:16.000000000 +0100
+++ centericq-4.9.4/src/imexternal.cc 2004-11-12 21:17:56.920743480 +0100
@@ -386,7 +386,7 @@
if(param == "event") {
while(!(param = getword(buf)).empty()) {
- for(imevent::imeventtype et = imevent::message; et != imevent::imeventtype_size; (int) et += 1) {
+ for(imevent::imeventtype et = imevent::message; et != imevent::imeventtype_size; et++ ) {
if((param == geteventname(et))
|| (param == "all")) {
event.insert(et);
@@ -396,7 +396,7 @@
} else if(param == "proto") {
while(!(param = getword(buf)).empty()) {
- for(protocolname pname = icq; pname != protocolname_size; (int) pname += 1) {
+ for(protocolname pname = icq; pname != protocolname_size; pname++ ) {
if((param == conf.getprotocolname(pname))
|| (param == "all")) {
proto.insert(pname);
Index: centericq.spec
===================================================================
RCS file: /cvs/extras/rpms/centericq/devel/centericq.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- centericq.spec 8 Nov 2004 04:08:43 -0000 1.4
+++ centericq.spec 12 Nov 2004 21:49:59 -0000 1.5
@@ -1,13 +1,13 @@
Name: centericq
Version: 4.9.4
-Release: 0.fdr.2.2
-Epoch: 0
+Release: 3
Summary: Text mode menu- and window-driven IM
Group: Applications/Internet
License: GPL
URL: http://konst.org.ua/centericq/
Source0: http://konst.org.ua/download/centericq-4.9.4.tar.bz2
+Patch: centericq-4.9.4-gcc34.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: openssl-devel
@@ -25,6 +25,7 @@
%prep
%setup -q -n %{name}-%{version}
+%patch -p1 -b .gcc34
# -----------------------------------------------------------------------------
@@ -64,6 +65,9 @@
# -----------------------------------------------------------------------------
%changelog
+* Fri Nov 12 2004 Michael Schwendt <mschwendt[AT]users.sf.net> - 4.9.4-3
+- Fix C++ code for FC3/GCC 3.4.
+
* Sun Jul 13 2003 Andreas Bierfert (awjb) <andreas.bierfert[AT]awbsworld.de>
0:4.9.4-0.fdr.2
- Fixed issues mentioned in #446 by Michael Schwendt
More information about the fedora-extras-commits
mailing list