Fix bug 239330, gcc-4.3 compat. Thanks to Dmitry Halturin for the patch.

Package-Manager: portage-2.2_rc17/cvs/Linux 2.6.28-rc6 x86_64

4 files changed, 113 insertions, 7 deletions

diff --git a/sci-electronics/ktechlab/ChangeLog b/sci-electronics/ktechlab/ChangeLog
index c306895f50d6..d701290c7d7c 100644
--- a/sci-electronics/ktechlab/ChangeLog
+++ b/sci-electronics/ktechlab/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-electronics/ktechlab
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/ktechlab/ChangeLog,v 1.13 2007/10/17 00:33:18 dirtyepic Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/ktechlab/ChangeLog,v 1.14 2008/12/19 20:51:00 loki_val Exp $
+
+  19 Dec 2008; Peter Alfredsen <loki_val@gentoo.org>
+  +files/ktechlab-0.3.6-gcc43.patch, ktechlab-0.3.6.ebuild:
+  Fix bug 239330, gcc-4.3 compat. Thanks to Dmitry Halturin for the patch.
 
   17 Oct 2007; Ryan Hill <dirtyepic@gentoo.org>
   +files/ktechlab-0.3.6-gcc42.patch, ktechlab-0.3.6.ebuild:
diff --git a/sci-electronics/ktechlab/Manifest b/sci-electronics/ktechlab/Manifest
index f6e3e600c03a..e22b17e6362f 100644
--- a/sci-electronics/ktechlab/Manifest
+++ b/sci-electronics/ktechlab/Manifest
@@ -1,6 +1,7 @@
 AUX ktechlab-0.3-gcc-4.1.patch 277 RMD160 1a58d5476b953276eb2950a35f78e6d0f981d87c SHA1 a4fbd3ea78d29c1b36edf8e9954980052217c474 SHA256 e620f27aa9ba40c3e287d38dc15facd7c99d72ce81667fb449ae26c5db507795
 AUX ktechlab-0.3.6-gcc42.patch 1017 RMD160 75036ead760dfca7afd3cfdd578656c7c84de564 SHA1 e33cd8aba85a5e0bfdf7980cbe87da54beba4c58 SHA256 fc0c31f3d4207584b29e3da125e61f649f8ad910b963d71069217b1ff3b6418e
+AUX ktechlab-0.3.6-gcc43.patch 3755 RMD160 2763c045f4fd2d929aa4738470283deee4e81c0a SHA1 d33ca591f234720d6efb54110296e486f4c58808 SHA256 95b8158a6d49856d4d2d260b5c6a9ab15a8aecbfd6912cb342091abf0aac324c
 DIST ktechlab-0.3.6.tar.bz2 1223310 RMD160 9cdb7e60bc7792a4bcad0d2cd67214334288034a SHA1 46a7e9e31fbeb4c9eb96df6ac671a9f41e1beb42 SHA256 61f4c270c2db5d0de7456524d39009b830b97640bebc9fb764de7b0d97003e80
-EBUILD ktechlab-0.3.6.ebuild 686 RMD160 cefbbe76f1626659f69041005d4aca9e5520fc83 SHA1 8630924a5ea48f452ca9f6f7b6f20b33b93a49ac SHA256 6478ef2fae491d09091ed221b67c2f35d33baeb34481fbe2c12d8ecdf5a88b7b
-MISC ChangeLog 2230 RMD160 b2ed744d8ccc78ea421a2f8b542bae1dedec92aa SHA1 92d4bfcb8a72c4db463c9828be75db6eceb51319 SHA256 3a17547ea7f1f205af4180d5b5b081bcf535da95f114c8eb27b5d119ae8fad7e
+EBUILD ktechlab-0.3.6.ebuild 727 RMD160 21fb8f9848f0a5aa4076cfe863c31dba259f80c5 SHA1 81fa0a53588aa875da1a857bef2338c2dad08a73 SHA256 59f1f37c6e4466c6bb597b9c18bcb29cd06b32c24427ad2717327cbdef9dd701
+MISC ChangeLog 2418 RMD160 9981913d41864e6698ae21ae5891c24f0fc86f43 SHA1 fa117ce735d50d30dc73fb8d9e04823a6cfbd984 SHA256 7e38292b75edcec635b842c901ff4c0c5cadc491bacba756504c397c2222b90d
 MISC metadata.xml 562 RMD160 6817b8aff93cc8b515e9aab82ef360d2be6a3740 SHA1 e9f07dd6e8c989ccb9c1917119ff26102e4eabbb SHA256 224d547024b704798e3a67e46eb21f544a1e790eb830ccf69635efe66001ba03
