Sorry, i forgot that there are some other packages beside kdebase which needs
to be patched too. Have a look to all of the attached patches.
--
Thomas
diff -up kdelibs-3.5.10/kioslave/ftp/ftp.cc.orig
kdelibs-3.5.10/kioslave/ftp/ftp.cc
--- kdelibs-3.5.10/kioslave/ftp/ftp.cc.orig 2009-02-25 13:18:13.000000000 +0100
+++ kdelibs-3.5.10/kioslave/ftp/ftp.cc 2009-02-25 13:34:13.000000000 +0100
@@ -876,7 +876,7 @@ int Ftp::ftpOpenPASVDataConnection()
// The usual answer is '227 Entering Passive Mode. (160,39,200,55,6,245)'
// but anonftpd gives '227 =160,39,200,55,6,245'
int i[6];
- char *start = strchr(ftpResponse(3), '(');
+ const char *start = strchr(ftpResponse(3), '(');
if ( !start )
start = strchr(ftpResponse(3), '=');
if ( !start ||
@@ -931,7 +931,7 @@ int Ftp::ftpOpenEPSVDataConnection()
return ERR_INTERNAL;
}
- char *start = strchr(ftpResponse(3), '|');
+ const char *start = strchr(ftpResponse(3), '|');
if ( !start || sscanf(start, "|||%d|", &portnum) != 1)
return ERR_INTERNAL;
--- kdebase/kcontrol/kfontinst/kfontinst/Fontmap.cpp 2005/12/02 23:52:28 485133
+++ kdebase/kcontrol/kfontinst/kfontinst/Fontmap.cpp 2009/05/30 00:34:35 975372
@@ -44,7 +44,7 @@
using namespace std;
-static char * findSpace(char *str)
+static const char * findSpace(const char *str)
{
while(str && *str!=' ' && *str!='\t')
str++;
@@ -65,7 +65,7 @@
char a[constMaxLen+1],
b[constFileMaxLen+1];
- char *slash1=strchr(line, '/'),
+ const char *slash1=strchr(line, '/'),
*space1=slash1 ? findSpace(slash1) : NULL, //strchr(slash1, ' ') : NULL,
*ob=slash1 ? strchr(slash1, '(') : NULL,
*cb=ob ? strchr(ob, ')') : NULL,
diff -Naur kdenetwork-3.5.10.orig/kopete/protocols/groupwise/libgroupwise/rtf.cc kdenetwork-3.5.10/kopete/protocols/groupwise/libgroupwise/rtf.cc
--- kdenetwork-3.5.10.orig/kopete/protocols/groupwise/libgroupwise/rtf.cc 2005-09-10 10:20:20.000000000 +0200
+++ kdenetwork-3.5.10/kopete/protocols/groupwise/libgroupwise/rtf.cc 2009-11-24 07:58:04.000000000 +0100
@@ -2235,7 +2235,7 @@
FontDef& def = p->fonts[m_nFont-1];
- char *pp = strchr(str, ';');
+ const char *pp = strchr(str, ';');
unsigned size;
if (pp != NULL)
size = (pp - str);
diff -Naur kdenetwork-3.5.10.orig/kopete/protocols/groupwise/libgroupwise/rtf.ll kdenetwork-3.5.10/kopete/protocols/groupwise/libgroupwise/rtf.ll
--- kdenetwork-3.5.10.orig/kopete/protocols/groupwise/libgroupwise/rtf.ll 2005-09-10 10:20:20.000000000 +0200
+++ kdenetwork-3.5.10/kopete/protocols/groupwise/libgroupwise/rtf.ll 2009-11-24 07:53:01.000000000 +0100
@@ -570,7 +570,7 @@
FontDef& def = p->fonts[m_nFont-1];
- char *pp = strchr(str, ';');
+ const char *pp = strchr(str, ';');
unsigned size;
if (pp != NULL)
size = (pp - str);
diff -Naur kdenetwork-3.5.10.orig/kopete/protocols/oscar/liboscar/rtf.cc kdenetwork-3.5.10/kopete/protocols/oscar/liboscar/rtf.cc
--- kdenetwork-3.5.10.orig/kopete/protocols/oscar/liboscar/rtf.cc 2005-09-10 10:20:23.000000000 +0200
+++ kdenetwork-3.5.10/kopete/protocols/oscar/liboscar/rtf.cc 2009-11-24 08:05:57.000000000 +0100
@@ -2131,7 +2131,7 @@
FontDef& def = p->fonts[m_nFont-1];
- char *pp = strchr(str, ';');
+ const char *pp = strchr(str, ';');
unsigned size;
if (pp != NULL)
size = (pp - str);
diff -Naur kdenetwork-3.5.10.orig/kopete/protocols/oscar/liboscar/rtf.ll kdenetwork-3.5.10/kopete/protocols/oscar/liboscar/rtf.ll
--- kdenetwork-3.5.10.orig/kopete/protocols/oscar/liboscar/rtf.ll 2005-09-10 10:20:23.000000000 +0200
+++ kdenetwork-3.5.10/kopete/protocols/oscar/liboscar/rtf.ll 2009-11-24 08:05:33.000000000 +0100
@@ -568,7 +568,7 @@
FontDef& def = p->fonts[m_nFont-1];
- char *pp = strchr(str, ';');
+ const char *pp = strchr(str, ';');
unsigned size;
if (pp != NULL)
size = (pp - str);
diff -Naur kdepim-3.5.10.orig/indexlib/memvector.tcc kdepim-3.5.10/indexlib/memvector.tcc
--- kdepim-3.5.10.orig/indexlib/memvector.tcc 2008-02-13 10:39:38.000000000 +0100
+++ kdepim-3.5.10/indexlib/memvector.tcc 2009-11-24 09:06:26.000000000 +0100
@@ -33,7 +33,7 @@
data_->resize( n_s * byte_io::byte_lenght<value_type>() + byte_io::byte_lenght<unsigned>() );
iterator p_end = end();
byte_io::write<unsigned>( data_->rw_base( 0 ), n_s );
- while ( operator !=<unsigned, unsigned>(p_end, end()) ) {
+ while ( p_end != end() ) {
*p_end = value_type();
++p_end;
--
http://linuxfromscratch.org/mailman/listinfo/blfs-support
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
