rpms
/
kdelibs3
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix gcc7 FTBFS (rhbz#1423808)

This commit is contained in:
Hans de Goede 2017-02-21 10:18:17 +01:00
parent 566cd5a9b4
commit 4bcc6a628e
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
kdelibs-3.5.10-gcc7.patch Normal file
View File

@ -0,0 +1,12 @@
diff -up kdelibs-3.5.10/kate/part/katebuffer.cpp~ kdelibs-3.5.10/kate/part/katebuffer.cpp
--- kdelibs-3.5.10/kate/part/katebuffer.cpp~ 2017-02-21 09:44:34.000000000 +0100
+++ kdelibs-3.5.10/kate/part/katebuffer.cpp 2017-02-21 09:48:20.132333343 +0100
@@ -919,7 +919,7 @@ void KateBuffer::updatePreviousNotEmptyL
} while (textLine->firstChar()==-1);
kdDebug(13020)<<"updatePreviousNotEmptyLine: updating line:"<<(blk->startLine()+current_line)<<endl;
QMemArray<uint> foldingList=textLine->foldingListArray();
- while ( (foldingList.size()>0) && ( std::abs(foldingList[foldingList.size()-2])==1)) {
+ while ( (foldingList.size()>0) && ( std::abs((long)foldingList[foldingList.size()-2])==1)) {
foldingList.resize(foldingList.size()-2,QGArray::SpeedOptim);
}
addIndentBasedFoldingInformation(foldingList,addindent,deindent);

8
kdelibs3.spec
View File

@ -18,7 +18,7 @@
Summary: KDE 3 Libraries
Name: kdelibs3
Version: 3.5.10
Release: 81%{?dist}
Release: 82%{?dist}
License: LGPLv2
Url: http://www.kde.org/
@ -68,6 +68,8 @@ Patch58: kdelibs-3.5.10-cups20.patch
Patch59: kdelibs-3.5.10-gcc6.patch
# fix endless loop in svgicon
Patch60: kdelibs-3.5.10-svgicon-endlessloop.patch
# fix FTBFS with gcc7
Patch61: kdelibs-3.5.10-gcc7.patch
# use /etc/kde in addition to /usr/share/config, borrowed from debian
Patch100: kdelibs-3.5.5-kstandarddirs.patch
@ -277,6 +279,7 @@ This package includes tools kgrantpty and kpac_dhcp_helper.
%patch58 -p1 -b .cups20
%patch59 -p1 -b .gcc6
%patch60 -p1 -b .endless-loop
%patch61 -p1 -b .gcc7
%patch100 -p1 -b .kstandarddirs
%patch101 -p1 -b .libtool-shlibext
@ -631,6 +634,9 @@ touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || :
%attr(4755,root,root) %{_bindir}/kpac_dhcp_helper
%changelog
* Tue Feb 21 2017 Hans de Goede <hdegoede@redhat.com> - 3.5.10-82
- Fix gcc7 FTBFS (rhbz#1423808)
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.5.10-81
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild