diff options
Diffstat (limited to 'cad/salome-kernel/files')
12 files changed, 199 insertions, 0 deletions
diff --git a/cad/salome-kernel/files/patch-KERNEL-Container_i.cxx b/cad/salome-kernel/files/patch-KERNEL-Container_i.cxx new file mode 100644 index 000000000000..293ae17d6cdb --- /dev/null +++ b/cad/salome-kernel/files/patch-KERNEL-Container_i.cxx @@ -0,0 +1,10 @@ +--- src/Container/Container_i.cxx.orig 2009-03-18 20:52:29.000000000 +0600 ++++ src/Container/Container_i.cxx 2009-05-20 10:21:06.000000000 +0700 +@@ -29,6 +29,7 @@ + #include <string.h> + #include <stdio.h> + #include <time.h> ++#include <sys/wait.h> + #ifndef WIN32 + #include <sys/time.h> + #include <dlfcn.h> diff --git a/cad/salome-kernel/files/patch-KERNEL-MPIObject_i.hxx b/cad/salome-kernel/files/patch-KERNEL-MPIObject_i.hxx new file mode 100644 index 000000000000..3c7124b245ab --- /dev/null +++ b/cad/salome-kernel/files/patch-KERNEL-MPIObject_i.hxx @@ -0,0 +1,10 @@ +--- src/MPIContainer/MPIObject_i.hxx.orig 2009-10-16 15:06:13.000000000 +0700 ++++ src/MPIContainer/MPIObject_i.hxx 2009-10-16 15:06:22.000000000 +0700 +@@ -26,6 +26,7 @@ + #ifndef _SALOME_POBJECT_I_H_ + #define _SALOME_POBJECT_I_H_ + ++#include <map> + #include <mpi.h> + #include <string> + #include <SALOMEconfig.h> diff --git a/cad/salome-kernel/files/patch-KERNEL-Makefile.am b/cad/salome-kernel/files/patch-KERNEL-Makefile.am new file mode 100644 index 000000000000..4506ed6c125a --- /dev/null +++ b/cad/salome-kernel/files/patch-KERNEL-Makefile.am @@ -0,0 +1,21 @@ +--- bin/Makefile.am.orig 2009-12-01 20:58:39.000000000 +0600 ++++ bin/Makefile.am 2010-01-06 20:57:08.000000000 +0600 +@@ -37,8 +37,7 @@ + config_appli.xml \ + salome.launch + +-nodist_salomescript_DATA = \ +- VERSION ++nodist_salomescript_DATA = + + # These files are executable scripts + dist_salomescript_SCRIPTS = \ +@@ -90,7 +89,7 @@ + $(INSTALL) -d $(DESTDIR)$(salomescriptdir) + $(RM) -rf $(DESTDIR)$(salomescriptdir)/appliskel 1> /dev/null 2>&1 + cp -r $(srcdir)/appliskel $(DESTDIR)$(salomescriptdir) +- chmod a+x -R $(DESTDIR)$(salomescriptdir)/appliskel ++ chmod -R a+x $(DESTDIR)$(salomescriptdir)/appliskel + find $(DESTDIR)$(salomescriptdir) -name CVS -prune -exec rm -rf {} \; + + uninstall-local: diff --git a/cad/salome-kernel/files/patch-KERNEL-Receivers.cxx b/cad/salome-kernel/files/patch-KERNEL-Receivers.cxx new file mode 100644 index 000000000000..6c0ba133dcf8 --- /dev/null +++ b/cad/salome-kernel/files/patch-KERNEL-Receivers.cxx @@ -0,0 +1,10 @@ +--- src/Communication/Receivers.cxx.orig 2009-03-18 20:52:29.000000000 +0600 ++++ src/Communication/Receivers.cxx 2009-05-20 10:21:06.000000000 +0700 +@@ -235,6 +235,7 @@ + #include <arpa/inet.h> + #include <netdb.h> + #include <unistd.h> ++#include <rpc/types.h> + #include <rpc/xdr.h> + + template<class T,int (*myFunc)(XDR*,T*),class CorbaSender,class servForT,class ptrForT> diff --git a/cad/salome-kernel/files/patch-KERNEL-SALOMEDSImpl_StudyBuilder.cxx b/cad/salome-kernel/files/patch-KERNEL-SALOMEDSImpl_StudyBuilder.cxx new file mode 100644 index 000000000000..16482f18d8d4 --- /dev/null +++ b/cad/salome-kernel/files/patch-KERNEL-SALOMEDSImpl_StudyBuilder.cxx @@ -0,0 +1,10 @@ +--- src/SALOMEDSImpl/SALOMEDSImpl_StudyBuilder.cxx.orig 2009-07-20 15:08:45.000000000 +0700 ++++ src/SALOMEDSImpl/SALOMEDSImpl_StudyBuilder.cxx 2009-07-20 15:10:26.000000000 +0700 +@@ -35,6 +35,7 @@ + #include "DF_Label.hxx" + + #include <HDFOI.hxx> ++#include <cstring> + #include <stdlib.h> + + using namespace std; diff --git a/cad/salome-kernel/files/patch-KERNEL-SALOME_Comm_i.cxx b/cad/salome-kernel/files/patch-KERNEL-SALOME_Comm_i.cxx new file mode 100644 index 000000000000..db6214fdb5d7 --- /dev/null +++ b/cad/salome-kernel/files/patch-KERNEL-SALOME_Comm_i.cxx @@ -0,0 +1,24 @@ +--- src/Communication/SALOME_Comm_i.cxx.orig 2009-03-18 20:52:29.000000000 +0600 ++++ src/Communication/SALOME_Comm_i.cxx 2009-05-20 10:21:06.000000000 +0700 +@@ -19,10 +19,12 @@ + // + // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com + // +-#include "SALOME_Comm_i.hxx" + #ifndef WIN32 ++#include <rpc/types.h> + #include <rpc/xdr.h> + #endif ++ ++#include "SALOME_Comm_i.hxx" + #include "omniORB4/poa.h" + #include "omnithread.h" + #include "Utils_SINGLETON.hxx" +@@ -32,6 +34,7 @@ + #include "SenderFactory.hxx" + using namespace std; + ++ + #ifndef WIN32 + CORBA::ORB_var &getGlobalORB(){ + ORB_INIT &init = *SINGLETON_<ORB_INIT>::Instance(); diff --git a/cad/salome-kernel/files/patch-KERNEL-SALOME_LifeCycleCORBA.hxx b/cad/salome-kernel/files/patch-KERNEL-SALOME_LifeCycleCORBA.hxx new file mode 100644 index 000000000000..99794aa48ae5 --- /dev/null +++ b/cad/salome-kernel/files/patch-KERNEL-SALOME_LifeCycleCORBA.hxx @@ -0,0 +1,11 @@ +--- src/LifeCycleCORBA/SALOME_LifeCycleCORBA.hxx.orig 2009-03-18 20:52:29.000000000 +0600 ++++ src/LifeCycleCORBA/SALOME_LifeCycleCORBA.hxx 2009-05-20 10:21:06.000000000 +0700 +@@ -33,6 +33,8 @@ + #include <unistd.h> + #endif + #include <string> ++#include <string.h> ++#include <stdio.h> + + #include <SALOMEconfig.h> + #include <Utils_SALOME_Exception.hxx> diff --git a/cad/salome-kernel/files/patch-KERNEL-TestContainerManager.cxx b/cad/salome-kernel/files/patch-KERNEL-TestContainerManager.cxx new file mode 100644 index 000000000000..6c25968640b3 --- /dev/null +++ b/cad/salome-kernel/files/patch-KERNEL-TestContainerManager.cxx @@ -0,0 +1,10 @@ +--- src/LifeCycleCORBA/TestContainerManager.cxx.orig 2009-05-28 22:07:55.000000000 +0700 ++++ src/LifeCycleCORBA/TestContainerManager.cxx 2009-07-10 12:47:50.000000000 +0700 +@@ -29,6 +29,7 @@ + #include <iostream> + #ifndef WNT + #include <unistd.h> ++#include <libgen.h> + #endif + #include <SALOMEconfig.h> + #include "SALOME_NamingService.hxx" diff --git a/cad/salome-kernel/files/patch-KERNEL-ac_cxx_depend.flag.m4 b/cad/salome-kernel/files/patch-KERNEL-ac_cxx_depend.flag.m4 new file mode 100644 index 000000000000..c71a0ce934b2 --- /dev/null +++ b/cad/salome-kernel/files/patch-KERNEL-ac_cxx_depend.flag.m4 @@ -0,0 +1,12 @@ +--- salome_adm/unix/config_files/ac_cxx_depend_flag.m4.orig 2009-03-18 20:52:30.000000000 +0600 ++++ salome_adm/unix/config_files/ac_cxx_depend_flag.m4 2009-06-01 14:27:51.000000000 +0700 +@@ -108,6 +108,9 @@ + uxpv*) + MACHINE=VPP5000 + ;; ++ freebsd*) ++ MACHINE=FreeBSD ++ ;; + *) + MACHINE= + host_os_novers=$host_os diff --git a/cad/salome-kernel/files/patch-KERNEL-configure.ac b/cad/salome-kernel/files/patch-KERNEL-configure.ac new file mode 100644 index 000000000000..ed019cfc59b3 --- /dev/null +++ b/cad/salome-kernel/files/patch-KERNEL-configure.ac @@ -0,0 +1,29 @@ +--- configure.ac.orig 2009-07-20 14:30:59.000000000 +0700 ++++ configure.ac 2009-07-20 14:33:42.000000000 +0700 +@@ -52,7 +52,7 @@ + # argument. Exemple: + # $ filename="../KERNEL_SRC/configure + # $ absfilename=`absolute_path $filename` +-function absolute_path { ++absolute_path () { + filename=$1 + here=`pwd` + apath=`dirname $filename` +@@ -410,7 +410,7 @@ + echo + + # This function displays the values of each variable given in arguments +-function summary { ++summary () { + variables=$* + for var in $variables + do +@@ -424,7 +424,7 @@ + + # -------------------------------------- + +-function check_fatal_error { ++check_fatal_error () { + variables=$* + for var in $variables + do diff --git a/cad/salome-kernel/files/patch-KERNEL-fortoc.h b/cad/salome-kernel/files/patch-KERNEL-fortoc.h new file mode 100644 index 000000000000..e96de3c9aab8 --- /dev/null +++ b/cad/salome-kernel/files/patch-KERNEL-fortoc.h @@ -0,0 +1,20 @@ +--- src/DSC/DSC_User/Datastream/Calcium/fortoc.h.orig 2009-05-20 10:42:12.000000000 +0700 ++++ src/DSC/DSC_User/Datastream/Calcium/fortoc.h 2009-05-20 10:12:48.000000000 +0700 +@@ -36,5 +36,17 @@ + + #endif + ++#ifdef __freebsd__ ++#define F_FUNC(lname,uname) _(lname,_) /* Fortran function name */ ++#define F_CALL(lname,uname) _(lname,_) /* Fortran function call */ ++#define STR_PSTR(str) char *str /* fortran string arg pointer */ ++#define STR_PLEN(str) , int _(Len,str) /* fortran string arg length */ ++#define STR_PTR(str) str /* fortran string pointer */ ++#define STR_LEN(str) _(Len,str) /* fortran string length */ ++ ++ ++#endif ++ ++ + #endif + diff --git a/cad/salome-kernel/files/patch-KERNEL-salome_adm_check_cas.m4 b/cad/salome-kernel/files/patch-KERNEL-salome_adm_check_cas.m4 new file mode 100644 index 000000000000..00f2953b8801 --- /dev/null +++ b/cad/salome-kernel/files/patch-KERNEL-salome_adm_check_cas.m4 @@ -0,0 +1,32 @@ +--- salome_adm/unix/config_files/check_cas.m4.orig 2009-10-31 20:35:10.000000000 +0600 ++++ salome_adm/unix/config_files/check_cas.m4 2009-10-31 20:37:39.000000000 +0600 +@@ -54,7 +54,7 @@ + casdir=Linux + ;; + freebsd*) +- casdir=Linux ++ casdir=FreeBSD + ;; + irix5.*) + casdir=Linux +@@ -153,6 +153,20 @@ + esac + CAS_CPPFLAGS="$CAS_CPPFLAGS -I$CASROOT/inc" + ;; ++ freebsd*) ++ CAS_CPPFLAGS="-DOCC_VERSION_MAJOR=$OCC_VERSION_MAJOR -DOCC_VERSION_MINOR=$OCC_VERSION_MINOR -DOCC_VERSION_MAINTENANCE=$OCC_VERSION_MAINTENANCE -DCSFDB -DNo_exception -DHAVE_CONFIG_H -DHAVE_LIMITS_H -DHAVE_WOK_CONFIG_H -I$CASROOT/inc" ++ ++ OCC_VERSION_STRING="$OCC_VERSION_MAJOR.$OCC_VERSION_MINOR.$OCC_VERSION_MAINTENANCE" ++ case $OCC_VERSION_STRING in ++ [[0-5]].* | 6.0.* | 6.1.0) # catch versions < 6.1.1 ++ CAS_CPPFLAGS="$CAS_CPPFLAGS -DNO_CXX_EXCEPTION" ++ ;; ++ *) ++ CAS_CPPFLAGS="$CAS_CPPFLAGS -DOCC_CONVERT_SIGNALS" ++ ;; ++ esac ++ CAS_CPPFLAGS="$CAS_CPPFLAGS -I$CASROOT/inc" ++ ;; + osf*) + CAS_CPPFLAGS="-DOCC_VERSION_MAJOR=$OCC_VERSION_MAJOR -DOCC_VERSION_MINOR=$OCC_VERSION_MINOR -DOCC_VERSION_MAINTENANCE=$OCC_VERSION_MAINTENANCE -DLIN -DLINTEL -DCSFDB -DNo_exception -DHAVE_CONFIG_H -DHAVE_LIMITS_H -DHAVE_WOK_CONFIG_H -I$CASROOT/inc" + ;; |