Added patch to allow compilation with gcc-4.3.

(Portage version: 2.2_rc8/cvs/Linux 2.6.26-SENTINEL-2 i686)

3 files changed, 98 insertions, 5 deletions

diff --git a/sci-calculators/fung-calc/ChangeLog b/sci-calculators/fung-calc/ChangeLog
index ad5592330262..8ee3c14e3910 100644
--- a/sci-calculators/fung-calc/ChangeLog
+++ b/sci-calculators/fung-calc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-calculators/fung-calc
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-calculators/fung-calc/ChangeLog,v 1.12 2008/04/25 13:39:49 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-calculators/fung-calc/ChangeLog,v 1.13 2008/08/16 11:26:27 markusle Exp $
+
+  16 Aug 2008; Markus Dittrich <markusle@gentoo.org>
+  +files/fung-calc-1.3.2b-gcc4.3.patch, fung-calc-1.3.2b.ebuild:
+  Added patch to allow compilation with gcc-4.3.
 
   25 Apr 2008; Ingmar Vanhassel <ingmar@gentoo.org> fung-calc-1.3.2b.ebuild:
   Quote FILESDIR.
diff --git a/sci-calculators/fung-calc/files/fung-calc-1.3.2b-gcc4.3.patch b/sci-calculators/fung-calc/files/fung-calc-1.3.2b-gcc4.3.patch
new file mode 100644
index 000000000000..fcfbdbeec169
--- /dev/null
+++ b/sci-calculators/fung-calc/files/fung-calc-1.3.2b-gcc4.3.patch
@@ -0,0 +1,88 @@
+diff -Naur fung-calc-1.3.2b/src/libfungcalcui/2D/densityplotmain.ui.h fung-calc-1.3.2b.new/src/libfungcalcui/2D/densityplotmain.ui.h
+--- fung-calc-1.3.2b/src/libfungcalcui/2D/densityplotmain.ui.h	2003-07-16 00:59:42.000000000 -0400
++++ fung-calc-1.3.2b.new/src/libfungcalcui/2D/densityplotmain.ui.h	2008-08-16 07:12:01.000000000 -0400
+@@ -7,6 +7,7 @@
+ *****************************************************************************/
+ #include <fstream>
+ #include <ctime>
++#include <cstdlib>
+ 
+ #include "expression.h"
+ 
+diff -Naur fung-calc-1.3.2b/src/libfungcalcui/2D/functiongraphmain.ui.h fung-calc-1.3.2b.new/src/libfungcalcui/2D/functiongraphmain.ui.h
+--- fung-calc-1.3.2b/src/libfungcalcui/2D/functiongraphmain.ui.h	2003-07-16 00:59:42.000000000 -0400
++++ fung-calc-1.3.2b.new/src/libfungcalcui/2D/functiongraphmain.ui.h	2008-08-16 07:10:05.000000000 -0400
+@@ -7,6 +7,7 @@
+ *****************************************************************************/
+ #include <fstream>
+ #include <ctime>
++#include <cstdlib>
+ 
+ #include "expression.h"
+ 
+diff -Naur fung-calc-1.3.2b/src/libfungcalcui/2D/parametricgraphmain.ui.h fung-calc-1.3.2b.new/src/libfungcalcui/2D/parametricgraphmain.ui.h
+--- fung-calc-1.3.2b/src/libfungcalcui/2D/parametricgraphmain.ui.h	2003-07-16 00:59:42.000000000 -0400
++++ fung-calc-1.3.2b.new/src/libfungcalcui/2D/parametricgraphmain.ui.h	2008-08-16 07:10:40.000000000 -0400
+@@ -7,6 +7,7 @@
+ *****************************************************************************/
+ #include <fstream>
+ #include <ctime>
++#include <cstdlib>
+ 
+ #include "expression.h"
+ 
+diff -Naur fung-calc-1.3.2b/src/libfungcalcui/2D/polargraphmain.ui.h fung-calc-1.3.2b.new/src/libfungcalcui/2D/polargraphmain.ui.h
+--- fung-calc-1.3.2b/src/libfungcalcui/2D/polargraphmain.ui.h	2003-07-16 00:59:42.000000000 -0400
++++ fung-calc-1.3.2b.new/src/libfungcalcui/2D/polargraphmain.ui.h	2008-08-16 07:09:27.000000000 -0400
+@@ -7,6 +7,7 @@
+ *****************************************************************************/
+ #include <fstream>
+ #include <ctime>
++#include <cstdlib>
+ 
+ #include "expression.h"
+ 
+diff -Naur fung-calc-1.3.2b/src/libfungcalcui/2D/statplotgraphmain.ui.h fung-calc-1.3.2b.new/src/libfungcalcui/2D/statplotgraphmain.ui.h
+--- fung-calc-1.3.2b/src/libfungcalcui/2D/statplotgraphmain.ui.h	2003-07-16 00:59:42.000000000 -0400
++++ fung-calc-1.3.2b.new/src/libfungcalcui/2D/statplotgraphmain.ui.h	2008-08-16 07:10:53.000000000 -0400
+@@ -8,6 +8,7 @@
+ 
+ #include <fstream>
+ #include <ctime>
++#include <cstdlib>
+ 
+ #include <qbuttongroup.h>
+ #include <qmessagebox.h>
+diff -Naur fung-calc-1.3.2b/src/libfungcalcui/3D/glcylindricalgraphmain.ui.h fung-calc-1.3.2b.new/src/libfungcalcui/3D/glcylindricalgraphmain.ui.h
+--- fung-calc-1.3.2b/src/libfungcalcui/3D/glcylindricalgraphmain.ui.h	2003-07-16 00:59:44.000000000 -0400
++++ fung-calc-1.3.2b.new/src/libfungcalcui/3D/glcylindricalgraphmain.ui.h	2008-08-16 07:16:35.000000000 -0400
+@@ -9,6 +9,7 @@
+ #include <fstream>
+ #include <iostream>
+ #include <ctime>
++#include <cstdlib>
+ 
+ #include "expression.h"
+ 
+diff -Naur fung-calc-1.3.2b/src/libfungcalcui/3D/glfunctiongraphmain.ui.h fung-calc-1.3.2b.new/src/libfungcalcui/3D/glfunctiongraphmain.ui.h
+--- fung-calc-1.3.2b/src/libfungcalcui/3D/glfunctiongraphmain.ui.h	2003-07-16 00:59:44.000000000 -0400
++++ fung-calc-1.3.2b.new/src/libfungcalcui/3D/glfunctiongraphmain.ui.h	2008-08-16 07:16:32.000000000 -0400
+@@ -9,6 +9,7 @@
+ #include <fstream>
+ #include <iostream>
+ #include <ctime>
++#include <cstdlib>
+ 
+ #include "expression.h"
+ 
+diff -Naur fung-calc-1.3.2b/src/libfungcalcui/3D/glpolargraphmain.ui.h fung-calc-1.3.2b.new/src/libfungcalcui/3D/glpolargraphmain.ui.h
+--- fung-calc-1.3.2b/src/libfungcalcui/3D/glpolargraphmain.ui.h	2003-07-16 00:59:44.000000000 -0400
++++ fung-calc-1.3.2b.new/src/libfungcalcui/3D/glpolargraphmain.ui.h	2008-08-16 07:16:28.000000000 -0400
+@@ -9,6 +9,7 @@
+ #include <fstream>
+ #include <iostream>
+ #include <ctime>
++#include <cstdlib>
+ 
+ #include "expression.h"
+ 
diff --git a/sci-calculators/fung-calc/fung-calc-1.3.2b.ebuild b/sci-calculators/fung-calc/fung-calc-1.3.2b.ebuild
index eb6361d94f8d..41c327138b69 100644
--- a/sci-calculators/fung-calc/fung-calc-1.3.2b.ebuild
+++ b/sci-calculators/fung-calc/fung-calc-1.3.2b.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-calculators/fung-calc/fung-calc-1.3.2b.ebuild,v 1.11 2008/04/25 13:39:49 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-calculators/fung-calc/fung-calc-1.3.2b.ebuild,v 1.12 2008/08/16 11:26:27 markusle Exp $
 
 inherit kde eutils flag-o-matic
 
@@ -25,9 +25,10 @@ need-qt 3.1
 src_unpack() {
 	kde_src_unpack
 
-	epatch "${FILESDIR}"/fung-calc-fPIC
-	epatch "${FILESDIR}"/fung-calc-gcc34-fix
-	use arts || epatch "${FILESDIR}"/fung-calc-1.3.2b-configure.patch
+	epatch "${FILESDIR}"/${PN}-fPIC
+	epatch "${FILESDIR}"/${PN}-gcc34-fix
+	epatch "${FILESDIR}"/${P}-gcc4.3.patch
+	use arts || epatch "${FILESDIR}"/${P}-configure.patch
 }
 
 src_compile() {