fix build issue with gcc-4.4
This commit is contained in:
parent
93b7966383
commit
63a0882397
|
@ -0,0 +1,21 @@
|
||||||
|
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;
|
||||||
|
|
|
@ -97,6 +97,7 @@ Patch100: kdelibs-3.5.5-kstandarddirs.patch
|
||||||
Patch101: kde-3.5-libtool-shlibext.patch
|
Patch101: kde-3.5-libtool-shlibext.patch
|
||||||
# kget ignores simultaneous download limit (kde #101956)
|
# kget ignores simultaneous download limit (kde #101956)
|
||||||
Patch103: kdelibs-3.5.0-101956.patch
|
Patch103: kdelibs-3.5.0-101956.patch
|
||||||
|
Patch104: kdelibs-3.5.10-gcc44.patch
|
||||||
|
|
||||||
## upstream patches
|
## upstream patches
|
||||||
|
|
||||||
|
@ -274,6 +275,7 @@ format for easy browsing
|
||||||
|
|
||||||
%patch100 -p1 -b .kstandarddirs
|
%patch100 -p1 -b .kstandarddirs
|
||||||
%patch101 -p1 -b .libtool-shlibext
|
%patch101 -p1 -b .libtool-shlibext
|
||||||
|
%patch104 -p1 -b .gcc44
|
||||||
|
|
||||||
# upstream patches
|
# upstream patches
|
||||||
|
|
||||||
|
@ -645,6 +647,7 @@ touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || :
|
||||||
%changelog
|
%changelog
|
||||||
* Wed Feb 25 2009 Than Ngo <than@redhat.com> - 3.5.10-7
|
* Wed Feb 25 2009 Than Ngo <than@redhat.com> - 3.5.10-7
|
||||||
- fix files conflicts with 4.2.x
|
- fix files conflicts with 4.2.x
|
||||||
|
- fix build issue with gcc-4.4
|
||||||
|
|
||||||
* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.5.10-6
|
* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.5.10-6
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
|
||||||
|
|
Loading…
Reference in New Issue