summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVictor Ostorga <vostorga@gentoo.org>2009-09-07 01:26:27 +0000
committerVictor Ostorga <vostorga@gentoo.org>2009-09-07 01:26:27 +0000
commit078906af54120d6a2da6c7afc45711649c46c3cc (patch)
treee4185ab0de0f3f758110a2d14a6d3c6f8eadb091
parentHard dependency on gtk2hs-0.9.12.1 (diff)
downloadgentoo-2-078906af54120d6a2da6c7afc45711649c46c3cc.tar.gz
gentoo-2-078906af54120d6a2da6c7afc45711649c46c3cc.tar.bz2
gentoo-2-078906af54120d6a2da6c7afc45711649c46c3cc.zip
Fixing javascript headers, patch thanks to Arttu Valo <arttuv69@gmail.com> bug #281383
(Portage version: 2.1.6.13/cvs/Linux i686)
-rw-r--r--media-libs/coin/ChangeLog7
-rw-r--r--media-libs/coin/coin-3.1.0.ebuild8
-rw-r--r--media-libs/coin/files/coin-3.1.0-javascript.patch38
3 files changed, 51 insertions, 2 deletions
diff --git a/media-libs/coin/ChangeLog b/media-libs/coin/ChangeLog
index bda4bb3f3032..d2e0ce28d308 100644
--- a/media-libs/coin/ChangeLog
+++ b/media-libs/coin/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for media-libs/coin
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/coin/ChangeLog,v 1.25 2009/08/12 05:16:07 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/coin/ChangeLog,v 1.26 2009/09/07 01:26:27 vostorga Exp $
+
+ 07 Sep 2009; Víctor Ostorga <vostorga@gentoo.org> coin-3.1.0.ebuild,
+ +files/coin-3.1.0-javascript.patch:
+ Fixing javascript headers, patch thanks to Arttu Valo <arttuv69@gmail.com>
+ bug #281383
*coin-3.1.0 (12 Aug 2009)
diff --git a/media-libs/coin/coin-3.1.0.ebuild b/media-libs/coin/coin-3.1.0.ebuild
index 707d19f5157d..86c2ff06e216 100644
--- a/media-libs/coin/coin-3.1.0.ebuild
+++ b/media-libs/coin/coin-3.1.0.ebuild
@@ -1,9 +1,11 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/coin/coin-3.1.0.ebuild,v 1.1 2009/08/12 05:16:07 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/coin/coin-3.1.0.ebuild,v 1.2 2009/09/07 01:26:27 vostorga Exp $
EAPI=2
+inherit eutils
+
MY_P=${P/c/C}
S="${WORKDIR}/${MY_P}"
@@ -33,6 +35,10 @@ DEPEND="${RDEPEND}
doc? ( app-doc/doxygen )
dev-util/pkgconfig"
+src_prepare() {
+ epatch "${FILESDIR}/${P}-javascript.patch"
+}
+
src_configure() {
econf \
htmldir=/usr/share/doc/${PF}/html \
diff --git a/media-libs/coin/files/coin-3.1.0-javascript.patch b/media-libs/coin/files/coin-3.1.0-javascript.patch
new file mode 100644
index 000000000000..f45d9cd78cf6
--- /dev/null
+++ b/media-libs/coin/files/coin-3.1.0-javascript.patch
@@ -0,0 +1,38 @@
+Index: src/vrml97/JS_VRMLClasses.h
+===================================================================
+--- src/vrml97/JS_VRMLClasses.h (revision 13505)
++++ src/vrml97/JS_VRMLClasses.h (revision 13506)
+@@ -28,6 +28,7 @@
+ #error this is a private header file
+ #endif /* ! COIN_INTERNAL */
+
++#if defined(HAVE_VRML97) && defined(COIN_HAVE_JAVASCRIPT)
+ /* ********************************************************************** */
+
+ class SoJavaScriptEngine;
+@@ -37,5 +38,6 @@
+ void JS_addVRMLclasses(SoJavaScriptEngine * engine);
+
+ /* ********************************************************************** */
++#endif // HAVE_VRML97 && COIN_HAVE_JAVASCRIPT
+
+ #endif /* !COIN_JS_VRMLCLASSES_H */
+Index: src/vrml97/JS_VRMLClasses.cpp
+===================================================================
+--- src/vrml97/JS_VRMLClasses.cpp (revision 13505)
++++ src/vrml97/JS_VRMLClasses.cpp (revision 13506)
+@@ -2,7 +2,7 @@
+ #include "config.h"
+ #endif // HAVE_CONFIG_H
+
+-#ifdef HAVE_VRML97
++#if defined(HAVE_VRML97) && defined(COIN_HAVE_JAVASCRIPT)
+
+ /**************************************************************************\
+ *
+@@ -2097,4 +2097,4 @@
+ MFVec3dHandler::jsval2field);
+ }
+
+-#endif // HAVE_VRML97
++#endif // HAVE_VRML97 && COIN_HAVE_JAVASCRIPT