Add patch for gcc-4.6.1. Bug #381063. Thanks to Helmut Jarausch <jarausch@igpm.rwth-aachen.de>

Package-Manager: portage-2.2.0_alpha51/cvs/Linux x86_64

4 files changed, 40 insertions, 19 deletions

diff --git a/media-gfx/pencil/ChangeLog b/media-gfx/pencil/ChangeLog
index a526933cb31e..cc081a5bdfb3 100644
--- a/media-gfx/pencil/ChangeLog
+++ b/media-gfx/pencil/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/pencil
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/pencil/ChangeLog,v 1.2 2011/08/28 10:49:57 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/pencil/ChangeLog,v 1.3 2011/09/06 09:00:43 hwoarang Exp $
+
+  06 Sep 2011; Markos Chandras <hwoarang@gentoo.org> pencil-0.4.4_beta.ebuild,
+  +files/pencil-0.4.4_beta-gcc461.patch:
+  Add patch for gcc-4.6.1. Bug #381063. Thanks to Helmut Jarausch
+  <jarausch@igpm.rwth-aachen.de>
 
   28 Aug 2011; Markos Chandras <hwoarang@gentoo.org> pencil-0.4.4_beta.ebuild:
   Add missing qt-opengl dependency
diff --git a/media-gfx/pencil/Manifest b/media-gfx/pencil/Manifest
index 24a04b715268..7c093b664bc5 100644
--- a/media-gfx/pencil/Manifest
+++ b/media-gfx/pencil/Manifest
@@ -1,24 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
+AUX pencil-0.4.4_beta-gcc461.patch 819 RMD160 e5c1656d21c1ec1da90f46f180f2cd1f8dfe495b SHA1 05cb951b2ba3e8a2ea40e00c818834c83fb5dbac SHA256 800c08700693c7eceaa268c35ed9102c81b3e0d85f6aba539772a146927d8f87
 DIST pencil-0.4.4b-src.zip 1147003 RMD160 31eb569b4f0a402484d797b15330c7fcf1137bc7 SHA1 abddbdeb6e45dc6ab7bbabced0fb72dca645b6dd SHA256 8a1373e745d9c039e15c7b3f0c1846190fcc4621306b2dd507c31ac31de64303
