jreznik pushed to kdelibs3 (epel7). "- FTBFS kdelibs3-3.5.10-24.fc14 (#631195)"

[notifications at fedoraproject.org]

>From d07045b3035331e8227a844824715a4d564c1a44 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at fedoraproject.org>
Date: Thu, 18 Nov 2010 11:27:07 -0600
Subject: - FTBFS kdelibs3-3.5.10-24.fc14 (#631195)


diff --git a/kdelibs-3.5.10-qcolor_gcc_ftbfs.patch b/kdelibs-3.5.10-qcolor_gcc_ftbfs.patch
new file mode 100644
index 0000000..19d20d8
--- /dev/null
+++ b/kdelibs-3.5.10-qcolor_gcc_ftbfs.patch
@@ -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();
diff --git a/kdelibs3.spec b/kdelibs3.spec
index 3142c10..04963f0 100644
--- a/kdelibs3.spec
+++ b/kdelibs3.spec
@@ -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 at fedoraproject.org> - 3.5.10-25
+- FTBFS kdelibs3-3.5.10-24.fc14 (#631195)
+
 * Thu Jun 10 2010 Rex Dieter <rdieter at fedoraproject.org> - 3.5.10-24
 - drop old Obsoletes/Provides: kdelibs(-devel/-apidocs)
 - -apidocs: Requires: kde-filesystem
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/kdelibs3.git/commit/?h=epel7&id=d07045b3035331e8227a844824715a4d564c1a44