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

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 106 insertions, 9 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/Manifest b/app-office/krita/Manifest
index c97fbdfa0ab2..b920bd4fd78a 100644
--- a/app-office/krita/Manifest
+++ b/app-office/krita/Manifest
@@ -3,18 +3,19 @@ Hash: SHA1
 
 AUX krita-2.1.0-opengl.patch 425 RMD160 957b1df959402314f5e5b2167d2c16ed8e32c960 SHA1 4f8fb8deea43a3303b5457dceecd1b330da23027 SHA256 aa7d65328462b8aefcd48da6ff2fe5571ef512c886448eadf9e44869a67ff565
 AUX krita-2.1.1-libpng14.patch 327 RMD160 9ec9c492d456d388b8d944b4a40e360693dd8605 SHA1 941850dc8485729edf3296cfd7bace6c1b56414c SHA256 93ef65c7da0e8f5d480ec90424e16e44c82068e7db5218ff4910f8e9a3b19b46
+AUX krita-2.1.2-gcc45.patch 3664 RMD160 f9e0766045b53102a6531b4aeec4f4a5be3a252d SHA1 b70b997572d5ff01e87b244c5f112e402794d72e SHA256 a054443342b5001f62f17fa5f1b705d160fb5cfca4f21b0265bad5ac9f1e067b
 DIST koffice-2.1.0.tar.bz2 76150485 RMD160 9703bdf4d70d0556c5c101f4cf4baecb17b66a10 SHA1 0fd0bf64e6d166d41bae41730b17d5194e7f5adf SHA256 96ea36d1e7e2495f0076805eacf29a84607dc597f58b129a310df7227716acc9
 DIST koffice-2.1.1.tar.bz2 50332433 RMD160 9c7123bf31370d406a6e5272d7e752c39b3596d5 SHA1 72a82cfaaca8fbdcd0ba4622f80d4cf27aff74d2 SHA256 ff928c2698ef37a5cc808faddf758ee0c44603ec19194c973f8e4d8fcc6aac01
 DIST koffice-2.1.2.tar.bz2 50359739 RMD160 20f3b162d49cbd70492c597aec2d79cb3de5a2d7 SHA1 29f5b5e611408ac2a2e68352cb64299b78d83094 SHA256 64233bb7b5b18813a9da46ab0c347170904611b59480b91297db4c3deb14b7da
 EBUILD krita-2.1.0.ebuild 1327 RMD160 da5510749afc5d04bd0933ff6a432371c0e28472 SHA1 6e2032efcc50cb31c50cc07c505b6c21bf3d6fd0 SHA256 74b470c56d20e426771971986f5b5a9e42c9b47f7b495f91342e0abfc86513b4
 EBUILD krita-2.1.1.ebuild 1330 RMD160 7c2b1ccd98fd7de28893ec41808103a840b09217 SHA1 f37bc8e8ec219271729352cfb8673b6f5c3d1f43 SHA256 b320c9c66663c6918ca8e359bc007e08470953056add51afc8ca62562fbcf497
-EBUILD krita-2.1.2.ebuild 1337 RMD160 152c7d23b6e6d6f73b78d11f13529078c27e4322 SHA1 d159ebea19ca03d2692382de7c37f0d4cbb84e90 SHA256 12c90b848f0232f25a7f8a56f212556913a64a60d1719915cdfb885a4629ba32
-MISC ChangeLog 13706 RMD160 3bed37dbf66db37e12e0bb3d0c9d7700123f15a5 SHA1 092bcffbea2902275550fc3d7f584d6c04d20e3b SHA256 706871f4fd6899807e21d35a6a1cb6817d81b5d4e3811eef7a449244390b27de
+EBUILD krita-2.1.2.ebuild 1369 RMD160 a88f91bde50f5cb9729dce4b9256b1538c2f8d40 SHA1 360e5de436f9a8a5fbbccf1a1d27794a943169b3 SHA256 9bc416c67bf289a90f31c83d702c2afd51b2735053c04ba3c60bec11789b6234
+MISC ChangeLog 13867 RMD160 19d2b63550e6e430906ebffb1982c2cb8688d80d SHA1 4cb3444b4f0da6d46eb141b52c2a87b4db4988ee SHA256 c875315871a34ab82b624955d5ba962538e41d60fe7fef9e51a7b47bdbdca4e2
 MISC metadata.xml 318 RMD160 2341b49b24f95cc26f19933f8a785c5550970e3f SHA1 7264bf7bba1b5e206e47b8e85b783d3f5292ecc9 SHA256 41a628ecdd9b2fcd3405c2a146b1780eb75d282b956da88120963e441a1135d4
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
+Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAku1xMgACgkQHB6c3gNBRYdYXQCeLCKuETP17ZBuJyxUMTP9gFbp
-JdwAoKK5qV9DF2gH49O5VpKlMJZtUH+u
-=6wtV
+iEYEARECAAYFAkvCSlMACgkQiqiDRvmkBmKNfQCfWpIz8aK2o5hlhaKskcT0Il3Y
+rKYAniOYvZwJe5gjK6h5kQwkONZzdC8N
+=sNek
 -----END PGP SIGNATURE-----
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}