Added a few trivial fixes for gcc-4.3 in gcc4-support.patch, and filter optimizations >=O2 because of segmentation faults

Package-Manager: portage-2.1.5.4

4 files changed, 116 insertions, 12 deletions

diff --git a/media-libs/openinventor/ChangeLog b/media-libs/openinventor/ChangeLog
index c9c32a27281e..5242f1c4a49d 100644
--- a/media-libs/openinventor/ChangeLog
+++ b/media-libs/openinventor/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/openinventor
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/openinventor/ChangeLog,v 1.16 2008/05/23 16:32:55 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/openinventor/ChangeLog,v 1.17 2008/06/07 08:57:45 bicatali Exp $
+
+  07 Jun 2008; Sébastien Fabbro <bicatali@gentoo.org>
+  files/gcc4-support.patch, openinventor-2.1.5.10-r2.ebuild:
+  Added a few trivial fixes for gcc-4.3 in gcc4-support.patch, and filter
+  optimizations >=O2 because of segmentation faults
 
   23 May 2008; Markus Meier <maekke@gentoo.org>
   openinventor-2.1.5.10-r2.ebuild:
diff --git a/media-libs/openinventor/Manifest b/media-libs/openinventor/Manifest
index ec21eb3e85fa..a797917f9460 100644
--- a/media-libs/openinventor/Manifest
+++ b/media-libs/openinventor/Manifest
@@ -3,19 +3,19 @@ Hash: SHA1
 
 AUX freetype2-activate.patch 261 RMD160 eb19eff72dc7d3e97a3758a3649872474c579a85 SHA1 374b9db00b9a5f2071bb028e5c8a6bb3df1758aa SHA256 f2d86306d686c58bf560c189cd158208515c69f8c545fc3d5f4ee246adaa710c
 AUX freetype2-includes.patch 291 RMD160 90119f53b748f4428aba7de86d12ec0392badc64 SHA1 177e61834437c3c84783163178f9dfec5e84e9e8 SHA256 e77b3ddd16c3ef6184bfa235257f81a5f8f2dd6e043f91c60ec6bc0986bddb85
-AUX gcc4-support.patch 4155 RMD160 8ce4e4d83f8283f75e2bb601c7b2991164a4d273 SHA1 846171c44c28dbfdcf58c94f6e7d9ada05f69e07 SHA256 f97ea155d16a854a2246112274c6a763565dab21297ce10521c2601fe1e139a6
+AUX gcc4-support.patch 7074 RMD160 f6441760593cff4ea60546215faa9fda734df4ac SHA1 a07fcb07c8fb1d6c053a67f6b1f8a0ad3ef5834b SHA256 38953a81e8c10d08fb322c533196c0cc646e144194dfd48898be1fd71ee21c56
 AUX gentoo-paths-v2.patch 10940 RMD160 a68ac0c41902de4192b7728110bd0726e47d6d85 SHA1 01d8a0c8518265cf3712c2fb1618b0d5950fe7a9 SHA256 59d8d3fae547d5926932f9c66a8facac924b4900a69dd9f4c33546b9522ed2a4
 AUX no-csh.patch 1053 RMD160 f2347aaf379c7f6dc862e13aedc0d5ecaed44071 SHA1 dfc37fb9a10f829cb03f66a3cd8ea746b49da1a6 SHA256 dc18d6e344c7719d04fb2311826bb4ba1e03fddb5667c47927ce2ee50bded4b0
 AUX support-archs.patch 1116 RMD160 a3fe28177e4c47446b37c9dcdc96049556656e99 SHA1 caee7196c2f58a41593fbafb70b3d5eed7e5ac62 SHA256 d732f8d11e41033cee83774d949b140047afb407c8442d14b418cfaaf205cbc9
 AUX use-byacc.patch 1444 RMD160 f2c4b6227b5960accf6faf040489bb00bc34de44 SHA1 4f33c4b4e8052cb5dfb68236654373de99eb00c3 SHA256 c4f1e02f8c77008777ed7845e23fbaa60b939d4563fb47cfb2bb694425374af7
 DIST inventor-2.1.5-10.src.tar.gz 8282780 RMD160 0e600eab15016ab3f8de7b814d12bd78d83f1a05 SHA1 313665bc762e09b18e2d678f0a724b6457e3c95b SHA256 1b0106a705191f525fc89a9f3def37bdeae5ab9ceb1b4d9e5ede8a442bdf8d6b
