sci-libs/opencascade: Add fix for compilation with tcl-8.6, thanks debian, #451360

(Portage version: 2.2.0_alpha164/cvs/Linux x86_64, signed Manifest commit with key 8009D6F070EB7916)

4 files changed, 64 insertions, 12 deletions

diff --git a/sci-libs/opencascade/ChangeLog b/sci-libs/opencascade/ChangeLog
index bf0a04885324..c8f93f053fa4 100644
--- a/sci-libs/opencascade/ChangeLog
+++ b/sci-libs/opencascade/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-libs/opencascade
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/opencascade/ChangeLog,v 1.8 2012/09/16 10:18:52 pacho Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/opencascade/ChangeLog,v 1.9 2013/03/03 10:08:32 jlec Exp $
+
+  03 Mar 2013; Justin Lecher <jlec@gentoo.org> opencascade-6.5.ebuild,
+  +files/opencascade-6.5-tcl8.6.patch, metadata.xml:
+  Add fix for compilation with tcl-8.6, thanks debian, #451360
 
   16 Sep 2012; Pacho Ramos <pacho@gentoo.org> opencascade-6.5.ebuild:
   Add missing virtual/glu dependency, bug #434438 by Andreas Sturmlechner.
diff --git a/sci-libs/opencascade/files/opencascade-6.5-tcl8.6.patch b/sci-libs/opencascade/files/opencascade-6.5-tcl8.6.patch
new file mode 100644
index 000000000000..f8b20f94887d
--- /dev/null
+++ b/sci-libs/opencascade/files/opencascade-6.5-tcl8.6.patch
@@ -0,0 +1,46 @@
+Fix build failure with tcl 8.6
+
+With this patch, opencascade still builds with tcl 8.5.
+
+Submitted upstream: http://www.opencascade.org/org/forum/thread_20125/
+
+Index: opencascade/ros/src/Draw/Draw_Window.cxx
+===================================================================
+--- opencascade.orig/ros/src/Draw/Draw_Window.cxx
++++ opencascade/ros/src/Draw/Draw_Window.cxx
+@@ -70,7 +70,7 @@
+       errChannel = Tcl_GetStdChannel(TCL_STDERR);
+       if (code != TCL_OK) {
+         if (errChannel) {
+-          Tcl_Write(errChannel, Interp->result, -1);
++          Tcl_Write(errChannel, Tcl_GetStringResult(Interp), -1);
+           Tcl_Write(errChannel, "\n", 1);
+         }
+         Tcl_AddErrorInfo(Interp,
+@@ -1044,7 +1044,7 @@
+   mainWindow =
+   Tk_MainWindow(interp) ;
+   if (mainWindow == NULL) {
+-    fprintf(stderr, "%s\n", interp->result);
++    fprintf(stderr, "%s\n", Tcl_GetStringResult(interp));
+     exit(1);
+   }
+   Tk_Name(mainWindow) =
+@@ -2064,7 +2064,7 @@
+     OCC_CATCH_SIGNALS
+     Standard_Integer res = Tk_Init(interp) ;
+     if (res != TCL_OK)
+-      cout << "tkLoop: error in Tk initialization. Tcl reported: " << interp->result << endl;
++      cout << "tkLoop: error in Tk initialization. Tcl reported: " << Tcl_GetStringResult(interp) << endl;
+ 
+   } catch  (Standard_Failure) {
+     cout <<"tkLoop: exception in TK_Init "<<endl;
+@@ -2074,7 +2074,7 @@
+   mainWindow =
+     Tk_MainWindow(interp) ;
+   if (mainWindow == NULL) {
+-        fprintf(stderr, "%s\n", interp->result);
++        fprintf(stderr, "%s\n", Tcl_GetStringResult(interp));
+         cout << "tkLoop: Tk_MainWindow() returned NULL. Exiting..." << endl;
+         Tcl_Exit(0);
+    }
diff --git a/sci-libs/opencascade/metadata.xml b/sci-libs/opencascade/metadata.xml
index 8e8fd49e1fb7..dc2b6193d0be 100644
--- a/sci-libs/opencascade/metadata.xml
+++ b/sci-libs/opencascade/metadata.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
-	<use>
-		<flag name="gl2ps">Use gl2ps PostScript printing library</flag>
-	</use>
+  <maintainer>
+    <email>maintainer-needed@gentoo.org</email>
+  </maintainer>
+  <use>
+    <flag name="gl2ps">Use gl2ps PostScript printing library</flag>
+  </use>
 </pkgmetadata>
diff --git a/sci-libs/opencascade/opencascade-6.5.ebuild b/sci-libs/opencascade/opencascade-6.5.ebuild
index 63e2b9e169f6..24cbd3634eed 100644
--- a/sci-libs/opencascade/opencascade-6.5.ebuild
+++ b/sci-libs/opencascade/opencascade-6.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/opencascade/opencascade-6.5.ebuild,v 1.3 2012/09/16 10:18:52 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/opencascade/opencascade-6.5.ebuild,v 1.4 2013/03/03 10:08:32 jlec Exp $
 
 EAPI=4
 inherit autotools eutils check-reqs multilib java-pkg-opt-2 flag-o-matic
@@ -81,8 +81,10 @@ src_prepare() {
 		-e "s:VAR_TCL:tcl${tcl_version}:g" env.sh \
 			|| die "itk, itcl, tix, tk and tcl version tweaking failed!"
 
-	epatch "${FILESDIR}"/${P}-ftgl.patch
-	epatch "${FILESDIR}"/${P}-fixed-DESTDIR.patch
+	epatch \
+		"${FILESDIR}"/${P}-ftgl.patch \
+		"${FILESDIR}"/${P}-fixed-DESTDIR.patch \
+		"${FILESDIR}"/${P}-tcl8.6.patch
 
 	source env.sh