diff options
| author |   Andrey Grozin <grozin@gentoo.org> | 2009-04-24 19:08:19 +0000 |
|---|---|---|
| committer | Andrey Grozin <grozin@gentoo.org> | 2009-04-24 19:08:19 +0000 |
| commit | 31f44aa052d63e3e8cbc4737d2713f29e7a648e9 (patch) | |
| tree | 869e5c375d6dde0ddc0501aaba7dc1be4d744f5b /sci-libs | |
| parent | version bump (diff) | |
| download | historical-31f44aa052d63e3e8cbc4737d2713f29e7a648e9.tar.gz historical-31f44aa052d63e3e8cbc4737d2713f29e7a648e9.tar.bz2 historical-31f44aa052d63e3e8cbc4737d2713f29e7a648e9.zip | |
Fixed bug #267061
Package-Manager: portage-2.2_rc31/cvs/Linux i686
Diffstat (limited to 'sci-libs')
| -rw-r--r-- | sci-libs/mathgl/ChangeLog | 6 | ||||
| -rw-r--r-- | sci-libs/mathgl/Manifest | 5 | ||||
| -rw-r--r-- | sci-libs/mathgl/files/mathgl-1.8.1-gcc43.patch | 10 | ||||
| -rw-r--r-- | sci-libs/mathgl/mathgl-1.8.1.ebuild | 33 |
4 files changed, 36 insertions, 18 deletions
diff --git a/sci-libs/mathgl/ChangeLog b/sci-libs/mathgl/ChangeLog index be7606216895..b06debd10bac 100644 --- a/sci-libs/mathgl/ChangeLog +++ b/sci-libs/mathgl/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sci-libs/mathgl # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/mathgl/ChangeLog,v 1.4 2009/04/13 13:09:29 grozin Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/mathgl/ChangeLog,v 1.5 2009/04/24 19:08:19 grozin Exp $ + + 24 Apr 2009; Andrey Grozin <grozin@gentoo.org> + +files/mathgl-1.8.1-gcc43.patch, mathgl-1.8.1: + Fixed bug #267061 *mathgl-1.8.1 (13 Apr 2009) diff --git a/sci-libs/mathgl/Manifest b/sci-libs/mathgl/Manifest index ad130c552b58..e095bb15c58b 100644 --- a/sci-libs/mathgl/Manifest +++ b/sci-libs/mathgl/Manifest @@ -1,4 +1,5 @@ +AUX mathgl-1.8.1-gcc43.patch 345 RMD160 81d76baed06d779853dd96ce169f5bef620629b2 SHA1 e50c8e600cb243c809d3a6648344bbe29146666d SHA256 2165125d4677b882548530dc21a0368bf7ed27cab516ee6f78604f98b3b60ac9 DIST mathgl-1.8.1.tgz 8288534 RMD160 402cc7fe15b81255189764d7f9ed64fbd5987251 SHA1 307153645a514b071c192b883153f6aa8d9ad52f SHA256 0f4065d5052e1e1f5a1af9284acbfcd249012ff71bfa1a03724d24f791d7c48f -EBUILD mathgl-1.8.1.ebuild 2223 RMD160 3cbf03f9440a9ccd9c22391620a3de3e137592a8 SHA1 fedd851a2f15b13d1308929dd521aa3ad41dabc6 SHA256 ec98b9b997b07722427989c3de6e7ee17ea4cd517476e8563d5d06253d58fc8e -MISC ChangeLog 920 RMD160 3d2067964672e2f1ff35e4c9936f3f36a26e2b7f SHA1 a9a0d06e1a6fe3aeb42950a23806d524cac8e824 SHA256 3ad76d409df80f78abe299a0969f31fe6a6a30d1f4b8ec4ac816f069fe57c182 +EBUILD mathgl-1.8.1.ebuild 2278 RMD160 304fe4f4d14bc0cc0cf8b0a92a5ca6f6052c9e95 SHA1 35e7de9ed73a0579b0615b19a6c7a622b668cee7 SHA256 94df03c6c21595cd0a042e7ea5d6d5ad20c9919af8af7a0d17f1e4b72aefa785 +MISC ChangeLog 1039 RMD160 cf2100052eaa8fd00b6e3292666c0a2ef647857e SHA1 12926a140119e2b06aa32d92aa750a2aa58139c7 SHA256 a3a7fe650a5288224f4742b0470f599d3d61ffbc0be693ccda61ee43e22dd996 MISC metadata.xml 403 RMD160 58842b16ab72ab3b23b8d29eaf00dd2c05da11c9 SHA1 de3dde83893663018de696e3e07010a276db0fff SHA256 2e033d0243bbbafcb9397978f74e7bf0edcb03cfb6f2d2d5ff9e22cdf5e77a42 diff --git a/sci-libs/mathgl/files/mathgl-1.8.1-gcc43.patch b/sci-libs/mathgl/files/mathgl-1.8.1-gcc43.patch new file mode 100644 index 000000000000..7a639bb9a4ab --- /dev/null +++ b/sci-libs/mathgl/files/mathgl-1.8.1-gcc43.patch @@ -0,0 +1,10 @@ +--- utils/mgl2gif.cpp.ORIG 2009-03-04 14:22:12.000000000 +0100 ++++ utils/mgl2gif.cpp 2009-04-22 10:15:02.000000000 +0200 +@@ -19,6 +19,7 @@ + ***************************************************************************/ + #include <stdio.h> + #include <string.h> ++#include <cstdlib> + #include <locale.h> + #include <wchar.h> + #include "mgl/mgl_zb.h" diff --git a/sci-libs/mathgl/mathgl-1.8.1.ebuild b/sci-libs/mathgl/mathgl-1.8.1.ebuild index 45ed8095bd93..8a009ade15d9 100644 --- a/sci-libs/mathgl/mathgl-1.8.1.ebuild +++ b/sci-libs/mathgl/mathgl-1.8.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/mathgl/mathgl-1.8.1.ebuild,v 1.1 2009/04/13 13:09:29 grozin Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/mathgl/mathgl-1.8.1.ebuild,v 1.2 2009/04/24 19:08:19 grozin Exp $ EAPI=2 WX_GTK_VER=2.8 inherit autotools wxwidgets python versionator toolchain-funcs @@ -38,6 +38,23 @@ pkg_setup() { fi } +src_prepare() { + # bug #267061 + epatch "${FILESDIR}"/${P}-gcc43.patch + + # correct location of numpy/arrayobject.h + if use python; then + local numpy_h + numpy_h=$(python_get_sitedir)/numpy/core/include/numpy/arrayobject.h + einfo "fixing numpy.i" + sed -e "s|<numpy/arrayobject.h>|\"${numpy_h}\"|" \ + -i lang/numpy.i \ + || die "sed failed" + fi + + eautoreconf +} + src_configure() { econf --docdir="${ROOT}"usr/share/doc/${PF} \ $(use_enable glut) \ @@ -53,20 +70,6 @@ src_configure() { $(use_enable doc docs) } -src_prepare() { - # correct location of numpy/arrayobject.h - if use python; then - local numpy_h - numpy_h=$(python_get_sitedir)/numpy/core/include/numpy/arrayobject.h - einfo "fixing numpy.i" - sed -e "s|<numpy/arrayobject.h>|\"${numpy_h}\"|" \ - -i lang/numpy.i \ - || die "sed failed" - fi - - eautoreconf -} - src_compile() { # see bug #249627 local JOBS |