Replaced imagemagick patch which broke due to additiona autoconf step (fixes bug #223321). Added gcc4.3 compile patch.

(Portage version: 2.1.5.2)

4 files changed, 89 insertions, 3 deletions

diff --git a/dev-lang/gdl/ChangeLog b/dev-lang/gdl/ChangeLog
index b8f93a22639c..ac81e1b95816 100644
--- a/dev-lang/gdl/ChangeLog
+++ b/dev-lang/gdl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lang/gdl
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/gdl/ChangeLog,v 1.7 2008/05/22 15:29:37 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gdl/ChangeLog,v 1.8 2008/05/24 17:52:25 markusle Exp $
+
+  24 May 2008; Markus Dittrich <markusle@gentoo.org>
+  +files/gdl-0.9_rc1-magick.patch, +files/gdl-0.9_rc1-gcc4.3.patch,
+  gdl-0.9_rc1.ebuild:
+  Replaced imagemagick patch which broke due to additiona autoconf step
+  (fixes bug #223321). Added gcc4.3 compile patch.
 
 *gdl-0.9_rc1 (22 May 2008)
 
diff --git a/dev-lang/gdl/files/gdl-0.9_rc1-gcc4.3.patch b/dev-lang/gdl/files/gdl-0.9_rc1-gcc4.3.patch
new file mode 100644
index 000000000000..34e0641abf38
--- /dev/null
+++ b/dev-lang/gdl/files/gdl-0.9_rc1-gcc4.3.patch
@@ -0,0 +1,58 @@
+diff -Naur gdl-0.9rc1/src/antlr/CharScanner.hpp gdl-0.9rc1.new/src/antlr/CharScanner.hpp
+--- gdl-0.9rc1/src/antlr/CharScanner.hpp	2008-04-03 18:09:26.000000000 -0400
++++ gdl-0.9rc1.new/src/antlr/CharScanner.hpp	2008-05-24 13:30:50.000000000 -0400
+@@ -11,6 +11,10 @@
+ #include <antlr/config.hpp>
+ 
+ #include <map>
++#include <cstdlib>
++#include <cstring>
++
++
+ 
+ #ifdef HAS_NOT_CCTYPE_H
+ #include <ctype.h>
+diff -Naur gdl-0.9rc1/src/antlr/Parser.cpp gdl-0.9rc1.new/src/antlr/Parser.cpp
+--- gdl-0.9rc1/src/antlr/Parser.cpp	2008-04-03 18:09:26.000000000 -0400
++++ gdl-0.9rc1.new/src/antlr/Parser.cpp	2008-05-24 13:31:51.000000000 -0400
+@@ -12,6 +12,7 @@
+ #include "antlr/MismatchedTokenException.hpp"
+ //#include "antlr/ASTFactory.hpp"
+ #include <iostream>
++#include <cstdlib>
+ 
+ #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE
+ namespace antlr {
+diff -Naur gdl-0.9rc1/src/antlr/TreeParser.cpp gdl-0.9rc1.new/src/antlr/TreeParser.cpp
+--- gdl-0.9rc1/src/antlr/TreeParser.cpp	2008-04-03 18:09:26.000000000 -0400
++++ gdl-0.9rc1.new/src/antlr/TreeParser.cpp	2008-05-24 13:32:28.000000000 -0400
+@@ -9,6 +9,7 @@
+ #include "antlr/ASTNULLType.hpp"
+ #include "antlr/MismatchedTokenException.hpp"
+ #include <iostream>
++#include <cstdlib>
+ #include <stdio.h>
+ 
+ #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE
+diff -Naur gdl-0.9rc1/src/basic_op.cpp gdl-0.9rc1.new/src/basic_op.cpp
+--- gdl-0.9rc1/src/basic_op.cpp	2008-04-03 18:09:27.000000000 -0400
++++ gdl-0.9rc1.new/src/basic_op.cpp	2008-05-24 13:34:56.000000000 -0400
+@@ -26,6 +26,7 @@
+ 
+ //#include <csignal>
+ #include "sigfpehandler.hpp"
++#include <iterator>
+ 
+ using namespace std;
+ 
+diff -Naur gdl-0.9rc1/src/basic_pro.cpp gdl-0.9rc1.new/src/basic_pro.cpp
+--- gdl-0.9rc1/src/basic_pro.cpp	2008-04-05 22:06:34.000000000 -0400
++++ gdl-0.9rc1.new/src/basic_pro.cpp	2008-05-24 13:35:13.000000000 -0400
+@@ -21,6 +21,7 @@
+ #include <fstream>
+ #include <memory>
+ #include <set>
++#include <iterator>
+ 
+ #include <sys/stat.h>
+ #include <sys/types.h>
diff --git a/dev-lang/gdl/files/gdl-0.9_rc1-magick.patch b/dev-lang/gdl/files/gdl-0.9_rc1-magick.patch
new file mode 100644
index 000000000000..da36c86efcb8
--- /dev/null
+++ b/dev-lang/gdl/files/gdl-0.9_rc1-magick.patch
@@ -0,0 +1,21 @@
+diff -Naur gdl-0.9rc1/configure.in gdl-0.9rc1.new/configure.in
+--- gdl-0.9rc1/configure.in	2008-04-05 22:16:09.000000000 -0400
++++ gdl-0.9rc1.new/configure.in	2008-05-24 13:20:50.000000000 -0400
+@@ -278,14 +278,14 @@
+ 
+ if test "x$with_Magick" != "xno"; then
+   if test "x$with_Magick" != "xyes"; then
+-    LIBS="$LIBS -L$with_Magick/lib -lMagick++"
++    LIBS="$LIBS $(Magick++-config --libs)"
+     INCLUDES="$INCLUDES -I$with_Magick/include"
+   else
+     LIBS="$LIBS -lMagick++"
+-    INCLUDES="$INCLUDES -I/usr/include/magick"
++    INCLUDES="$INCLUDES $(Magick++-config --cppflags)"
+   fi
+ 
+-  AC_CHECK_LIB(Magick, GetMagickVersion, [AC_DEFINE([USE_MAGICK], [1], [Define if you want to use ImageMagick])], [
++  AC_CHECK_LIB(Magick++, GetMagickVersion, [AC_DEFINE([USE_MAGICK], [1], [Define if you want to use ImageMagick])], [
+     echo ""
+     echo "Error! ImageMagick version 5.5.7 or later is required but was not found"
+     echo "       Use --with-Magick=DIR to specify the ImageMagick directory tree"
diff --git a/dev-lang/gdl/gdl-0.9_rc1.ebuild b/dev-lang/gdl/gdl-0.9_rc1.ebuild
index 98151c57c454..a7a972f4fa61 100644
--- a/dev-lang/gdl/gdl-0.9_rc1.ebuild
+++ b/dev-lang/gdl/gdl-0.9_rc1.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/dev-lang/gdl/gdl-0.9_rc1.ebuild,v 1.1 2008/05/22 15:29:37 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gdl/gdl-0.9_rc1.ebuild,v 1.2 2008/05/24 17:52:25 markusle Exp $
 
 inherit eutils flag-o-matic autotools
 
@@ -34,7 +34,8 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}"/${P}-proj4.patch
-	epatch "${FILESDIR}"/${PN}-0.9_pre6-magick.patch
+	epatch "${FILESDIR}"/${P}-magick.patch
+	epatch "${FILESDIR}"/${P}-gcc4.3.patch
 
 	#if has_version ">=sci-libs/plplot-5.9.0"; then
 		#epatch "${FILESDIR}"/${PN}-0.9_pre6-plplot-5.9.patch