diff --git a/sci-electronics/ktechlab/files/ktechlab-0.3.6-gcc43.patch b/sci-electronics/ktechlab/files/ktechlab-0.3.6-gcc43.patch
new file mode 100644
index 000000000000..aedd54256dbe
--- /dev/null
+++ b/sci-electronics/ktechlab/files/ktechlab-0.3.6-gcc43.patch
@@ -0,0 +1,98 @@
+diff -Naurd ktechlab-0.3.orig/src/cells.h ktechlab-0.3/src/cells.h
+--- ktechlab-0.3.orig/src/cells.h	2005-12-30 14:22:12.000000000 +0300
++++ ktechlab-0.3/src/cells.h	2008-11-08 03:28:22.000000000 +0300
+@@ -52,6 +52,9 @@
+ /**
+ @author David Saxton
+ */
++
++typedef unsigned int uint;
++
+ class Cells
+ {
+ public:
+diff -Naurd ktechlab-0.3.orig/src/cnitem.cpp ktechlab-0.3/src/cnitem.cpp
+--- ktechlab-0.3.orig/src/cnitem.cpp	2005-12-30 14:22:12.000000000 +0300
++++ ktechlab-0.3/src/cnitem.cpp	2008-11-08 03:27:01.000000000 +0300
+@@ -65,8 +65,8 @@
+ 
+ bool CNItem::preResize( QRect sizeRect )
+ {
+-	if ( (std::abs(sizeRect.width()) < minimumSize().width()) ||
+-		 (std::abs(sizeRect.height()) < minimumSize().height()) )
++	if ( (std::abs((double)sizeRect.width()) < minimumSize().width()) ||
++		 (std::abs((double)sizeRect.height()) < minimumSize().height()) )
+ 		return false;
+ 	
+ 	updateConnectorPoints(false);
+diff -Naurd ktechlab-0.3.orig/src/conrouter.cpp ktechlab-0.3/src/conrouter.cpp
+--- ktechlab-0.3.orig/src/conrouter.cpp	2005-12-30 14:22:12.000000000 +0300
++++ ktechlab-0.3/src/conrouter.cpp	2008-11-08 03:22:28.000000000 +0300
+@@ -492,7 +492,7 @@
+ 	{
+ 		for ( int x = start; x!=end; x+=dd )
+ 		{
+-			if ( std::abs(x-start)>1 && std::abs(x-end)>1 && ((*cells)[x][y].CIpenalty > maxCIScore || (*cells)[x][y].Cpenalty > maxConScore) )
++			if ( std::abs((double)(x-start))>1 && std::abs((double)(x-end))>1 && ((*cells)[x][y].CIpenalty > maxCIScore || (*cells)[x][y].Cpenalty > maxConScore) )
+ 			{
+ 				return false;
+ 			} else {
+@@ -504,7 +504,7 @@
+ 	{
+ 		for ( int y = start; y!=end; y+=dd )
+ 		{
+-			if ( std::abs(y-start)>1 && std::abs(y-end)>1 && ((*cells)[x][y].CIpenalty > maxCIScore || (*cells)[x][y].Cpenalty > maxConScore) )
++			if ( std::abs((double)(y-start))>1 && std::abs((double)(y-end))>1 && ((*cells)[x][y].CIpenalty > maxCIScore || (*cells)[x][y].Cpenalty > maxConScore) )
+ 			{
+ 				return false;
+ 			} else {
+diff -Naurd ktechlab-0.3.orig/src/electronics/simulation/matrix.cpp ktechlab-0.3/src/electronics/simulation/matrix.cpp
+--- ktechlab-0.3.orig/src/electronics/simulation/matrix.cpp	2005-12-30 14:22:06.000000000 +0300
++++ ktechlab-0.3/src/electronics/simulation/matrix.cpp	2008-11-08 03:28:51.000000000 +0300
+@@ -288,7 +288,7 @@
+ Map::Map( const uint size )
+ {
+ 	m_size = size;
+-	m_map = new ETMap( m_size, m_size );
++	m_map = new ETMap( m_size );
+ 	reset();
+ }
+ 
+diff -Naurd ktechlab-0.3.orig/src/nodegroup.cpp ktechlab-0.3/src/nodegroup.cpp
+--- ktechlab-0.3.orig/src/nodegroup.cpp	2005-12-30 14:22:12.000000000 +0300
++++ ktechlab-0.3/src/nodegroup.cpp	2008-11-08 03:25:27.000000000 +0300
+@@ -16,6 +16,7 @@
+ 
+ #include <kdebug.h>
+ #include <assert.h>
++#include <cmath>
+ 
+ NodeGroup::NodeGroup( ICNDocument *icnDocument, const char *name )
+ 	: QObject( icnDocument, name )
+@@ -274,7 +275,7 @@
+ 		{
+ 			if ( *it1 != *it2 && (*it1)->y() == (*it2)->y() && canRoute( *it1, *it2 ) )
+ 			{
+-				const int distance = std::abs(int( (*it1)->x()-(*it2)->x() ));
++				const int distance = std::abs((double)( (*it1)->x()-(*it2)->x() ));
+ 				if ( distance < shortest )
+ 				{
+ 					shortest = distance;
+@@ -296,7 +297,7 @@
+ 		{
+ 			if ( *it1 != *it2 && (*it1)->x() == (*it2)->x() && canRoute( *it1, *it2 ) )
+ 			{
+-				const int distance = std::abs(int( (*it1)->y()-(*it2)->y() ));
++				const int distance = std::abs((double)( (*it1)->y()-(*it2)->y() ));
+ 				if ( distance < shortest )
+ 				{
+ 					shortest = distance;
+@@ -320,7 +321,7 @@
+ 			{
+ 				const int dx = (int)((*it1)->x()-(*it2)->x());
+ 				const int dy = (int)((*it1)->y()-(*it2)->y());
+-				const int distance = std::abs(dx) + std::abs(dy);
++				const int distance = std::abs((double)dx) + std::abs((double)dy);
+ 				if ( distance < shortest )
+ 				{
+ 					shortest = distance;
diff --git a/sci-electronics/ktechlab/ktechlab-0.3.6.ebuild b/sci-electronics/ktechlab/ktechlab-0.3.6.ebuild
index 598cebeda930..709d4557ab0f 100644
--- a/sci-electronics/ktechlab/ktechlab-0.3.6.ebuild
+++ b/sci-electronics/ktechlab/ktechlab-0.3.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/ktechlab/ktechlab-0.3.6.ebuild,v 1.3 2007/10/17 00:33:18 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/ktechlab/ktechlab-0.3.6.ebuild,v 1.4 2008/12/19 20:51:00 loki_val Exp $
 
 inherit kde
 
@@ -22,4 +22,7 @@ UNSERMAKE=""
 
 S="${WORKDIR}/${PN}-0.3"
 
-PATCHES="${FILESDIR}/${PN}-0.3-gcc-4.1.patch ${FILESDIR}/${P}-gcc42.patch"
+PATCHES=(	"${FILESDIR}/${PN}-0.3-gcc-4.1.patch"
+		"${FILESDIR}/${P}-gcc42.patch"
+		"${FILESDIR}/${P}-gcc43.patch"
+	)