[gentoo-commits] gentoo-x86 commit in sci-libs/opencascade/files: opencascade-6.5.4-tcl8.6.patch opencascade-6.5.4-fixed-DESTDIR.patch

[gentoo-commits] gentoo-x86 commit in sci-libs/opencascade/files: opencascade-6.5.4-tcl8.6.patch opencascade-6.5.4-fixed-DESTDIR.patch

[Michael Weber (xmw)]

xmw         13/04/26 20:32:59

  Added:                opencascade-6.5.4-tcl8.6.patch
                        opencascade-6.5.4-fixed-DESTDIR.patch
  Log:
  Taking maint, version bumps (thanks Sławek Lis, bug 438466, thanks Jimmy.Jazz@gmx.net, bug 451406). No keywords, needs further testing of slots etc.
  
  (Portage version: 2.2.0_alpha173/cvs/Linux x86_64, signed Manifest commit with key 62EEF090)

Revision  Changes    Path
1.1                  sci-libs/opencascade/files/opencascade-6.5.4-tcl8.6.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/opencascade/files/opencascade-6.5.4-tcl8.6.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/opencascade/files/opencascade-6.5.4-tcl8.6.patch?rev=1.1&content-type=text/plain

Index: opencascade-6.5.4-tcl8.6.patch
===================================================================
--- ros/src/Draw/Draw_Window.cxx.orig    2013-01-10 23:40:07.279470692 +0100
+++ ros/src/Draw/Draw_Window.cxx    2013-01-10 23:45:00.498784426 +0100
@@ -84,7 +84,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,
@@ -1055,7 +1055,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) =
@@ -2061,7 +2061,7 @@
       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)
@@ -2072,7 +2072,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...\n";
       Tcl_Exit (0);
     }


1.1                  sci-libs/opencascade/files/opencascade-6.5.4-fixed-DESTDIR.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/opencascade/files/opencascade-6.5.4-fixed-DESTDIR.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/opencascade/files/opencascade-6.5.4-fixed-DESTDIR.patch?rev=1.1&content-type=text/plain

Index: opencascade-6.5.4-fixed-DESTDIR.patch
===================================================================
--- Makefile.am.orig	2013-01-14 12:53:15.293322821 +0100
+++ Makefile.am	2013-01-14 13:02:05.333309637 +0100
@@ -82,27 +82,27 @@
 	cd $(top_builddir)/adm/make && $(MAKE) $(AM_MAKEFLAGS) Draw
 
 install-exec-local:
-	$(INSTALL) -d $(prefix)/$(platform)
-	if [ -e $(prefix)/bin -a ! -e $(prefix)/$(platform)/bin ]; then \
-		cd $(prefix)/$(platform) && ln -s ../bin bin; \
+	$(INSTALL) -d $(DESTDIR)$(prefix)/$(platform)
+	if [ -e $(DESTDIR)$(prefix)/bin -a ! -e $(DESTDIR)$(prefix)/$(platform)/bin ]; then \
+		cd $(DESTDIR)$(prefix)/$(platform) && ln -s ../bin bin; \
 	fi
-	if [ -e $(prefix)/lib -a ! -e $(prefix)/$(platform)/lib ]; then \
-		cd $(prefix)/$(platform) && ln -s ../lib lib; \
+	if [ -e $(DESTDIR)$(prefix)/lib -a ! -e $(DESTDIR)$(prefix)/$(platform)/lib ]; then \
+		cd $(DESTDIR)$(prefix)/$(platform) && ln -s ../lib lib; \
 	fi
-	buildd=`pwd`; cd $(top_srcdir); sourced=`pwd`; cd $(prefix); installd=`pwd`; cd $$buildd; \
+	buildd=`pwd`; cd $(top_srcdir); sourced=`pwd`; cd $(DESTDIR)$(prefix); installd=`pwd`; cd $$buildd; \
 	if [ "$$installd" != "$$sourced" ]; then \
-		$(INSTALL) -d $(prefix)/inc; \
-		cp -frL $(top_srcdir)/inc $(prefix); \
-		cp -frL $$buildd/config.h $(prefix); \
+		$(INSTALL) -d $(DESTDIR)$(prefix)/inc; \
+		cp -frL $(top_srcdir)/inc $(DESTDIR)$(prefix); \
+		cp -frL $$buildd/config.h $(DESTDIR)$(prefix); \
 		for d in  $(FoundationClasses_DIRS) $(ModelingData_DIRS) $(ModelingAlgorithms_DIRS) $(Visualization_DIRS) $(ApplicationFramework_DIRS) $(DataExchange_DIRS) $(Draw_DIRS); do \
-			$(INSTALL) -d $(prefix)/src/$$d; \
-			cp -frL $(top_srcdir)/src/$$d $(prefix)/src; \
+			$(INSTALL) -d $(DESTDIR)$(prefix)/src/$$d; \
+			cp -frL $(top_srcdir)/src/$$d $(DESTDIR)$(prefix)/src; \
 		done; \
 	fi
-	if [ -e $(prefix)/inc/config.h ]; then \
-		unlink $(prefix)/inc/config.h; \
+	if [ -e $(DESTDIR)$(prefix)/inc/config.h ]; then \
+		unlink $(DESTDIR)$(prefix)/inc/config.h; \
 	fi
-	cd $(prefix)/inc && ln -s ../config.h config.h
-	cd $(top_srcdir) && cp *.sh $(prefix)
+	cd $(DESTDIR)$(prefix)/inc && ln -s ../config.h config.h
+	cd $(top_srcdir) && cp *.sh $(DESTDIR)$(prefix)
 
 .PHONY: FoundationClasses ModelingData ModelingAlgorithms Visualization ApplicationFramework DataExchange Draw
\ Brak znaku nowej linii na końcu pliku