rev 16612 - in trunk/packages/kde3libs/debian: . patches

[Pino Toscano]

Author: pino-guest
Date: 2010-01-15 13:45:40 +0000 (Fri, 15 Jan 2010)
New Revision: 16612

Added:
   trunk/packages/kde3libs/debian/patches/66_gcc4.5_1074155.diff
Modified:
   trunk/packages/kde3libs/debian/changelog
Log:
pull upstream r1074155 to fix build with gcc 4.5 (#565013)


Modified: trunk/packages/kde3libs/debian/changelog
===================================================================
--- trunk/packages/kde3libs/debian/changelog	2010-01-15 12:46:33 UTC (rev 16611)
+++ trunk/packages/kde3libs/debian/changelog	2010-01-15 13:45:40 UTC (rev 16612)
@@ -1,3 +1,10 @@
+kdelibs (4:3.5.10.dfsg.1-4) UNRELEASED; urgency=low
+
+  [ Pino Toscano ]
+  * Pull upstream r1074155 to fix build with GCC 4.5. (Closes: #565013)
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 15 Jan 2010 14:43:15 +0100
+
 kdelibs (4:3.5.10.dfsg.1-3) unstable; urgency=high
 
   +++ Changes by Scott Kitterman (patches from Kubuntu):

Added: trunk/packages/kde3libs/debian/patches/66_gcc4.5_1074155.diff
===================================================================
--- trunk/packages/kde3libs/debian/patches/66_gcc4.5_1074155.diff	                        (rev 0)
+++ trunk/packages/kde3libs/debian/patches/66_gcc4.5_1074155.diff	2010-01-15 13:45:40 UTC (rev 16612)
@@ -0,0 +1,29 @@
+Description: fix compilation with GCC 4.5
+ Avoid double qualification of constructors; taken from upstream r1074156.
+Origin: upstream, http://websvn.kde.org/?view=revision&revision=1074156
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=565013
+Index: kdelibs/kate/part/katehighlight.cpp
+===================================================================
+--- kdelibs/kate/part/katehighlight.cpp	(revision 1074155)
++++ kdelibs/kate/part/katehighlight.cpp	(revision 1074156)
+@@ -3225,7 +3225,7 @@
+   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 @@
+ 
+   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();