diff --git a/kdelibs-3.5.10-gcc6.patch b/kdelibs-3.5.10-gcc6.patch new file mode 100644 index 0000000..4a0d958 --- /dev/null +++ b/kdelibs-3.5.10-gcc6.patch @@ -0,0 +1,21 @@ +diff -up kdelibs-3.5.10/kate/part/katebuffer.cpp.than kdelibs-3.5.10/kate/part/katebuffer.cpp +--- kdelibs-3.5.10/kate/part/katebuffer.cpp.than 2016-02-16 22:06:01.830197908 +0100 ++++ kdelibs-3.5.10/kate/part/katebuffer.cpp 2016-02-16 23:33:15.810136589 +0100 +@@ -42,6 +42,8 @@ + #include + #include + ++#include ++ + /** + * loader block size, load 256 kb at once per default + * if file size is smaller, fall back to file size +@@ -917,7 +919,7 @@ void KateBuffer::updatePreviousNotEmptyL + } while (textLine->firstChar()==-1); + kdDebug(13020)<<"updatePreviousNotEmptyLine: updating line:"<<(blk->startLine()+current_line)< foldingList=textLine->foldingListArray(); +- while ( (foldingList.size()>0) && ( abs(foldingList[foldingList.size()-2])==1)) { ++ while ( (foldingList.size()>0) && ( std::abs(foldingList[foldingList.size()-2])==1)) { + foldingList.resize(foldingList.size()-2,QGArray::SpeedOptim); + } + addIndentBasedFoldingInformation(foldingList,addindent,deindent); diff --git a/kdelibs3.spec b/kdelibs3.spec index 11f3e4e..e3a78b0 100644 --- a/kdelibs3.spec +++ b/kdelibs3.spec @@ -18,7 +18,7 @@ Summary: KDE 3 Libraries Name: kdelibs3 Version: 3.5.10 -Release: 73%{?dist} +Release: 74%{?dist} License: LGPLv2 Url: http://www.kde.org/ @@ -65,6 +65,7 @@ Patch56: kdelibs-3.5.10-qcolor_gcc_ftbfs.patch Patch57: kdelibs-3.5.10-cups-util-missing-header.patch # fix FTBFS with CUPS 2.0 due to bad CUPS_VERSION_MAJOR checks Patch58: kdelibs-3.5.10-cups20.patch +Patch59: kdelibs-3.5.10-gcc6.patch # use /etc/kde in addition to /usr/share/config, borrowed from debian Patch100: kdelibs-3.5.5-kstandarddirs.patch @@ -252,6 +253,7 @@ format for easy browsing %patch56 -p1 -b .qcolor_gcc_ftbfs %patch57 -p1 -b .cups-util %patch58 -p1 -b .cups20 +%patch59 -p1 -b .gcc6 %patch100 -p1 -b .kstandarddirs %patch101 -p1 -b .libtool-shlibext @@ -299,7 +301,7 @@ fi export DO_NOT_COMPILE="libkscreensaver" %endif -export CXXFLAGS="%{optflags} -std=gnu++98" +export CXXFLAGS="%{optflags} -Wno-deprecated-declarations -Wno-narrowing -std=gnu++98" %configure \ --includedir=%{_includedir}/kde \ @@ -600,6 +602,9 @@ touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || : %changelog +* Tue Feb 16 2016 Than Ngo - 3.5.10-74 +- fix bz#1307685, FTBFS in rawhide + * Sun Feb 14 2016 Kevin Kofler - 3.5.10-73 - Add -std=gnu++98 to the CXXFLAGS to fix FTBFS (#1307685)