rev 17884 - in kde-extras/kamoso/trunk/debian: . patches

[José Manuel Santamaría Lema]

Author: santa-guest
Date: 2010-05-08 10:21:59 +0000 (Sat, 08 May 2010)
New Revision: 17884

Added:
   kde-extras/kamoso/trunk/debian/patches/
   kde-extras/kamoso/trunk/debian/patches/01_fix_build_numberofcolors.diff
   kde-extras/kamoso/trunk/debian/patches/series
Log:
Add 01_fix_build_numberofcolors.diff


Added: kde-extras/kamoso/trunk/debian/patches/01_fix_build_numberofcolors.diff
===================================================================
--- kde-extras/kamoso/trunk/debian/patches/01_fix_build_numberofcolors.diff	                        (rev 0)
+++ kde-extras/kamoso/trunk/debian/patches/01_fix_build_numberofcolors.diff	2010-05-08 10:21:59 UTC (rev 17884)
@@ -0,0 +1,48 @@
+# Description: patch stolen from upstream git commit 
+#  8e71f8e1b232b093a0a015c18eb6403d93fb3f76 it fixes an FTBFS the commit log
+#  says "Build++ on some 64bits platforms, seems that Qt have something called
+#  colorCount somewhere.
+# Origin: upstream
+# Author: Alex Fiestas <alex at eyeos.org>
+# Forwarded: no because this patch is stolen from upstream
+
+--- a/src/countdownwidget.cpp
++++ b/src/countdownwidget.cpp
+@@ -24,8 +24,8 @@
+ #include <QDebug>
+ #include <QTimeLine>
+ 
+-static const int colorCount=3;
+-static const QColor colors[colorCount]={ Qt::red, Qt::yellow, Qt::green };
++static const int numberOfColours=3;
++static const QColor colors[numberOfColours]={ Qt::red, Qt::yellow, Qt::green };
+ 
+ CountdownWidget::CountdownWidget(QWidget* parent)
+ 	: QWidget(parent)
+@@ -63,11 +63,11 @@ void CountdownWidget::paintEvent(QPaintEvent* )
+ 	
+ 	const int margin=5;
+ 	int rad=height()/2-margin;
+-	int dist=(width()-rad*colorCount)/(colorCount-1);
++	int dist=(width()-rad*numberOfColours)/(numberOfColours-1);
+ 	
+-	int current=int(mProgress*colorCount);
++	int current=int(mProgress*numberOfColours);
+ 	
+-	for(int i=0; i<colorCount; i++) {
++	for(int i=0; i<numberOfColours; i++) {
+ 		QColor color=colors[i];
+ 		if(i>=current)
+ 			color=color.dark(125);
+@@ -83,7 +83,7 @@ void CountdownWidget::paintEvent(QPaintEvent* )
+ 			painter.setPen(color);
+ 			painter.setBrush(color);
+ 			
+-			double progUnit=1./colorCount;
++			double progUnit=1./numberOfColours;
+ 			double prog=(mProgress-i*progUnit)/progUnit;
+ 			
+ 			painter.drawEllipse(tl, rad*prog, rad*prog);
+-- 
+1.6.1
+

Added: kde-extras/kamoso/trunk/debian/patches/series
===================================================================
--- kde-extras/kamoso/trunk/debian/patches/series	                        (rev 0)
+++ kde-extras/kamoso/trunk/debian/patches/series	2010-05-08 10:21:59 UTC (rev 17884)
@@ -0,0 +1 @@
+01_fix_build_numberofcolors.diff