-EBUILD pencil-0.4.4_beta.ebuild 1057 RMD160 4c61defea2960c516e4ee193031807f27b89b6c1 SHA1 50bb21821a5e39902dc1fb09e28bc40700c17a8a SHA256 baf579331cf5c784d26a0fa6d6aca35650d1b5d0e29d02ef34c2f00bda623ea6
-MISC ChangeLog 561 RMD160 d9eb18a2e2518c6969e584ea3a4d7a5644fac713 SHA1 2744195b1e4ecd05502f85ad68bf8912d6b48ecc SHA256 88f12d1bd8846fb3800b3ec91758997d1c7932b29a581799396f106b122c80ee
+EBUILD pencil-0.4.4_beta.ebuild 1111 RMD160 89eb337db6cda50915ce2db1f59b3748da935928 SHA1 d5c84375379a6da782267ed698788e7e1c8a5514 SHA256 81672a676279b215c81a69c73dca1ef4bd373e27fe0c65c0c1fd21a6ddee95f5
+MISC ChangeLog 781 RMD160 2a549939e22ea99586f472d37e4daaadffef9cd5 SHA1 60762cd75c1caaca1e747d24b440212149309489 SHA256 fe67d595c9124723228e4a9f1745e3003c7bdf926330fc42de4b1c0ab087a6a5
 MISC metadata.xml 294 RMD160 ac4e1baa0a1839ae0a807a9d4b915134788d6aa1 SHA1 82865de14486cb30dc9ebfe6f1aecc9c86c0075b SHA256 209af586ae032f00659b69da17d4186854660be14b244d31aa0bea2005c2c5ba
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOWh0EAAoJEPqDWhW0r/LCC4YP/RK0e7mFj9dO68GNNWQjElMJ
-xYxr0nKZwKev7jmChhnsl3zOGDOhVtQkubxinu5rqkOKemlwzQoIwqneSzgau7wz
-nJaYKIBZzINoDy8/IHFj9wM10ZpjNaV2D24ivo4jq11ZumJEXtnIXgwo1BoAXBKg
-ZKmbOfpTrFWRbd15hoWRd8CDRHKCZ+BW8DuGYUwq4t2x3ihx+7Bt04KHPuyqfRnx
-97/AidnRqhiPKrJsG58/nhJJZiPa3CEbwdrDfIyaYKECdgYNfBMJpwCHP+wDdzbF
-1Hllm7pFTAHpECeyfuPQKMEN+JtaTgyQSpT24KgYXdJdfFdQQA4DmjEPCHdatH5n
-PjONWslRbOhOZrkGPNtzfHvCOJ2Tm/TzZrGRkSnVZEpcjs4LKGekahfxLjWr0fnf
-PssF7OWlYYbBxCj2ZgTFcXVzTkSXL/2qxu2L7MIYBEpiCcHrcI+rO6/jOHVmmeek
-9hZwTbnmdD7TXya61JGwWnee8Pe3XgKcMUbR5U9wkrQmfDy/ZfV4covyL9I/sPTM
-82OrqYzYjFQ7AgLG1wTHBcd/tHSVgAysbAwM+JUHt88viDfrL9SBCn7CRO0Oz1iY
-TwkJMpAX6KIKVc9dHTgt5U/eIEosROfFC2fA9pQm73+oR+/T8Qx4P0UFw+Ji+uIo
-UGO3kX16L0yYEaLchTWi
-=wTdN
+iQIcBAEBCgAGBQJOZeECAAoJEPqDWhW0r/LCM2QP/iqbKxtyRaQPzV2o7kJwim0A
+RFfH5oZWG7TmTHBGu47GBOICSknkl0T4CViXYhgb+ZzFBQoqwipSRvXzWPY1lXAi
+eDbm+6+2Q8UnnbqXsOeMkdRI6I4/dnStXj17XDKqcwg+rbUJmdOhiJVFk1FCsN8C
++D66/suatXeLFEKCQ+wErdNMHeKKt+urhgQhMdjYHFD9Ic8OavBCo6TWO5Yz2EY1
+cjJeBUbk3bSSZvhNu1aMIwFm1kdyLX90a8KSSHZdNSn3jqqW3XVJPmewiLWzEj7S
+3+foIUZSA0a234wf2pvQuHbQGYLrQ9AFYviJOF+Xn/SR0IL8Z6EIrw+RiC3/NM+S
+SEDFRK7cw6v4eBMYNUJsf00SIvdtpCSYy8WP/w64vQ7z069JtY+fyjfmHnpC7k8i
+YHiKv0iT7L1y01d2xgqB8AcXJ4IB/WwmeWUe0hu3suG9HBjS0VuueCdijofUtDiI
+Vt7r2pqbp6EZ/3XuiiSijibT2Zg/RWFmTMeXpgTb5sEenzYrcNiD1Nb8F2CkhxYe
+Xqj5pmuFAkOgJQzzJwpzL17Qf8JszI0MQqZO+zuGIwRTnl6cWRNh6jvkgO8GGnNY
+vg5PZ625nqZ+bUKw2lMjklPW2sbLIBgWdeoou7s4YMg8nxd4V9MEuVuwYkcfHJSN
+N0wGMFAJgAfceXJ3hDTJ
+=SRIw
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/pencil/files/pencil-0.4.4_beta-gcc461.patch b/media-gfx/pencil/files/pencil-0.4.4_beta-gcc461.patch
new file mode 100644
index 000000000000..d0aa8936b8fd
--- /dev/null
+++ b/media-gfx/pencil/files/pencil-0.4.4_beta-gcc461.patch
@@ -0,0 +1,14 @@
+--- src/graphics/vector/beziercurve.cpp	2007-07-14 21:41:33.000000000 +0200
++++ src/graphics/vector/beziercurve.cpp	2011-08-29 16:19:08.930675072 +0200
+@@ -700,9 +700,9 @@ 
+ 	R1.setTopLeft(P1); R1.setBottomRight(Q1);
+ 	R2.setTopLeft(P2); R2.setBottomRight(Q2);
+ 	
+-	//QPointF intersectionPoint = QPointF(50.0, 50.0); // bogus point
++	QPointF intersectionPoint = QPointF(50.0, 50.0); // bogus point
+ 	//QPointF* intersection = &intersectionPoint;
+-	QPointF* cubicIntersection = &QPointF(50.0, 50.0); // bogus point
++	QPointF* cubicIntersection = &intersectionPoint; // bogus point
+ 	if( R1.intersects(R2) || L2.intersect(L1, cubicIntersection) == QLineF::BoundedIntersection ) {
+ 	//if(L2.intersect(L1, intersection) == QLineF::BoundedIntersection) {
+ 		//qDebug() << "                   FOUND rectangle intersection ";
diff --git a/media-gfx/pencil/pencil-0.4.4_beta.ebuild b/media-gfx/pencil/pencil-0.4.4_beta.ebuild
index 205eab33ae21..c2f43268367a 100644
--- a/media-gfx/pencil/pencil-0.4.4_beta.ebuild
+++ b/media-gfx/pencil/pencil-0.4.4_beta.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/pencil/pencil-0.4.4_beta.ebuild,v 1.2 2011/08/28 10:49:57 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/pencil/pencil-0.4.4_beta.ebuild,v 1.3 2011/09/06 09:00:43 hwoarang Exp $
 
 EAPI=2
-inherit qt4-r2
+inherit eutils qt4-r2
 
 MY_P=${P/_beta/b}
 
@@ -25,7 +25,8 @@ DEPEND="${RDEPEND}
 S=${WORKDIR}/${MY_P}-source
 
 src_prepare() {
-	sed -i s:SWFSprite:SWFMovieClip:g src/external/flash/flash.{cpp,h}
+	epatch "${FILESDIR}"/${P}-gcc461.patch
+	sed -i s:SWFSprite:SWFMovieClip:g src/external/flash/flash.{cpp,h} || die
 }
 
 src_install() {