diff options
| author |   Justin Bronder <jsbronder@gentoo.org> | 2009-04-17 20:45:34 +0000 |
|---|---|---|
| committer | Justin Bronder <jsbronder@gentoo.org> | 2009-04-17 20:45:34 +0000 |
| commit | 24c4291947aa50c0fbcbef9202ed6a46a7bfbbd8 (patch) | |
| tree | ffc7617b689de208cdd7412fcb9fd4f29dc0a0f9 /media-gfx/openmesh | |
| parent | Version bump (diff) | |
| download | gentoo-2-24c4291947aa50c0fbcbef9202ed6a46a7bfbbd8.tar.gz gentoo-2-24c4291947aa50c0fbcbef9202ed6a46a7bfbbd8.tar.bz2 gentoo-2-24c4291947aa50c0fbcbef9202ed6a46a7bfbbd8.zip | |
More gcc-4.3 fixes. #264355
(Portage version: 2.2_rc28/cvs/Linux x86_64)
Diffstat (limited to 'media-gfx/openmesh')
| -rw-r--r-- | media-gfx/openmesh/ChangeLog | 7 | ||||
| -rw-r--r-- | media-gfx/openmesh/files/QGLViewerWidget-hh-gcc-4.3-include-fix.patch | 18 | ||||
| -rw-r--r-- | media-gfx/openmesh/openmesh-1.9.6-r2.ebuild | 5 |
3 files changed, 27 insertions, 3 deletions
diff --git a/media-gfx/openmesh/ChangeLog b/media-gfx/openmesh/ChangeLog index bf0f94ce0132..b627155905e1 100644 --- a/media-gfx/openmesh/ChangeLog +++ b/media-gfx/openmesh/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-gfx/openmesh # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/openmesh/ChangeLog,v 1.13 2009/04/17 19:47:20 jsbronder Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/openmesh/ChangeLog,v 1.14 2009/04/17 20:45:34 jsbronder Exp $ + + 17 Apr 2009; Justin Bronder <jsbronder@gentoo.org> + +files/QGLViewerWidget-hh-gcc-4.3-include-fix.patch, + openmesh-1.9.6-r2.ebuild: + More gcc-4.3 fixes. #264355 17 Apr 2009; Justin Bronder <jsbronder@gentoo.org> openmesh-1.9.6-r2.ebuild: diff --git a/media-gfx/openmesh/files/QGLViewerWidget-hh-gcc-4.3-include-fix.patch b/media-gfx/openmesh/files/QGLViewerWidget-hh-gcc-4.3-include-fix.patch new file mode 100644 index 000000000000..f6be7bab8dad --- /dev/null +++ b/media-gfx/openmesh/files/QGLViewerWidget-hh-gcc-4.3-include-fix.patch @@ -0,0 +1,18 @@ +diff -urN a/OpenMesh/Apps/QtViewer/QGLViewerWidget.hh b/OpenMesh/Apps/QtViewer/QGLViewerWidget.hh +--- a/OpenMesh/Apps/QtViewer/QGLViewerWidget.hh 2008-07-01 09:05:13.000000000 -0400 ++++ b/OpenMesh/Apps/QtViewer/QGLViewerWidget.hh 2009-04-17 16:38:31.099766294 -0400 +@@ -36,11 +36,11 @@ + //== INCLUDES ================================================================= + + +-#include <OpenMesh/Core/Geometry/VectorT.hh> +-#include <QtOpenGL/qgl.h> +-#include <string> ++#include <cstring> + #include <vector> + #include <map> ++#include <OpenMesh/Core/Geometry/VectorT.hh> ++#include <QtOpenGL/qgl.h> + + + //== FORWARD DECLARATIONS ===================================================== diff --git a/media-gfx/openmesh/openmesh-1.9.6-r2.ebuild b/media-gfx/openmesh/openmesh-1.9.6-r2.ebuild index 689487707eca..53399b3dc4de 100644 --- a/media-gfx/openmesh/openmesh-1.9.6-r2.ebuild +++ b/media-gfx/openmesh/openmesh-1.9.6-r2.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/media-gfx/openmesh/openmesh-1.9.6-r2.ebuild,v 1.2 2009/04/17 19:47:20 jsbronder Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/openmesh/openmesh-1.9.6-r2.ebuild,v 1.3 2009/04/17 20:45:34 jsbronder Exp $ EAPI="2" inherit eutils @@ -24,10 +24,11 @@ DEPEND=">=dev-util/acgmake-1.4 src_prepare() { use qt4 || sed -i "s:Apps::" ACGMakefile - # gcc-4.3 fix. Need string.h for memcpy + # gcc-4.3 fixs. sed -i \ 'N;s,\(OPENMESH_VECTOR_HH )\n\),\1#include <string.h>\n,' \ Core/Geometry/VectorT_inc.hh || die + epatch "${FILESDIR}/QGLViewerWidget-hh-gcc-4.3-include-fix.patch" || die } src_compile() { |