diff options
| author |   Andreas K. Hüttel <dilfridge@gentoo.org> | 2012-08-24 22:05:44 +0000 |
|---|---|---|
| committer | Andreas K. Hüttel <dilfridge@gentoo.org> | 2012-08-24 22:05:44 +0000 |
| commit | e751bb60db81a948a893c3e89e5693ad1ddb09fb (patch) | |
| tree | 8ac08ebf1e0a3e51371b2f8878f8e9711383e323 /media-libs/vigra | |
| parent | Fix DEPEND. (diff) | |
| download | gentoo-2-e751bb60db81a948a893c3e89e5693ad1ddb09fb.tar.gz gentoo-2-e751bb60db81a948a893c3e89e5693ad1ddb09fb.tar.bz2 gentoo-2-e751bb60db81a948a893c3e89e5693ad1ddb09fb.zip | |
Fix build with gcc-4.7, thanks dev-zero
(Portage version: 2.2.0_alpha122/cvs/Linux x86_64)
Diffstat (limited to 'media-libs/vigra')
| -rw-r--r-- | media-libs/vigra/ChangeLog | 6 | ||||
| -rw-r--r-- | media-libs/vigra/files/vigra-1.8.0-gcc47.patch | 25 | ||||
| -rw-r--r-- | media-libs/vigra/vigra-1.8.0.ebuild | 3 |
3 files changed, 32 insertions, 2 deletions
diff --git a/media-libs/vigra/ChangeLog b/media-libs/vigra/ChangeLog index f76e577abcea..d541fed48ed6 100644 --- a/media-libs/vigra/ChangeLog +++ b/media-libs/vigra/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/vigra # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/vigra/ChangeLog,v 1.54 2012/07/04 09:05:57 jdhore Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/vigra/ChangeLog,v 1.55 2012/08/24 22:05:44 dilfridge Exp $ + + 24 Aug 2012; Andreas K. Huettel <dilfridge@gentoo.org> vigra-1.8.0.ebuild, + +files/vigra-1.8.0-gcc47.patch: + Fix build with gcc-4.7, thanks dev-zero 04 Jul 2012; Jeff Horelick <jdhore@gentoo.org> vigra-1.7.1-r1.ebuild: marked x86 per bug 401509 diff --git a/media-libs/vigra/files/vigra-1.8.0-gcc47.patch b/media-libs/vigra/files/vigra-1.8.0-gcc47.patch new file mode 100644 index 000000000000..83d5f7ee5c59 --- /dev/null +++ b/media-libs/vigra/files/vigra-1.8.0-gcc47.patch @@ -0,0 +1,25 @@ +From 11113f8f5ffa868e32259e8d6dcdb543fd58848b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Tiziano=20M=C3=BCller?= <tm@dev-zero.ch> +Date: Mon, 11 Jun 2012 08:33:06 +0200 +Subject: [PATCH] Fix building with gcc-4.7 + +--- + include/vigra/numpy_array.hxx | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/include/vigra/numpy_array.hxx b/include/vigra/numpy_array.hxx +index 1d06a79..7806f6b 100644 +--- a/include/vigra/numpy_array.hxx ++++ b/include/vigra/numpy_array.hxx +@@ -1074,7 +1074,7 @@ void NumpyArray<N, T, Stride>::setupArrayView() + + this->m_stride /= sizeof(value_type); + this->m_ptr = reinterpret_cast<pointer>(pyArray()->data); +- vigra_precondition(checkInnerStride(Stride()), ++ vigra_precondition(this->checkInnerStride(Stride()), + "NumpyArray<..., UnstridedArrayTag>::setupArrayView(): First dimension of given array is not unstrided (should never happen)."); + + } +-- +1.7.8.6 + diff --git a/media-libs/vigra/vigra-1.8.0.ebuild b/media-libs/vigra/vigra-1.8.0.ebuild index 90abeca5e074..3d0462690422 100644 --- a/media-libs/vigra/vigra-1.8.0.ebuild +++ b/media-libs/vigra/vigra-1.8.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/vigra/vigra-1.8.0.ebuild,v 1.1 2012/05/19 23:23:15 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/vigra/vigra-1.8.0.ebuild,v 1.2 2012/08/24 22:05:44 dilfridge Exp $ EAPI=4 @@ -43,6 +43,7 @@ DEPEND="${RDEPEND} PATCHES=( "${FILESDIR}/${P}-automagicness.patch" "${FILESDIR}/${P}-numpy_doc.patch" + "${FILESDIR}/${P}-gcc47.patch" ) REQUIRED_USE=" |