Fix build w/ GCC 4.5. (bug #314483 by Bernd Buschinski)

(Portage version: 2.2_rc67/cvs/Linux x86_64)

3 files changed, 99 insertions, 3 deletions

diff --git a/app-office/krita/ChangeLog b/app-office/krita/ChangeLog
index 7e86171f9a1d..5d25b3061a1a 100644
--- a/app-office/krita/ChangeLog
+++ b/app-office/krita/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/krita
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/krita/ChangeLog,v 1.114 2010/04/02 10:19:42 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/krita/ChangeLog,v 1.115 2010/04/11 22:13:50 dirtyepic Exp $
+
+  11 Apr 2010; Ryan Hill <dirtyepic@gentoo.org> krita-2.1.2.ebuild,
+  +files/krita-2.1.2-gcc45.patch:
+  Fix build w/ GCC 4.5. (bug #314483 by Bernd Buschinski)
 
   02 Apr 2010; Tomáš Chvátal <scarabeus@gentoo.org> krita-2.1.2.ebuild:
   Fix patch name.
diff --git a/app-office/krita/files/krita-2.1.2-gcc45.patch b/app-office/krita/files/krita-2.1.2-gcc45.patch
new file mode 100644
index 000000000000..13292e90f02b
--- /dev/null
+++ b/app-office/krita/files/krita-2.1.2-gcc45.patch
@@ -0,0 +1,91 @@
+http://bugs.gentoo.org/314483
+http://websvn.kde.org/?view=revision&revision=1061366
+http://websvn.kde.org/?view=revision&revision=1061381
+
+--- krita/ui/widgets/kis_curve_widget_p.h
++++ krita/ui/widgets/kis_curve_widget_p.h
+@@ -439,7 +439,7 @@
+      * That is not mandatory but desirable
+      */
+ 
+-    p.setPen(QPen::QPen(Qt::gray, 1, Qt::SolidLine));
++    p.setPen(QPen(Qt::gray, 1, Qt::SolidLine));
+     p.drawLine(div4_round(wWidth), 0, div4_round(wWidth), wHeight);
+     p.drawLine(div2_round(wWidth), 0, div2_round(wWidth), wHeight);
+     p.drawLine(div4_round(3*wWidth), 0, div4_round(3*wWidth), wHeight);
+--- krita/ui/widgets/kis_curve_widget.cpp
++++ krita/ui/widgets/kis_curve_widget.cpp
+@@ -312,11 +312,11 @@
+             curveY = d->m_points.at(i).y();
+ 
+             if (i == d->m_grab_point_index) {
+-                p.setPen(QPen::QPen(Qt::red, 3, Qt::SolidLine));
++                p.setPen(QPen(Qt::red, 3, Qt::SolidLine));
+                 p.drawEllipse(QRectF(curveX * wWidth - 2,
+                                      wHeight - 2 - curveY * wHeight, 4, 4));
+             } else {
+-                p.setPen(QPen::QPen(Qt::red, 1, Qt::SolidLine));
++                p.setPen(QPen(Qt::red, 1, Qt::SolidLine));
+                 p.drawEllipse(QRectF(curveX * wWidth - 3,
+                                      wHeight - 3 - curveY * wHeight, 6, 6));
+             }
+--- krita/plugins/filters/colorsfilters/kis_perchannel_filter.cpp
++++ krita/plugins/filters/colorsfilters/kis_perchannel_filter.cpp
+@@ -123,7 +123,7 @@
+ 
+     QPixmap gradientpix(width, height);
+     QPainter p(&gradientpix);
+-    p.setPen(QPen::QPen(QColor(0, 0, 0), 1, Qt::SolidLine));
++    p.setPen(QPen(QColor(0, 0, 0), 1, Qt::SolidLine));
+     for (; *i < 256; (*i)++, col += inc) {
+         p.setPen(QColor(col, col, col));
+         p.drawPoint(x, y);
+@@ -138,7 +138,7 @@
+     QPixmap pix(256, height);
+     pix.fill();
+     QPainter p(&pix);
+-    p.setPen(QPen::QPen(Qt::gray, 1, Qt::SolidLine));
++    p.setPen(QPen(Qt::gray, 1, Qt::SolidLine));
+ 
+     if(m_histogram)
+     {
+--- krita/plugins/filters/colorsfilters/kis_brightness_contrast_filter.cpp
++++ krita/plugins/filters/colorsfilters/kis_brightness_contrast_filter.cpp
+@@ -249,7 +249,7 @@
+     // Create the horizontal gradient label
+     QPixmap hgradientpix(256, 1);
+     QPainter hgp(&hgradientpix);
+-    hgp.setPen(QPen::QPen(QColor(0, 0, 0), 1, Qt::SolidLine));
++    hgp.setPen(QPen(QColor(0, 0, 0), 1, Qt::SolidLine));
+     for (i = 0; i < 256; ++i) {
+         hgp.setPen(QColor(i, i, i));
+         hgp.drawPoint(i, 0);
+@@ -259,7 +259,7 @@
+     // Create the vertical gradient label
+     QPixmap vgradientpix(1, 256);
+     QPainter vgp(&vgradientpix);
+-    vgp.setPen(QPen::QPen(QColor(0, 0, 0), 1, Qt::SolidLine));
++    vgp.setPen(QPen(QColor(0, 0, 0), 1, Qt::SolidLine));
+     for (i = 0; i < 256; ++i) {
+         vgp.setPen(QColor(i, i, i));
+         vgp.drawPoint(0, 255 - i);
+@@ -271,7 +271,7 @@
+     QPixmap pix(256, height);
+     pix.fill();
+     QPainter p(&pix);
+-    p.setPen(QPen::QPen(Qt::gray, 1, Qt::SolidLine));
++    p.setPen(QPen(Qt::gray, 1, Qt::SolidLine));
+ 
+     double highest = (double)histogram.calculations().getHighest();
+     qint32 bins = histogram.producer()->numberOfBins();
+--- krita/plugins/filters/levelfilter/kis_level_filter.cpp
++++ krita/plugins/filters/levelfilter/kis_level_filter.cpp
+@@ -178,7 +178,7 @@
+     pix.fill();
+     QPainter p(&pix);
+ 
+-    p.setPen(QPen::QPen(Qt::gray, 1, Qt::SolidLine));
++    p.setPen(QPen(Qt::gray, 1, Qt::SolidLine));
+ 
+     double highest = (double)histogram->calculations().getHighest();
+     qint32 bins = histogram->producer()->numberOfBins();
diff --git a/app-office/krita/krita-2.1.2.ebuild b/app-office/krita/krita-2.1.2.ebuild
index 62e23b086bab..69a3fed55340 100644
--- a/app-office/krita/krita-2.1.2.ebuild
+++ b/app-office/krita/krita-2.1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/krita/krita-2.1.2.ebuild,v 1.2 2010/04/02 10:19:42 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/krita/krita-2.1.2.ebuild,v 1.3 2010/04/11 22:13:51 dirtyepic Exp $
 
 EAPI="2"
 
@@ -32,7 +32,8 @@ KMEXTRACTONLY="libs/"
 KMLOADLIBS="koffice-libs"
 
 PATCHES=( "${FILESDIR}/${PN}-2.1.0-opengl.patch"
-	"${FILESDIR}/${PN}-2.1.1-libpng14.patch" )
+	"${FILESDIR}/${PN}-2.1.1-libpng14.patch"
+	"${FILESDIR}"/${P}-gcc45.patch )
 
 src_configure() {
 	mycmakeargs="${mycmakeargs}