- FTBFS kdelibs3-3.5.10-24.fc14 (#631195)

This commit is contained in:
Rex Dieter 2010-11-18 11:27:07 -06:00
parent 629dd4ce43
commit d07045b303
2 changed files with 31 additions and 1 deletions

View File

@ -0,0 +1,24 @@
diff -up kdelibs-3.5.10/kate/part/katehighlight.cpp.gcc_ftbfs kdelibs-3.5.10/kate/part/katehighlight.cpp
--- kdelibs-3.5.10/kate/part/katehighlight.cpp.gcc_ftbfs 2007-05-14 02:52:27.000000000 -0500
+++ kdelibs-3.5.10/kate/part/katehighlight.cpp 2010-11-18 11:12:45.453403959 -0600
@@ -3225,7 +3225,7 @@ void KateHlManager::getDefaults(uint sch
list.append(charAttribute);
KateAttribute* string = new KateAttribute();
- string->setTextColor(QColor::QColor("#D00"));
+ string->setTextColor(QColor("#D00"));
string->setSelectedTextColor(Qt::red);
list.append(string);
@@ -3242,9 +3242,9 @@ void KateHlManager::getDefaults(uint sch
KateAttribute* alert = new KateAttribute();
alert->setTextColor(Qt::black);
- alert->setSelectedTextColor( QColor::QColor("#FCC") );
+ alert->setSelectedTextColor( QColor("#FCC") );
alert->setBold(true);
- alert->setBGColor( QColor::QColor("#FCC") );
+ alert->setBGColor( QColor("#FCC") );
list.append(alert);
KateAttribute* functionAttribute = new KateAttribute();

View File

@ -28,7 +28,7 @@
Summary: KDE 3 Libraries
Name: kdelibs3
Version: 3.5.10
Release: 24%{?dist}
Release: 25%{?dist}
License: LGPLv2
Url: http://www.kde.org/
@ -69,6 +69,8 @@ Patch53: kdelibs-3.5.9-drkonqi-kde4.patch
Patch54: kdelibs-3.5.9-fix-flock-redefinition.patch
# update the KatePart latex.xml syntax definition to the version from Kile 2.0.3
Patch55: kdelibs-3.5.10-latex-syntax-kile-2.0.3.patch
# fix ftbfs (#631195)
Patch56: kdelibs-3.5.10-qcolor_gcc_ftbfs.patch
# use /etc/kde in addition to /usr/share/config, borrowed from debian
Patch100: kdelibs-3.5.5-kstandarddirs.patch
@ -236,6 +238,7 @@ format for easy browsing
%patch53 -p1 -b .drkonqi-kde4
%patch54 -p1 -b .flock-redefinition
%patch55 -p1 -b .latex-syntax
%patch56 -p1 -b .qcolor_gcc_ftbfs
%patch100 -p1 -b .kstandarddirs
%patch101 -p1 -b .libtool-shlibext
@ -580,6 +583,9 @@ touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || :
%changelog
* Thu Nov 18 2010 Rex Dieter <rdieter@fedoraproject.org> - 3.5.10-25
- FTBFS kdelibs3-3.5.10-24.fc14 (#631195)
* Thu Jun 10 2010 Rex Dieter <rdieter@fedoraproject.org> - 3.5.10-24
- drop old Obsoletes/Provides: kdelibs(-devel/-apidocs)
- -apidocs: Requires: kde-filesystem