-EBUILD openinventor-2.1.5.10-r2.ebuild 2994 RMD160 94cf9fed1ffbf8b3bd66ad8a8d606436045cffdd SHA1 0a1b7cda0bd664d8c1f55ee60c4bc107183d2f2c SHA256 42a3205c3ebe363652cd538d8c32793f24048ad99c05973492aeca91473d2e2d
-MISC ChangeLog 2635 RMD160 cb4d06fc8f6dad898442aab7cd1b378f4fe92852 SHA1 a04e533f60febaca15a78543269ce727e0135c6b SHA256 6a434128a011afae24db1dd6523f493552d87a723b9ebaace5b8358654ff4145
+EBUILD openinventor-2.1.5.10-r2.ebuild 3137 RMD160 9f006940977a994c68f2b79b6a3d7c1b7b78fc16 SHA1 7efb02411ec387caf23da525952b99f76b966386 SHA256 4ab902b763e240fd4301c5adc355b09e46b32a5aba9c445d5f9443755c5056ea
+MISC ChangeLog 2880 RMD160 7bf8c6a2284029b03cb7d6725d36717b607b6e36 SHA1 b21798871f675a6aefab019ef36263b7d81301ba SHA256 3627f0a64154837036d8c8aece8c6620df7b4ad7f110a34a6baf579356509309
 MISC metadata.xml 515 RMD160 ff932be33799d8342475e5888365e62aa87665f6 SHA1 188a77250a4ea19276fad2aa778a7af7cee47870 SHA256 d6149838745445b99a41d8b03e50f3248a2f05e20276d58110cb5e20273b6f01
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkg28e4ACgkQkKaRLQcq0GIL/gCeMOuW6K7cMnHlf5YdEmgAyzj8
-GE4AoLDz5esdA97ZAWc0Uu6WbM4nTOFA
-=GN1w
+iEYEARECAAYFAkhKTaMACgkQ1ycZbhPLE2D2ZgCdEPhVXl0ecUGwSUof2hJNSIjP
+0MEAn3F4SB9Pajhclq+KNdJkMaWqOTSM
+=Vl0E
 -----END PGP SIGNATURE-----
diff --git a/media-libs/openinventor/files/gcc4-support.patch b/media-libs/openinventor/files/gcc4-support.patch
index 3f2c4af2b6dc..0ef963fde49e 100644
--- a/media-libs/openinventor/files/gcc4-support.patch
+++ b/media-libs/openinventor/files/gcc4-support.patch
@@ -101,3 +101,98 @@ diff -urN ./inventor-old/libSoXt/src/SoXtRsrc.c++ ./inventor/libSoXt/src/SoXtRsr
      }
  
      // make the last entry the NULL sentinel
+--- ./inventor-old/apps/demos/drop/drop.c++	2008-06-06 10:44:36.000000000 +0100
++++ ./inventor/apps/demos/drop/drop.c++	2008-06-04 15:22:05.000000000 +0100
+@@ -93,5 +93,6 @@
+     // Enter the Xt event loop
+     SoXt::show( appWindow );
+     SoXt::mainLoop();
++    return 0;
+ }
+ 
+--- ./inventor-old/apps/demos/maze/maze.c++	2008-06-06 10:44:36.000000000 +0100
++++ ./inventor/apps/demos/maze/maze.c++	2008-06-04 15:22:05.000000000 +0100
+@@ -1332,5 +1332,6 @@
+ 
+     SoXt::show(mainWindow);
+     SoXt::mainLoop();
++    return 0;
+ }
+ 
+--- ./inventor-old/apps/demos/noodle/noodle.c++	2008-06-06 10:44:36.000000000 +0100
++++ ./inventor/apps/demos/noodle/noodle.c++	2008-06-04 15:22:05.000000000 +0100
+@@ -679,5 +679,6 @@
+     SoXt::show(mainWindow);
+ 
+     SoXt::mainLoop();
++    return 0;
+ }
+ 
+--- ./inventor-old/apps/demos/SceneViewer/SceneViewer.c++	2008-06-06 10:44:36.000000000 +0100
++++ ./inventor/apps/demos/SceneViewer/SceneViewer.c++	2008-06-04 15:22:04.000000000 +0100
+@@ -230,4 +230,5 @@
+     // Loop forever
+     //
+     SoXt::mainLoop();
++    return 0;
+ }
+--- ./inventor-old/apps/samples/widgets/componentTest.c++	2008-06-06 10:44:36.000000000 +0100
++++ ./inventor/apps/samples/widgets/componentTest.c++	2008-06-04 15:22:05.000000000 +0100
+@@ -60,7 +60,7 @@
+ }
+ 
+ int
+-main(unsigned int argc, char *argv[])
++main(int argc, char *argv[])
+ {
+     if (argc != 2)
+ 	usage(argv[0]);
+@@ -85,4 +85,5 @@
+     XtRealizeWidget(mainWindow);
+     
+     SoXt::mainLoop();
++    return 0;
+ }
+--- ./inventor-old/doc/man/ivman/ClassDef.c++	2008-06-06 10:44:38.000000000 +0100
++++ ./inventor/doc/man/ivman/ClassDef.c++	2008-06-04 15:22:05.000000000 +0100
+@@ -237,7 +237,7 @@
+ 
+ #define NUM_KEY_WORDS (sizeof(keywords) / sizeof(keywords[0]))
+ 
+-    int	i;
++    size_t i;
+ 
+     if (names == NULL) {
+ 	names = new SbName[NUM_KEY_WORDS];
+--- ./inventor-old/doc/man/ivman/Main.c++	2008-06-06 10:44:38.000000000 +0100
++++ ./inventor/doc/man/ivman/Main.c++	2008-06-04 15:22:05.000000000 +0100
+@@ -89,7 +89,7 @@
+ //
+ /////////////////////////////////////////////////////////////////////////////
+ 
+-main(int argc, char *argv[])
++int main(int argc, char *argv[])
+ {
+     SbBool	ok = TRUE;
+     int		c, curArg;
+--- ./inventor-old/doc/man/ivman/Man.c++	2008-06-06 10:44:38.000000000 +0100
++++ ./inventor/doc/man/ivman/Man.c++	2008-06-04 15:22:05.000000000 +0100
+@@ -806,7 +806,7 @@
+ 
+ #define NUM_OP_NAMES (sizeof(opNames) / sizeof(opNames[0]))
+ 
+-		int op;
++		size_t op;
+ 		for (op = 0; op < NUM_OP_NAMES; op++) {
+ 		    if (name == opNames[op][0]) {
+ 			name = opNames[op][1];
+--- ./inventor-old/doc/man/ivman/Man.h	2008-06-06 10:44:38.000000000 +0100
++++ ./inventor/doc/man/ivman/Man.h	2008-06-04 15:22:05.000000000 +0100
+@@ -131,6 +131,7 @@
+     virtual void	write(SbBool runIn) = 0;
+     virtual SbBool	read()  = 0;
+     virtual int		getNumPreTabChars() const;
++    virtual             ~Item() {}
+   protected:
+     Item();
+   private:
diff --git a/media-libs/openinventor/openinventor-2.1.5.10-r2.ebuild b/media-libs/openinventor/openinventor-2.1.5.10-r2.ebuild
index aa784c5c076c..ad9e147b7cfd 100644
--- a/media-libs/openinventor/openinventor-2.1.5.10-r2.ebuild
+++ b/media-libs/openinventor/openinventor-2.1.5.10-r2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/openinventor/openinventor-2.1.5.10-r2.ebuild,v 1.7 2008/05/23 16:32:55 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/openinventor/openinventor-2.1.5.10-r2.ebuild,v 1.8 2008/06/07 08:57:45 bicatali Exp $
 
-inherit eutils versionator
+inherit eutils versionator flag-o-matic
 
 MY_PV=$(replace_version_separator 3 '-')
 MY_PN="inventor"
@@ -17,9 +17,10 @@ KEYWORDS="alpha amd64 x86"
 IUSE=""
 
 RDEPEND="media-libs/mesa
-	virtual/motif
+	x11-libs/openmotif
 	>=media-libs/jpeg-6b
-	>=media-libs/freetype-2.0"
+	>=media-libs/freetype-2.0
+	media-fonts/corefonts"
 DEPEND="dev-util/byacc
 	${RDEPEND}"
 
@@ -55,6 +56,9 @@ src_unpack() {
 }
 
 src_compile() {
+	# -O2 segfaults on amd64 gcc-4.3 with ivman command (bicatali jun.08)
+	replace-flags -O? -O1
+
 	# VLDOPTS: find libraries during linking of executables
 	# VLDDSOOPTS: find libraries during linking of libraries
 	# VCFLAGS / VCXXFLAGS: pass user-chosen compiler flags
@@ -80,7 +84,7 @@ src_install() {
 	# system
 	# IVLIBDIR: multilib-strict compliance
 	# LD_LIBRARY_PATH: support executables ran during install
-	make \
+	emake -j1 \
 		IVROOT="${D}" \
 		LLDOPTS= \
 		IVLIBDIR="${D}usr/$(get_libdir)" \