diff options
| author |   Markus Dittrich <markusle@gentoo.org> | 2008-04-13 18:31:52 +0000 |
|---|---|---|
| committer | Markus Dittrich <markusle@gentoo.org> | 2008-04-13 18:31:52 +0000 |
| commit | 550d749e72ca131932295d8c8a71ef25425f71b3 (patch) | |
| tree | 6ae49b920dfcc067037438844c6bb4658d55d82e /dev-lang | |
| parent | remove old (diff) | |
| download | gentoo-2-550d749e72ca131932295d8c8a71ef25425f71b3.tar.gz gentoo-2-550d749e72ca131932295d8c8a71ef25425f71b3.tar.bz2 gentoo-2-550d749e72ca131932295d8c8a71ef25425f71b3.zip | |
Added patch for plplot-5.9 support (fixes bug #217361).
(Portage version: 2.1.5_rc2)
Diffstat (limited to 'dev-lang')
| -rw-r--r-- | dev-lang/gdl/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-lang/gdl/files/gdl-0.9_pre6-plplot-5.9.patch | 30 | ||||
| -rw-r--r-- | dev-lang/gdl/gdl-0.9_pre6.ebuild | 6 |
3 files changed, 40 insertions, 2 deletions
diff --git a/dev-lang/gdl/ChangeLog b/dev-lang/gdl/ChangeLog index 883c8caf2865..58eaffee74c3 100644 --- a/dev-lang/gdl/ChangeLog +++ b/dev-lang/gdl/ChangeLog @@ -1,6 +1,10 @@ # 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.5 2008/03/21 20:43:56 markusle Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/gdl/ChangeLog,v 1.6 2008/04/13 18:31:51 markusle Exp $ + + 13 Apr 2008; Markus Dittrich <markusle@gentoo.org> + +files/gdl-0.9_pre6-plplot-5.9.patch, gdl-0.9_pre6.ebuild: + Added patch for plplot-5.9 support (fixes bug #217361). 21 Mar 2008; Markus Dittrich <markusle@gentoo.org> +files/gdl-0.9_pre6-magick.patch, gdl-0.9_pre5.ebuild, diff --git a/dev-lang/gdl/files/gdl-0.9_pre6-plplot-5.9.patch b/dev-lang/gdl/files/gdl-0.9_pre6-plplot-5.9.patch new file mode 100644 index 000000000000..24e88eb0f2f8 --- /dev/null +++ b/dev-lang/gdl/files/gdl-0.9_pre6-plplot-5.9.patch @@ -0,0 +1,30 @@ +diff -Naur gdl-0.9pre6/src/gdlgstream.cpp gdl-0.9pre6.new/src/gdlgstream.cpp +--- gdl-0.9pre6/src/gdlgstream.cpp 2007-10-29 19:10:47.000000000 -0400 ++++ gdl-0.9pre6.new/src/gdlgstream.cpp 2008-04-13 12:45:19.000000000 -0400 +@@ -25,12 +25,12 @@ + + using namespace std; + +-void PLPlotAbortHandler(char *c) ++void PLPlotAbortHandler(const char *c) + { + cout << "PLPlot abort handler: " << c << endl; + } + +-int PLPlotExitHandler(char *c) ++int PLPlotExitHandler(const char *c) + { + cout << "PLPlot exit handler: " << c << endl; + return 0; +diff -Naur gdl-0.9pre6/src/plot3d_nr.cpp gdl-0.9pre6.new/src/plot3d_nr.cpp +--- gdl-0.9pre6/src/plot3d_nr.cpp 2007-10-29 19:10:47.000000000 -0400 ++++ gdl-0.9pre6.new/src/plot3d_nr.cpp 2008-04-13 13:01:38.000000000 -0400 +@@ -217,7 +217,7 @@ + zmin = (zmax_in > zmin_in) ? zmin_in: zmax_in; + zmax = (zmax_in > zmin_in) ? zmax_in: zmin_in; + +- pldtik(zmin, zmax, &tick, &nsub); ++ pldtik(zmin, zmax, &tick, &nsub, 0); + tp = tick * floor(zmin / tick) + tick; + pl3upv = 0; + diff --git a/dev-lang/gdl/gdl-0.9_pre6.ebuild b/dev-lang/gdl/gdl-0.9_pre6.ebuild index 01cb0a94e182..e09d8c7155e0 100644 --- a/dev-lang/gdl/gdl-0.9_pre6.ebuild +++ b/dev-lang/gdl/gdl-0.9_pre6.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_pre6.ebuild,v 1.2 2008/03/21 20:43:56 markusle Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/gdl/gdl-0.9_pre6.ebuild,v 1.3 2008/04/13 18:31:51 markusle Exp $ inherit eutils flag-o-matic @@ -37,6 +37,10 @@ src_unpack() { cd "${S}" epatch "${FILESDIR}"/${P}-proj4.patch epatch "${FILESDIR}"/${P}-magick.patch + + if has_version ">=sci-libs/plplot-5.9.0"; then + epatch "${FILESDIR}"/${P}-plplot-5.9.patch + fi } src_compile() { |