From 63a08823977657fc4f0e8cfd21ee04a7b1b6f076 Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Wed, 25 Feb 2009 12:37:50 +0000 Subject: [PATCH] fix build issue with gcc-4.4 --- kdelibs-3.5.10-gcc44.patch | 21 +++++++++++++++++++++ kdelibs3.spec | 3 +++ 2 files changed, 24 insertions(+) create mode 100644 kdelibs-3.5.10-gcc44.patch diff --git a/kdelibs-3.5.10-gcc44.patch b/kdelibs-3.5.10-gcc44.patch new file mode 100644 index 0000000..9196c0a --- /dev/null +++ b/kdelibs-3.5.10-gcc44.patch @@ -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; + diff --git a/kdelibs3.spec b/kdelibs3.spec index 4863935..161a7a4 100644 --- a/kdelibs3.spec +++ b/kdelibs3.spec @@ -97,6 +97,7 @@ Patch100: kdelibs-3.5.5-kstandarddirs.patch 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 @@ format for easy browsing %patch100 -p1 -b .kstandarddirs %patch101 -p1 -b .libtool-shlibext +%patch104 -p1 -b .gcc44 # upstream patches @@ -645,6 +647,7 @@ touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || : %changelog * Wed Feb 25 2009 Than Ngo - 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 - 3.5.10-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild