diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /sci-libs/opencascade/files | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'sci-libs/opencascade/files')
13 files changed, 743 insertions, 0 deletions
diff --git a/sci-libs/opencascade/files/env.sh.template b/sci-libs/opencascade/files/env.sh.template new file mode 100644 index 000000000000..146c86ba6d8c --- /dev/null +++ b/sci-libs/opencascade/files/env.sh.template @@ -0,0 +1,40 @@ +#!/bin/sh -f + +export CASROOT=VAR_CASROOT + +if [ -z "PATH" ]; +then PATH=VAR_CASROOT/Linux/bin; +else PATH=VAR_CASROOT/Linux/bin:$PATH; +fi +export PATH +if [ -z "LD_LIBRARY_PATH" ]; +then LD_LIBRARY_PATH=VAR_CASROOT/Linux/lib; +else LD_LIBRARY_PATH=VAR_CASROOT/Linux/lib:$LD_LIBRARY_PATH; +fi +export LD_LIBRARY_PATH +export CSF_MDTVFontDirectory=VAR_CASROOT/src/FontMFT +export CSF_LANGUAGE=us +export MMGT_CLEAR=1 +export CSF_EXCEPTION_PROMPT=1 +export CSF_SHMessage=VAR_CASROOT/src/SHMessage +export CSF_MDTVTexturesDirectory=VAR_CASROOT/src/Textures +export CSF_XSMessage=VAR_CASROOT/src/XSMessage +export CSF_StandardDefaults=VAR_CASROOT/src/StdResource +export CSF_PluginDefaults=VAR_CASROOT/src/StdResource +export CSF_XCAFDefaults=VAR_CASROOT/src/StdResource +export CSF_StandardLiteDefaults=VAR_CASROOT/src/StdResource +export CSF_GraphicShr=VAR_CASROOT/Linux/lib/libTKOpenGl.so +export CSF_UnitsLexicon=VAR_CASROOT/src/UnitsAPI/Lexi_Expr.dat +export CSF_UnitsDefinition=VAR_CASROOT/src/UnitsAPI/Units.dat +export CSF_IGESDefaults=VAR_CASROOT/src/XSTEPResource +export CSF_STEPDefaults=VAR_CASROOT/src/XSTEPResource +export CSF_XmlOcafResource=VAR_CASROOT/src/XmlOcafResource +export CSF_MIGRATION_TYPES=VAR_CASROOT/src/StdResource/MigrationSheet.txt + +export TCLHOME=VAR_SYS_BIN +export TCLLIBPATH=VAR_SYS_LIB +export ITK_LIBRARY=VAR_SYS_LIB/VAR_ITK +export ITCL_LIBRARY=VAR_SYS_LIB/VAR_ITCL +export TIX_LIBRARY=VAR_SYS_LIB/VAR_TIX +export TK_LIBRARY=VAR_SYS_LIB/VAR_TK +export TCL_LIBRARY=VAR_SYS_LIB/VAR_TCL diff --git a/sci-libs/opencascade/files/opencascade-6.5-fixed-DESTDIR.patch b/sci-libs/opencascade/files/opencascade-6.5-fixed-DESTDIR.patch new file mode 100644 index 000000000000..ea0f9b6f166f --- /dev/null +++ b/sci-libs/opencascade/files/opencascade-6.5-fixed-DESTDIR.patch @@ -0,0 +1,174 @@ +diff -urN opencascade.orig/ros/Makefile.am opencascade/ros/Makefile.am +--- opencascade.orig/ros/Makefile.am 2011-03-06 16:08:59.000000000 +0100 ++++ opencascade/ros/Makefile.am 2011-03-06 16:13:35.000000000 +0100 +@@ -86,106 +86,106 @@ + dir_SunOS=sun + + 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 +- $(INSTALL) -d $(prefix)/$(dir_$(platform)) +- if [ -e $(prefix)/bin -a ! -e $(prefix)/$(dir_$(platform))/bin ]; then \ +- cd $(prefix)/$(dir_$(platform)) && ln -s ../bin bin; \ ++ $(INSTALL) -d $(DESTDIR)$(prefix)/$(dir_$(platform)) ++ if [ -e $(DESTDIR)$(prefix)/bin -a ! -e $(DESTDIR)$(prefix)/$(dir_$(platform))/bin ]; then \ ++ cd $(DESTDIR)$(prefix)/$(dir_$(platform)) && ln -s ../bin bin; \ + fi +- if [ -e $(prefix)/lib -a ! -e $(prefix)/$(dir_$(platform))/lib ]; then \ +- cd $(prefix)/$(dir_$(platform)) && ln -s ../lib lib; \ ++ if [ -e $(DESTDIR)$(prefix)/lib -a ! -e $(DESTDIR)$(prefix)/$(dir_$(platform))/lib ]; then \ ++ cd $(DESTDIR)$(prefix)/$(dir_$(platform)) && ln -s ../lib lib; \ + fi +- bd=`pwd`; cd $(top_srcdir); sd=`pwd`; cd $(prefix); pd=`pwd`; cd $$bd; \ ++ bd=`pwd`; cd $(top_srcdir); sd=`pwd`; cd $(DESTDIR)$(prefix); pd=`pwd`; cd $$bd; \ + if [ "$$pd" != "$$sd" ]; then \ +- $(INSTALL) -d $(prefix)/inc; \ +- cp -fr$(CP_$(platform)) $(top_srcdir)/inc $(prefix); \ ++ $(INSTALL) -d $(DESTDIR)$(prefix)/inc; \ ++ cp -fr$(CP_$(platform)) $(top_srcdir)/inc $(DESTDIR)$(prefix); \ + fi; \ + if [ "$$pd" != "$$bd" ]; then \ +- cp -fr$(CP_$(platform)) $$bd/config.h $(prefix); \ ++ cp -fr$(CP_$(platform)) $$bd/config.h $(DESTDIR)$(prefix); \ + 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 +- bd=`pwd`; cd $(top_srcdir); sd=`pwd`; cd $(prefix); pd=`pwd`; cd $$bd; \ ++ cd $(DESTDIR)$(prefix)/inc && ln -s ../config.h config.h ++ bd=`pwd`; cd $(top_srcdir); sd=`pwd`; cd $(DESTDIR)$(prefix); pd=`pwd`; cd $$bd; \ + if [ "$$pd" != "$$sd" -a -d $(top_srcdir)/src/UnitsAPI ]; then \ +- $(INSTALL) -d $(prefix)/src; \ +- $(INSTALL) -d $(prefix)/src/UnitsAPI; \ +- cp -fr$(CP_$(platform)) $(top_srcdir)/src/UnitsAPI $(prefix)/src; \ +- cp -f$(CP_$(platform)) $(top_srcdir)/env_DRAW.sh $(prefix); \ ++ $(INSTALL) -d $(DESTDIR)$(prefix)/src; \ ++ $(INSTALL) -d $(DESTDIR)$(prefix)/src/UnitsAPI; \ ++ cp -fr$(CP_$(platform)) $(top_srcdir)/src/UnitsAPI $(DESTDIR)$(prefix)/src; \ ++ cp -f$(CP_$(platform)) $(top_srcdir)/env_DRAW.sh $(DESTDIR)$(prefix); \ + fi +- bd=`pwd`; cd $(top_srcdir); sd=`pwd`; cd $(prefix); pd=`pwd`; cd $$bd; \ ++ bd=`pwd`; cd $(top_srcdir); sd=`pwd`; cd $(DESTDIR)$(prefix); pd=`pwd`; cd $$bd; \ + if [ "$$pd" != "$$sd" ]; then \ + inst_dirs="$(FoundationClasses_DIRS)"; \ + if test "x$(FoundationClasses_DIRS)" != "x"; then \ + for d in $$inst_dirs; do \ +- $(INSTALL) -d $(prefix)/src/$$d; \ +- cp -fr$(CP_$(platform)) $(top_srcdir)/src/$$d $(prefix)/src; \ ++ $(INSTALL) -d $(DESTDIR)$(prefix)/src/$$d; \ ++ cp -fr$(CP_$(platform)) $(top_srcdir)/src/$$d $(DESTDIR)$(prefix)/src; \ + done; \ + fi; \ + fi +- bd=`pwd`; cd $(top_srcdir); sd=`pwd`; cd $(prefix); pd=`pwd`; cd $$bd; \ ++ bd=`pwd`; cd $(top_srcdir); sd=`pwd`; cd $(DESTDIR)$(prefix); pd=`pwd`; cd $$bd; \ + if [ "$$pd" != "$$sd" ]; then \ + inst_dirs="$(ModelingData_DIRS)"; \ + if test "x$(ModelingData_DIRS)" != "x"; then \ + for d in $$inst_dirs; do \ +- $(INSTALL) -d $(prefix)/src/$$d; \ +- cp -fr$(CP_$(platform)) $(top_srcdir)/src/$$d $(prefix)/src; \ ++ $(INSTALL) -d $(DESTDIR)$(prefix)/src/$$d; \ ++ cp -fr$(CP_$(platform)) $(top_srcdir)/src/$$d $(DESTDIR)$(prefix)/src; \ + done; \ + fi; \ + fi +- bd=`pwd`; cd $(top_srcdir); sd=`pwd`; cd $(prefix); pd=`pwd`; cd $$bd; \ ++ bd=`pwd`; cd $(top_srcdir); sd=`pwd`; cd $(DESTDIR)$(prefix); pd=`pwd`; cd $$bd; \ + if [ "$$pd" != "$$sd" ]; then \ + inst_dirs="$(ModelingAlgorithms_DIRS)"; \ + if test "x$(ModelingAlgorithms_DIRS)" != "x"; then \ + for d in $$inst_dirs; do \ +- $(INSTALL) -d $(prefix)/src/$$d; \ +- cp -fr$(CP_$(platform)) $(top_srcdir)/src/$$d $(prefix)/src; \ ++ $(INSTALL) -d $(DESTDIR)$(prefix)/src/$$d; \ ++ cp -fr$(CP_$(platform)) $(top_srcdir)/src/$$d $(DESTDIR)$(prefix)/src; \ + done; \ + fi; \ + fi +- bd=`pwd`; cd $(top_srcdir); sd=`pwd`; cd $(prefix); pd=`pwd`; cd $$bd; \ ++ bd=`pwd`; cd $(top_srcdir); sd=`pwd`; cd $(DESTDIR)$(prefix); pd=`pwd`; cd $$bd; \ + if [ "$$pd" != "$$sd" ]; then \ + inst_dirs="$(Visualization_DIRS)"; \ + if test "x$(Visualization_DIRS)" != "x"; then \ + for d in $$inst_dirs; do \ +- $(INSTALL) -d $(prefix)/src/$$d; \ +- cp -fr$(CP_$(platform)) $(top_srcdir)/src/$$d $(prefix)/src; \ ++ $(INSTALL) -d $(DESTDIR)$(prefix)/src/$$d; \ ++ cp -fr$(CP_$(platform)) $(top_srcdir)/src/$$d $(DESTDIR)$(prefix)/src; \ + done; \ + fi; \ + fi +- bd=`pwd`; cd $(top_srcdir); sd=`pwd`; cd $(prefix); pd=`pwd`; cd $$bd; \ ++ bd=`pwd`; cd $(top_srcdir); sd=`pwd`; cd $(DESTDIR)$(prefix); pd=`pwd`; cd $$bd; \ + if [ "$$pd" != "$$sd" ]; then \ + inst_dirs="$(ApplicationFramework_DIRS)"; \ + if test "x$(ApplicationFramework_DIRS)" != "x"; then \ + for d in $$inst_dirs; do \ +- $(INSTALL) -d $(prefix)/src/$$d; \ +- cp -fr$(CP_$(platform)) $(top_srcdir)/src/$$d $(prefix)/src; \ ++ $(INSTALL) -d $(DESTDIR)$(prefix)/src/$$d; \ ++ cp -fr$(CP_$(platform)) $(top_srcdir)/src/$$d $(DESTDIR)$(prefix)/src; \ + done; \ + fi; \ + fi +- bd=`pwd`; cd $(top_srcdir); sd=`pwd`; cd $(prefix); pd=`pwd`; cd $$bd; \ ++ bd=`pwd`; cd $(top_srcdir); sd=`pwd`; cd $(DESTDIR)$(prefix); pd=`pwd`; cd $$bd; \ + if [ "$$pd" != "$$sd" ]; then \ + inst_dirs="$(DataExchange_DIRS)"; \ + if test "x$(DataExchange_DIRS)" != "x"; then \ + for d in $$inst_dirs; do \ +- $(INSTALL) -d $(prefix)/src/$$d; \ +- cp -fr$(CP_$(platform)) $(top_srcdir)/src/$$d $(prefix)/src; \ ++ $(INSTALL) -d $(DESTDIR)$(prefix)/src/$$d; \ ++ cp -fr$(CP_$(platform)) $(top_srcdir)/src/$$d $(DESTDIR)$(prefix)/src; \ + done; \ + fi; \ + fi +- bd=`pwd`; cd $(top_srcdir); sd=`pwd`; cd $(prefix); pd=`pwd`; cd $$bd; \ ++ bd=`pwd`; cd $(top_srcdir); sd=`pwd`; cd $(DESTDIR)$(prefix); pd=`pwd`; cd $$bd; \ + if [ "$$pd" != "$$sd" ]; then \ + inst_dirs="$(Draw_DIRS)"; \ + if test "x$(Draw_DIRS)" != "x"; then \ + for d in $$inst_dirs; do \ +- $(INSTALL) -d $(prefix)/src/$$d; \ +- cp -fr$(CP_$(platform)) $(top_srcdir)/src/$$d $(prefix)/src; \ ++ $(INSTALL) -d $(DESTDIR)$(prefix)/src/$$d; \ ++ cp -fr$(CP_$(platform)) $(top_srcdir)/src/$$d $(DESTDIR)$(prefix)/src; \ + done; \ + fi; \ + fi +diff -urN opencascade.orig/ros/configure.in opencascade/ros/configure.in +--- opencascade/ros/configure.in.orig 2011-03-06 19:36:08.000000000 +0100 ++++ opencascade/ros/configure.in 2011-03-06 22:24:04.000000000 +0100 +@@ -422,7 +422,7 @@ + HAVE_FTGL=yes + HAVE_FTGL_INC=yes + CPPFLAGS="-I$ftgl/include $CPPFLAGS"; +- AC_CHECK_HEADER( [FTGL/FTGL.h], [], [HAVE_FTGL_INC=no] ) ++ AC_CHECK_HEADER( [FTGL/ftgl.h], [], [HAVE_FTGL_INC=no] ) + if test "x$HAVE_FTGL_INC" = "xyes"; then + CSF_FTGL_INCLUDES="-I$ftgl/include/FTGL" + HAVE_FTGL_LIB=yes +@@ -433,7 +433,7 @@ + #we have problem with unresolved symbols on 64 stations + CSF_FTGL_LIB="-L$ftgl/lib -lftgl" + AC_TRY_LINK([ +-#include <FTGL/FTGL.h> ++#include <FTGL/ftgl.h> + #include <FTGL/FTGLTextureFont.h> + ], [ + FTGLTextureFont font("");], [ diff --git a/sci-libs/opencascade/files/opencascade-6.5-ftgl.patch b/sci-libs/opencascade/files/opencascade-6.5-ftgl.patch new file mode 100644 index 000000000000..b2729f4f403b --- /dev/null +++ b/sci-libs/opencascade/files/opencascade-6.5-ftgl.patch @@ -0,0 +1,77 @@ +--- opencascade/ros/src/OpenGl/OpenGl_FontMgr.cxx.orig 2011-03-06 21:55:55.000000000 +0100 ++++ opencascade/ros/src/OpenGl/OpenGl_FontMgr.cxx 2011-03-06 23:06:05.000000000 +0100 +@@ -1,8 +1,9 @@ + #include <OpenGl_FontMgr.hxx> + +-#include <FTGLTextureFont.h> +-#include <FTLibrary.h> +-#include <FTFace.h> ++#include <ftgl.h> ++// #include <FTGLTextureFont.h> ++// #include <FTLibrary.h> ++// #include <FTFace.h> + #include <Standard_Stream.hxx> + + #undef TRACE +@@ -71,10 +72,29 @@ + if ( it.Value()->FontAspect() == OSD_FA_Regular ) { + //this workaround for fonts with names dependent on system locale. + //for example: "Times New Roman Fett Kursive" or "Times New Roman Gras Italiqui" +- FTFace face(it.Value()->FontPath()->ToCString()); ++// FTFace face(it.Value()->FontPath()->ToCString()); ++ ++ FT_Library* library = new FT_Library; ++ FT_Error ftErrLib = FT_Init_FreeType( library); ++ ++ const FT_Long DEFAULT_FACE_INDEX = 0; ++ FT_Face* ftFace = new FT_Face; ++ ++ FT_Error err = FT_New_Face( (*library), it.Value()->FontPath()->ToCString(), DEFAULT_FACE_INDEX, ftFace); ++ ++// if( err) ++// { ++// delete ftFace; ++// ftFace = 0; ++// } ++// else ++// { ++// numGlyphs = (*ftFace)->num_glyphs; ++// hasKerningTable = FT_HAS_KERNING((*ftFace)); ++// } + +- if ( face.Error() == FT_Err_Ok ) { +- if ( (*face.Face())->style_flags == 0 ) { ++ if ( err == FT_Err_Ok ) { ++ if ( (*ftFace)->style_flags == 0 ) { + info->SysFont = it.Value(); + } + else { +@@ -82,22 +102,22 @@ + #ifdef TRACE + cout << "TKOpenGl::initializeFontDB() detected new font!\n" + << "\tFont Previous Name: " << it.Value()->FontName()->ToCString() << endl +- << "\tFont New Name: " << (*face.Face())->family_name << endl +- << "\tFont Aspect: " << (*face.Face())->style_flags << endl; ++ << "\tFont New Name: " << (*ftFace)->family_name << endl ++ << "\tFont Aspect: " << (*ftFace)->style_flags << endl; + #endif + OSD_FontAspect aspect = OSD_FA_Regular; +- if ( (*face.Face())->style_flags == (FT_STYLE_FLAG_ITALIC | FT_STYLE_FLAG_BOLD) ) ++ if ( (*ftFace)->style_flags == (FT_STYLE_FLAG_ITALIC | FT_STYLE_FLAG_BOLD) ) + aspect = OSD_FA_BoldItalic; +- else if ( (*face.Face())->style_flags == FT_STYLE_FLAG_ITALIC ) ++ else if ( (*ftFace)->style_flags == FT_STYLE_FLAG_ITALIC ) + aspect = OSD_FA_Italic; +- else if ( (*face.Face())->style_flags == FT_STYLE_FLAG_BOLD ) ++ else if ( (*ftFace)->style_flags == FT_STYLE_FLAG_BOLD ) + aspect = OSD_FA_Bold; + + #ifdef TRACE + cout << "\tOSD_FontAspect: " << aspect << endl; + #endif + Handle(TCollection_HAsciiString) aFontName = +- new TCollection_HAsciiString( (*face.Face())->family_name ); ++ new TCollection_HAsciiString( (*ftFace)->family_name ); + info->SysFont = new OSD_SystemFont( aFontName, aspect, it.Value()->FontPath() ); + } + } 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/files/opencascade-6.5.4-fixed-DESTDIR.patch b/sci-libs/opencascade/files/opencascade-6.5.4-fixed-DESTDIR.patch new file mode 100644 index 000000000000..15a9fa607216 --- /dev/null +++ b/sci-libs/opencascade/files/opencascade-6.5.4-fixed-DESTDIR.patch @@ -0,0 +1,46 @@ +--- opencascade-6.5.4/Makefile.am ++++ opencascade-6.5.4/Makefile.am +@@ -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 diff --git a/sci-libs/opencascade/files/opencascade-6.5.4-fixed-tbb-VERSION.patch b/sci-libs/opencascade/files/opencascade-6.5.4-fixed-tbb-VERSION.patch new file mode 100644 index 000000000000..88b13acd21c4 --- /dev/null +++ b/sci-libs/opencascade/files/opencascade-6.5.4-fixed-tbb-VERSION.patch @@ -0,0 +1,10 @@ +--- src/Standard/Standard_MMgrTBBalloc.cxx ++++ src/Standard/Standard_MMgrTBBalloc.cxx +@@ -12,6 +12,7 @@ + + // paralleling with Intel TBB + #ifdef HAVE_TBB ++#undef VERSION + #include <tbb/scalable_allocator.h> + using namespace tbb; + #else diff --git a/sci-libs/opencascade/files/opencascade-6.5.4-tcl8.6.patch b/sci-libs/opencascade/files/opencascade-6.5.4-tcl8.6.patch new file mode 100644 index 000000000000..28c3a11afdf9 --- /dev/null +++ b/sci-libs/opencascade/files/opencascade-6.5.4-tcl8.6.patch @@ -0,0 +1,38 @@ +--- 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); + }
\ No newline at end of file diff --git a/sci-libs/opencascade/files/opencascade-6.5.5-deprecated-glx-api.patch b/sci-libs/opencascade/files/opencascade-6.5.5-deprecated-glx-api.patch new file mode 100644 index 000000000000..930b73484fee --- /dev/null +++ b/sci-libs/opencascade/files/opencascade-6.5.5-deprecated-glx-api.patch @@ -0,0 +1,30 @@ +--- opencascade-6.5.5/ros/inc/InterfaceGraphic_X11.hxx ++++ opencascade-6.5.5/ros/inc/InterfaceGraphic_X11.hxx +@@ -25,6 +25,7 @@ + # include <X11/Xlib.h> + # include <X11/Xutil.h> + # include <X11/Xatom.h> ++#define GLX_GLXEXT_LEGACY + # include <GL/glx.h> + + # if defined (sun) || defined (SUNOS) || defined (__alpha) || defined (DECOSF1) || defined (sgi) || defined (IRIX) || defined (__hpux)|| defined (HPUX) +--- opencascade-6.5.5/ros/src/InterfaceGraphic/InterfaceGraphic_X11.hxx ++++ opencascade-6.5.5/ros/src/InterfaceGraphic/InterfaceGraphic_X11.hxx +@@ -25,6 +25,7 @@ + # include <X11/Xlib.h> + # include <X11/Xutil.h> + # include <X11/Xatom.h> ++#define GLX_GLXEXT_LEGACY + # include <GL/glx.h> + + # if defined (sun) || defined (SUNOS) || defined (__alpha) || defined (DECOSF1) || defined (sgi) || defined (IRIX) || defined (__hpux)|| defined (HPUX) +--- opencascade-6.5.5/ros/src/OpenGl/OpenGl_Context.cxx ++++ opencascade-6.5.5/ros/src/OpenGl/OpenGl_Context.cxx +@@ -38,6 +38,7 @@ + #elif defined(__APPLE__) && !defined(MACOSX_USE_GLX) + #include <dlfcn.h> + #else ++ #define GLX_GLXEXT_LEGACY + #include <GL/glx.h> // glXGetProcAddress() + #endif + diff --git a/sci-libs/opencascade/files/opencascade-6.6.0-deprecated-glx-api.patch b/sci-libs/opencascade/files/opencascade-6.6.0-deprecated-glx-api.patch new file mode 100644 index 000000000000..d3ae6ae7f4c4 --- /dev/null +++ b/sci-libs/opencascade/files/opencascade-6.6.0-deprecated-glx-api.patch @@ -0,0 +1,50 @@ +--- opencascade-6.6.0/ros/inc/InterfaceGraphic_X11.hxx ++++ opencascade-6.6.0/ros/inc/InterfaceGraphic_X11.hxx +@@ -25,6 +25,7 @@ + # include <X11/Xlib.h> + # include <X11/Xutil.h> + # include <X11/Xatom.h> ++#define GLX_GLXEXT_LEGACY + # include <GL/glx.h> + + # if defined (sun) || defined (SUNOS) || defined (__alpha) || defined (DECOSF1) || defined (sgi) || defined (IRIX) || defined (__hpux)|| defined (HPUX) +--- opencascade-6.6.0/ros/samples/qt/Common/src/View.cxx ++++ opencascade-6.6.0/ros/samples/qt/Common/src/View.cxx +@@ -25,6 +25,7 @@ + #include <Cocoa_Window.hxx> + #else + #include <QX11Info> ++#define GLX_GLXEXT_LEGACY + #include <GL/glx.h> + #include <X11/Xutil.h> + #include <X11/Xatom.h> +--- opencascade-6.6.0/ros/src/InterfaceGraphic/InterfaceGraphic_X11.hxx ++++ opencascade-6.6.0/ros/src/InterfaceGraphic/InterfaceGraphic_X11.hxx +@@ -25,6 +25,7 @@ + # include <X11/Xlib.h> + # include <X11/Xutil.h> + # include <X11/Xatom.h> ++#define GLX_GLXEXT_LEGACY + # include <GL/glx.h> + + # if defined (sun) || defined (SUNOS) || defined (__alpha) || defined (DECOSF1) || defined (sgi) || defined (IRIX) || defined (__hpux)|| defined (HPUX) +--- opencascade-6.6.0/ros/src/OpenGl/OpenGl_Context.cxx ++++ opencascade-6.6.0/ros/src/OpenGl/OpenGl_Context.cxx +@@ -39,6 +39,7 @@ + #elif defined(__APPLE__) && !defined(MACOSX_USE_GLX) + #include <dlfcn.h> + #else ++ #define GLX_GLXEXT_LEGACY + #include <GL/glx.h> // glXGetProcAddress() + #endif + +--- opencascade-6.6.0/ros/src/Xw/Xw_Window.cxx ++++ opencascade-6.6.0/ros/src/Xw/Xw_Window.cxx +@@ -24,6 +24,7 @@ + #include <Aspect_Convert.hxx> + #include <Aspect_WindowDefinitionError.hxx> + ++#define GLX_GLXEXT_LEGACY + #include <GL/glx.h> + + namespace diff --git a/sci-libs/opencascade/files/opencascade-6.6.0-fixed-DESTDIR.patch b/sci-libs/opencascade/files/opencascade-6.6.0-fixed-DESTDIR.patch new file mode 100644 index 000000000000..54143db4d491 --- /dev/null +++ b/sci-libs/opencascade/files/opencascade-6.6.0-fixed-DESTDIR.patch @@ -0,0 +1,45 @@ +--- opencascade-6.6.0/Makefile.am ++++ opencascade-6.6.0/Makefile.am +@@ -82,27 +82,27 @@ + cd $(top_builddir)/adm/lin/amk && $(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 \ +- rm -f $(prefix)/inc/config.h; \ ++ if [ -e $(DESTDIR)$(prefix)/inc/config.h ]; then \ ++ rm -f $(DESTDIR)$(prefix)/inc/config.h; \ + fi +- cd $(prefix)/inc && ln -s ../config.h config.h +- cd $(top_srcdir) && cp *amk.sh $(prefix) ++ cd $(DESTDIR)$(prefix)/inc && ln -s ../config.h config.h ++ cd $(top_srcdir) && cp *amk.sh $(DESTDIR)$(prefix) + + .PHONY: FoundationClasses ModelingData ModelingAlgorithms Visualization ApplicationFramework DataExchange Draw diff --git a/sci-libs/opencascade/files/opencascade-6.7.0-fixed-DESTDIR.patch b/sci-libs/opencascade/files/opencascade-6.7.0-fixed-DESTDIR.patch new file mode 100644 index 000000000000..3a3f98093443 --- /dev/null +++ b/sci-libs/opencascade/files/opencascade-6.7.0-fixed-DESTDIR.patch @@ -0,0 +1,51 @@ +--- Makefile.am.old 2014-01-13 09:43:18.530500362 +0100 ++++ Makefile.am 2014-01-13 09:45:40.430496833 +0100 +@@ -82,29 +82,29 @@ + cd $(top_builddir)/adm/lin/amk && $(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 \ +- rm -f $(prefix)/inc/config.h; \ ++ if [ -e $(DESTDIR)$(prefix)/inc/config.h ]; then \ ++ rm -f $(DESTDIR)$(prefix)/inc/config.h; \ + fi +- cd $(prefix)/inc && ln -s ../config.h config.h +- cd $(top_srcdir) && cp draw.sh $(prefix) +- cd $(top_srcdir) && cp custom.sh $(prefix) +- cd $(top_srcdir) && cp env.sh $(prefix) ++ cd $(DESTDIR)$(prefix)/inc && ln -s ../config.h config.h ++ cd $(top_srcdir) && cp draw.sh $(DESTDIR)$(prefix) ++ cd $(top_srcdir) && cp custom.sh $(DESTDIR)$(prefix) ++ cd $(top_srcdir) && cp env.sh $(DESTDIR)$(prefix) + +-.PHONY: FoundationClasses ModelingData ModelingAlgorithms Visualization ApplicationFramework DataExchange Draw +\ Brak znaku nowej linii na końcu pliku ++.PHONY: FoundationClasses ModelingData ModelingAlgorithms Visualization ApplicationFramework DataExchange Draw diff --git a/sci-libs/opencascade/files/opencascade-6.7.1-deprecated-glx-api.patch b/sci-libs/opencascade/files/opencascade-6.7.1-deprecated-glx-api.patch new file mode 100644 index 000000000000..b3c3629aada1 --- /dev/null +++ b/sci-libs/opencascade/files/opencascade-6.7.1-deprecated-glx-api.patch @@ -0,0 +1,89 @@ +From ba7e14489e14f08aae3e0f48b419b2149290b163 Mon Sep 17 00:00:00 2001 +From: Matthias Maier <tamiko@kyomu.43-1.org> +Date: Tue, 23 Dec 2014 21:15:59 +0100 +Subject: [PATCH] Define GLX_GLXEXT_LEGACY prior to inclusion of GL/glx.h + +--- + inc/InterfaceGraphic_X11.hxx | 1 + + samples/qt/Common/src/View.cxx | 1 + + src/InterfaceGraphic/InterfaceGraphic_X11.hxx | 1 + + src/OpenGl/OpenGl_Context.cxx | 1 + + src/OpenGl/OpenGl_Workspace_Raytrace.cxx | 1 + + src/Xw/Xw_Window.cxx | 1 + + 6 files changed, 6 insertions(+) + +diff --git a/inc/InterfaceGraphic_X11.hxx b/inc/InterfaceGraphic_X11.hxx +index 280bb9b..98d7415 100755 +--- a/inc/InterfaceGraphic_X11.hxx ++++ b/inc/InterfaceGraphic_X11.hxx +@@ -21,6 +21,7 @@ + #include <X11/Xlib.h> + #include <X11/Xutil.h> + #include <X11/Xatom.h> ++#define GLX_GLXEXT_LEGACY + #include <GL/glx.h> + + #if defined (sun) || defined (SUNOS) || defined (__alpha) || defined (DECOSF1) || defined (sgi) || defined (IRIX) || defined (__hpux)|| defined (HPUX) +diff --git a/samples/qt/Common/src/View.cxx b/samples/qt/Common/src/View.cxx +index 77f51b8..9b3f4e2 100755 +--- a/samples/qt/Common/src/View.cxx ++++ b/samples/qt/Common/src/View.cxx +@@ -28,6 +28,7 @@ + #include <Cocoa_Window.hxx> + #else + #include <QX11Info> ++#define GLX_GLXEXT_LEGACY + #include <GL/glx.h> + #include <X11/Xutil.h> + #include <X11/Xatom.h> +diff --git a/src/InterfaceGraphic/InterfaceGraphic_X11.hxx b/src/InterfaceGraphic/InterfaceGraphic_X11.hxx +index 280bb9b..98d7415 100755 +--- a/src/InterfaceGraphic/InterfaceGraphic_X11.hxx ++++ b/src/InterfaceGraphic/InterfaceGraphic_X11.hxx +@@ -21,6 +21,7 @@ + #include <X11/Xlib.h> + #include <X11/Xutil.h> + #include <X11/Xatom.h> ++#define GLX_GLXEXT_LEGACY + #include <GL/glx.h> + + #if defined (sun) || defined (SUNOS) || defined (__alpha) || defined (DECOSF1) || defined (sgi) || defined (IRIX) || defined (__hpux)|| defined (HPUX) +diff --git a/src/OpenGl/OpenGl_Context.cxx b/src/OpenGl/OpenGl_Context.cxx +index 9e2f074..1ddf6a4 100755 +--- a/src/OpenGl/OpenGl_Context.cxx ++++ b/src/OpenGl/OpenGl_Context.cxx +@@ -39,6 +39,7 @@ + #elif defined(__APPLE__) && !defined(MACOSX_USE_GLX) + #include <dlfcn.h> + #else ++ #define GLX_GLXEXT_LEGACY + #include <GL/glx.h> // glXGetProcAddress() + #endif + +diff --git a/src/OpenGl/OpenGl_Workspace_Raytrace.cxx b/src/OpenGl/OpenGl_Workspace_Raytrace.cxx +index f1b5afe..870eb7d 100755 +--- a/src/OpenGl/OpenGl_Workspace_Raytrace.cxx ++++ b/src/OpenGl/OpenGl_Workspace_Raytrace.cxx +@@ -32,6 +32,7 @@ + #elif defined(__APPLE__) && !defined(MACOSX_USE_GLX) + #include <OpenGL/CGLCurrent.h> + #else ++ #define GLX_GLXEXT_LEGACY + #include <GL/glx.h> + #endif + +diff --git a/src/Xw/Xw_Window.cxx b/src/Xw/Xw_Window.cxx +index 5442365..0e80444 100755 +--- a/src/Xw/Xw_Window.cxx ++++ b/src/Xw/Xw_Window.cxx +@@ -20,6 +20,7 @@ + #include <Aspect_Convert.hxx> + #include <Aspect_WindowDefinitionError.hxx> + ++#define GLX_GLXEXT_LEGACY + #include <GL/glx.h> + + namespace +-- +2.0.5 + diff --git a/sci-libs/opencascade/files/opencascade-6.8.0-fixed-DESTDIR.patch b/sci-libs/opencascade/files/opencascade-6.8.0-fixed-DESTDIR.patch new file mode 100644 index 000000000000..1f37eace7602 --- /dev/null +++ b/sci-libs/opencascade/files/opencascade-6.8.0-fixed-DESTDIR.patch @@ -0,0 +1,47 @@ +--- opencascade-6.8.0/Makefile.am ++++ opencascade-6.8.0/Makefile.am +@@ -82,27 +82,27 @@ + cd $(top_builddir)/adm/lin/amk && $(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 \ +- rm -f $(prefix)/inc/config.h; \ ++ if [ -e $(DESTDIR)$(prefix)/inc/config.h ]; then \ ++ rm -f $(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 +\ No newline at end of file ++.PHONY: FoundationClasses ModelingData ModelingAlgorithms Visualization ApplicationFramework DataExchange Draw |