rpms/kdelibs3/devel kdelibs-3.5.10-gcc44.patch, NONE, 1.1 kdelibs3.spec, 1.50, 1.51
Than Ngo
than at fedoraproject.org
Wed Feb 25 12:38:20 UTC 2009
Author: than
Update of /cvs/extras/rpms/kdelibs3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20464
Modified Files:
kdelibs3.spec
Added Files:
kdelibs-3.5.10-gcc44.patch
Log Message:
fix build issue with gcc-4.4
kdelibs-3.5.10-gcc44.patch:
--- NEW FILE kdelibs-3.5.10-gcc44.patch ---
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;
Index: kdelibs3.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs3/devel/kdelibs3.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- kdelibs3.spec 25 Feb 2009 11:29:38 -0000 1.50
+++ kdelibs3.spec 25 Feb 2009 12:37:50 -0000 1.51
@@ -97,6 +97,7 @@
Patch101: kde-3.5-libtool-shlibext.patch
# kget ignores simultaneous download limit (kde #101956)
Patch103: kdelibs-3.5.0-101956.patch
+Patch104: kdelibs-3.5.10-gcc44.patch
## upstream patches
@@ -274,6 +275,7 @@
%patch100 -p1 -b .kstandarddirs
%patch101 -p1 -b .libtool-shlibext
+%patch104 -p1 -b .gcc44
# upstream patches
@@ -645,6 +647,7 @@
%changelog
* Wed Feb 25 2009 Than Ngo <than at redhat.com> - 3.5.10-7
- fix files conflicts with 4.2.x
+- fix build issue with gcc-4.4
* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.5.10-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
More information about the fedora-extras-commits
mailing list