summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2009-08-06 14:57:12 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2009-08-06 14:57:12 +0000
commitb34c169875ef787b89b69e3a775e3b62fdcb8509 (patch)
tree1dbb2f7c7648833f937b52e044e619168f6fb973 /media-libs/openinventor
parentremove mod_auth_pam from p.mask, it no longer exists (diff)
downloadhistorical-b34c169875ef787b89b69e3a775e3b62fdcb8509.tar.gz
historical-b34c169875ef787b89b69e3a775e3b62fdcb8509.tar.bz2
historical-b34c169875ef787b89b69e3a775e3b62fdcb8509.zip
Fix building with GCC 4.4+ and GLIBC 2.10+ wrt #277081.
Package-Manager: portage-2.2_rc36/cvs/Linux x86_64
Diffstat (limited to 'media-libs/openinventor')
-rw-r--r--media-libs/openinventor/ChangeLog7
-rw-r--r--media-libs/openinventor/Manifest15
-rw-r--r--media-libs/openinventor/files/openinventor-2.1.5.10-glibc-2.10.patch26
-rw-r--r--media-libs/openinventor/openinventor-2.1.5.10-r3.ebuild25
4 files changed, 44 insertions, 29 deletions
diff --git a/media-libs/openinventor/ChangeLog b/media-libs/openinventor/ChangeLog
index 8c2420652157..103737a9eade 100644
--- a/media-libs/openinventor/ChangeLog
+++ b/media-libs/openinventor/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for media-libs/openinventor
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/openinventor/ChangeLog,v 1.27 2009/02/07 21:11:28 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/openinventor/ChangeLog,v 1.28 2009/08/06 14:57:11 ssuominen Exp $
+
+ 06 Aug 2009; Samuli Suominen <ssuominen@gentoo.org>
+ openinventor-2.1.5.10-r3.ebuild,
+ +files/openinventor-2.1.5.10-glibc-2.10.patch:
+ Fix building with GCC 4.4+ and GLIBC 2.10+ wrt #277081.
07 Feb 2009; Markus Meier <maekke@gentoo.org>
openinventor-2.1.5.10-r3.ebuild:
diff --git a/media-libs/openinventor/Manifest b/media-libs/openinventor/Manifest
index 8c6f37637b8f..c334cefb0865 100644
--- a/media-libs/openinventor/Manifest
+++ b/media-libs/openinventor/Manifest
@@ -1,23 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
AUX bug-251681.patch 582 RMD160 e9c0b0e1d8df9f0a75cad1245bff49e5a8067214 SHA1 f22f3a724b2e815dc12d4898de01bb661b008391 SHA256 b43b4f5f809f763653e55b526077a87cfb1b3f31d97eb2f03da6a28be0aa1472
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 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 openinventor-2.1.5.10-glibc-2.10.patch 1345 RMD160 8e9b3bbc3f6eddd68c9ce012fd7290608180df36 SHA1 43a1ba3e24ed5947f173ca18034c09d7fead5d12 SHA256 08bf1f2dbe9ae712a7a81668cfb35c074c52a01deea3d8c4e44220e1aa23d79d
AUX support-archs.patch 1116 RMD160 a3fe28177e4c47446b37c9dcdc96049556656e99 SHA1 caee7196c2f58a41593fbafb70b3d5eed7e5ac62 SHA256 d732f8d11e41033cee83774d949b140047afb407c8442d14b418cfaaf205cbc9
AUX support-sparc.patch 1226 RMD160 3ed54d541811fa19cad3ba06e115935e177bc18c SHA1 7129f796788963d1af193ee3fac538e1032f79eb SHA256 6abff7bb44b777065629d465b58560715c285bf03cb79068bfe7eaa1100921b5
AUX use-byacc.patch 1324 RMD160 4abba78803fa74e7c7a147139a13aafe5e731ae7 SHA1 97f0235ec61c4398a8958ea2d9aff1aa8e6a1232 SHA256 562c103847309bff018cdf215d39590e7918f47ca013fd4b6ea5f362104f4999
DIST inventor-2.1.5-10.src.tar.gz 8282780 RMD160 0e600eab15016ab3f8de7b814d12bd78d83f1a05 SHA1 313665bc762e09b18e2d678f0a724b6457e3c95b SHA256 1b0106a705191f525fc89a9f3def37bdeae5ab9ceb1b4d9e5ede8a442bdf8d6b
-EBUILD openinventor-2.1.5.10-r3.ebuild 3463 RMD160 2ff48dc0fdd84849dff4ae4129e1b4b0ac93d850 SHA1 164f792e9d023b51ada98c5bd04b2883ad468a0b SHA256 4a0f5b8236951789b171e31a6da6514bb4ecabdaaaac044a0061ad52dc473146
-MISC ChangeLog 4178 RMD160 af07b42806e3250564d02f068645dcca4285d791 SHA1 d4028f950e69f80d9343aab2529ff2e2820c8a88 SHA256 2fcc4450fe344168a7c53a5f4a4e1f777ad89076cbcab8e81a3d6b56e526149d
+EBUILD openinventor-2.1.5.10-r3.ebuild 3185 RMD160 ea14c095a2e62c860e9b1789078bb295e366d551 SHA1 50ec76d0ca39a688e961733a29b0eea55935536f SHA256 01e09641665d389f44a8013a7022e83fdd0c667687fdb965ab4e9f3c366317b4
+MISC ChangeLog 4378 RMD160 15b436279cac660465aa0979d2ee9807e1f46394 SHA1 fb7195861001d3db502849b12c6dcc014568b74b SHA256 9a2033ea299204e5eb70033dbd8d90e54b2ce2cf3710cd0dffc9fd630677b808
MISC metadata.xml 515 RMD160 ff932be33799d8342475e5888365e62aa87665f6 SHA1 188a77250a4ea19276fad2aa778a7af7cee47870 SHA256 d6149838745445b99a41d8b03e50f3248a2f05e20276d58110cb5e20273b6f01
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkmN+UwACgkQkKaRLQcq0GIYaACeNWMh6Tstg99VRwIlD0uVy5FE
-C6kAn3hE+AX2Rg/YSaB8+uNrFOWcPWZ4
-=ZobZ
------END PGP SIGNATURE-----
diff --git a/media-libs/openinventor/files/openinventor-2.1.5.10-glibc-2.10.patch b/media-libs/openinventor/files/openinventor-2.1.5.10-glibc-2.10.patch
new file mode 100644
index 000000000000..ad6c336aeb85
--- /dev/null
+++ b/media-libs/openinventor/files/openinventor-2.1.5.10-glibc-2.10.patch
@@ -0,0 +1,26 @@
+diff -ur inventor.orig/lib/database/src/so/SoInput.c++ inventor/lib/database/src/so/SoInput.c++
+--- inventor.orig/lib/database/src/so/SoInput.c++ 2000-10-26 02:47:47.000000000 +0300
++++ inventor/lib/database/src/so/SoInput.c++ 2009-08-06 17:50:59.000000000 +0300
+@@ -2810,7 +2810,7 @@
+
+ if (addToGlobalDict) {
+ // Look for the first '+':
+- char *firstPlus = strchr(n, '+');
++ const char *firstPlus = strchr(n, '+');
+
+ if (firstPlus == NULL) {
+ base->setName(name);
+diff -ur inventor.orig/lib/interaction/src/nodekits/SoInteractionKit.c++ inventor/lib/interaction/src/nodekits/SoInteractionKit.c++
+--- inventor.orig/lib/interaction/src/nodekits/SoInteractionKit.c++ 2000-08-15 15:56:25.000000000 +0300
++++ inventor/lib/interaction/src/nodekits/SoInteractionKit.c++ 2009-08-06 17:55:56.000000000 +0300
+@@ -854,8 +854,8 @@
+ // (as in "childList[0].appearance")
+ // If so, get the string up to whichever came first.
+ // This will be the 'intermediary' we look for.
+- char *dotPtr = strchr( partName.getString(), '.' );
+- char *brackPtr = strchr( partName.getString(), '[' );
++ const char *dotPtr = strchr( partName.getString(), '.' );
++ const char *brackPtr = strchr( partName.getString(), '[' );
+
+ if ( dotPtr != NULL || brackPtr != NULL ) {
+ char *nameCopy = strdup( partName.getString() );
diff --git a/media-libs/openinventor/openinventor-2.1.5.10-r3.ebuild b/media-libs/openinventor/openinventor-2.1.5.10-r3.ebuild
index 1a12c78964ad..f83e1e9c6bab 100644
--- a/media-libs/openinventor/openinventor-2.1.5.10-r3.ebuild
+++ b/media-libs/openinventor/openinventor-2.1.5.10-r3.ebuild
@@ -1,11 +1,12 @@
# Copyright 1999-2009 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-r3.ebuild,v 1.5 2009/02/07 21:11:28 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/openinventor/openinventor-2.1.5.10-r3.ebuild,v 1.6 2009/08/06 14:57:11 ssuominen Exp $
+EAPI=2
inherit eutils versionator flag-o-matic toolchain-funcs
MY_PV=$(replace_version_separator 3 '-')
-MY_PN="inventor"
+MY_PN=inventor
DESCRIPTION="SGI OpenInventor Toolkit and Utilities"
HOMEPAGE="http://oss.sgi.com/projects/inventor/"
@@ -16,25 +17,15 @@ SLOT="0"
KEYWORDS="alpha amd64 sparc x86"
IUSE=""
-RDEPEND="media-libs/mesa
+RDEPEND="media-libs/mesa[motif]
x11-libs/openmotif
>=media-libs/jpeg-6b
>=media-libs/freetype-2.0
media-fonts/corefonts"
-DEPEND="dev-util/byacc
- ${RDEPEND}"
+DEPEND="${RDEPEND}
+ dev-util/byacc"
-S="${WORKDIR}/${MY_PN}"
-
-pkg_setup() {
- if ! built_with_use media-libs/mesa motif; then
- echo
- eerror "In order to compile openinventor, you need to have media-libs/mesa emerged"
- eerror "with 'motif' in your USE flags. Please add that flag, re-emerge"
- eerror "media-libs/mesa, and then emerge openinventor"
- die "media-libs/mesa is missing motif"
- fi
-}
+S=${WORKDIR}/${MY_PN}
src_unpack() {
unpack ${A}
@@ -57,6 +48,8 @@ src_unpack() {
# fix bug #251681
epatch "${FILESDIR}"/bug-251681.patch
+ epatch "${FILESDIR}"/${P}-glibc-2.10.patch
+
# respect CC etc
sed -i \
-e "s:CC = /usr/bin/gcc:CC = $(tc-getCC):g" \