More gcc-4.3 fixes. #264355

Package-Manager: portage-2.2_rc28/cvs/Linux x86_64

4 files changed, 33 insertions, 8 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/Manifest b/media-gfx/openmesh/Manifest
index 22bacb909818..5009cc6fdf72 100644
--- a/media-gfx/openmesh/Manifest
+++ b/media-gfx/openmesh/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX QGLViewerWidget-hh-gcc-4.3-include-fix.patch 676 RMD160 2013468db4ca9759211d02758992b3b6e177eb70 SHA1 50cc466dd831f945e5fee5cf82461711f2126d20 SHA256 89b45de09e182f603d20226f6c4ed11ad808d13bd1b1ade308474687b780a3e3
 AUX openmesh-1.0.0-gcc41.patch 3925 RMD160 ab4ed625667063776307d04c3a0fc5107459cfef SHA1 928d3d40dd01311b38f5e1520d77b3ad05f0d07c SHA256 9514b94f4f55e9ec7c73675dcd57e0f13d7aa7d184429e36237a36a9be50ba41
 DIST OpenMesh-1.9.6.tar.bz2 498618 RMD160 ebb24758242ebf9e8c0b853a78631fd5542318ea SHA1 2d337bf558c74a3a004f246b5d92f74b569fc78b SHA256 07ed3a915b567831f2d0433b09767f80abd789fbc76dd6390231c60e3eeadd4a
 DIST OpenMesh_1.0.0.tgz 4911191 RMD160 2a90206dc51677b2cb56f5af9f1cfc2d851f9404 SHA1 47e448718e27db3c1ccae754d00a650472db5ecc SHA256 025c5af3b5af9cae7983f2322579f8aa5a45ac9f195123a8c09a0645dfc2e7c4
@@ -8,13 +9,13 @@ DIST OpenMesh_1.9.5.tar.gz 302155 RMD160 3ba7a3bae7001380cee07817caf99ee591e1631
 EBUILD openmesh-1.0.0.ebuild 1357 RMD160 bf04ea791ff903561ceb84d48ef276fc6285f2a5 SHA1 e7aaf7bf2952f196e2f0d7aa543e8670b58e89a4 SHA256 9110eeef15da888b5d118154b384ce4945fd7b994b826fd83f2a9585b35438a0
 EBUILD openmesh-1.9.5.ebuild 1430 RMD160 b4695a02381a9942442fd7171c99cdde75117eb3 SHA1 a104a0af030b32434f830d5f553532bc5b06ad83 SHA256 a79788b43bac485ca014a5629e93be44ff1b80831fa500fda19fa126dc3763fd
 EBUILD openmesh-1.9.6-r1.ebuild 1463 RMD160 3a7836a5047144a69f44a0af02a60d51999429c4 SHA1 92e954a14c8641e0694228567b77875b5aa7e939 SHA256 9b0ebb6b81290fcacff574421520282205e4bfdc32a7cdd16352f63c16649d47
-EBUILD openmesh-1.9.6-r2.ebuild 1588 RMD160 8584fc861e317f2221040f8888a542abebc4611c SHA1 2ccba1f3c633a9263eb6dfdfeadee361d679c173 SHA256 a2bfbf128d8d754d0a52678e820c7dd5fa5a138f9ed2012c94af7ab790aa1aeb
-MISC ChangeLog 2341 RMD160 9fb9a86c48565a33fcaf0b71b58cb1de53c2cc89 SHA1 a9a363b94f3cbbcbc8e1fc52050eecbc68f3a6f4 SHA256 e3249fd695ba532d9d83f5919f7153048629b21ab4b8715168d2c4c239095d6f
+EBUILD openmesh-1.9.6-r2.ebuild 1637 RMD160 8dc4c8e0937ac48d29dbca2efec045eafc128e23 SHA1 037d18c5b22bfd1a7cbdbabcae30e0f9c949c422 SHA256 f4ab02e5dcca071092bfbfeb58a33196294a87b36f4cf907ebc2ede65a3b9504
+MISC ChangeLog 2508 RMD160 0db44f0f1538d699afadd1ecda0957eb9beddf99 SHA1 5edb47c9b7c8f9ff5abd079625fad52483b87376 SHA256 34a0547d2d19fa586359751d27824a90032032e0fe19361200c7fd8466a02c7a
 MISC metadata.xml 720 RMD160 63cd57c75c7dff62a72fd8232e1f3b1ce5c1ac38 SHA1 c93c3c8d79018623f8ebb70a60be1e40ba38a2df SHA256 68ba8265b818feed768b7c6889a7136e261a92ab36b284ccc3d916bb51d01bad
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.10 (GNU/Linux)
 
-iEYEARECAAYFAkno3NQACgkQ4MrvBE1wQ8khTQCfSymBvOsQnv/DWOD/bCvnCXVd
-EbkAn18f6HFWeYzcCa06X6JsvJlJZZNu
-=at6P
+iEYEARECAAYFAkno6nMACgkQ4MrvBE1wQ8mRmwCglfc4a2xwvv2elzJaRhmTXiX2
+7ocAn1kAh1ARxjJ25ACxMCtm+C6HOufw
+=jIg5
 -----END PGP SIGNATURE-----
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() {