aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'sci-misc/salome-med/files')
-rw-r--r--sci-misc/salome-med/files/salome-med-3.2.6.patch28
-rw-r--r--sci-misc/salome-med/files/salome-med-3.2.6_environ.patch27
-rw-r--r--sci-misc/salome-med/files/salome-med-3.2.6_gcc4.patch26
3 files changed, 81 insertions, 0 deletions
diff --git a/sci-misc/salome-med/files/salome-med-3.2.6.patch b/sci-misc/salome-med/files/salome-med-3.2.6.patch
new file mode 100644
index 000000000..7ffd0ac23
--- /dev/null
+++ b/sci-misc/salome-med/files/salome-med-3.2.6.patch
@@ -0,0 +1,28 @@
+--- ./MED_SRC_3.2.6/adm_local/Makefile.in.org 2007-04-24 18:40:51.000000000 +0200
++++ ./MED_SRC_3.2.6/adm_local/Makefile.in 2008-01-04 15:51:44.000000000 +0100
+@@ -26,12 +26,12 @@
+ all: resources
+
+ install:
+- cp -rf @top_srcdir@/adm_local @prefix@
++# cp -rf @top_srcdir@/adm_local @prefix@
+
+ bin:
+
+ resources :
+- cp -rf @top_srcdir@/adm_local $(top_builddir)
++# cp -rf @top_srcdir@/adm_local $(top_builddir)
+
+ inc:
+
+--- ./MED_SRC_3.2.6/build_configure.org 2007-04-24 18:40:51.000000000 +0200
++++ ./MED_SRC_3.2.6/build_configure 2008-01-04 15:14:30.000000000 +0100
+@@ -174,7 +174,7 @@
+ # make a link allowing AC_OUTPUT to find the salome_adm/.../*.in files
+ echo "" >> configure.in_tmp1
+ echo 'if test ${MED_WITH_KERNEL} = yes; then' >> configure.in_tmp1
+-echo ' ln -fs ${KERNEL_ROOT_DIR}/salome_adm ${ROOT_SRCDIR}/.' >> configure.in_tmp1
++echo ' cp -prf ${KERNEL_ROOT_DIR}/salome_adm ${ROOT_SRCDIR}/.' >> configure.in_tmp1
+ echo 'else' >> configure.in_tmp1
+ echo ' ln -fsn ${ROOT_SRCDIR}/adm_local_without_kernel ${ROOT_SRCDIR}/salome_adm' >> configure.in_tmp1
+ echo 'fi' >> configure.in_tmp1
diff --git a/sci-misc/salome-med/files/salome-med-3.2.6_environ.patch b/sci-misc/salome-med/files/salome-med-3.2.6_environ.patch
new file mode 100644
index 000000000..8af83ea5a
--- /dev/null
+++ b/sci-misc/salome-med/files/salome-med-3.2.6_environ.patch
@@ -0,0 +1,27 @@
+--- src/MedClient/test/environ/Makefile.in_orig 2008-01-04 17:11:06.000000000 +0100
++++ src/MedClient/test/environ/Makefile.in 2008-01-04 17:12:08.000000000 +0100
+@@ -29,6 +29,7 @@
+ top_builddir=../../../..
+ srcdir=@srcdir@
+ VPATH=.:@srcdir@
++prefix=@prefix@
+
+ BIN= runEnvironTests
+
+@@ -53,11 +54,11 @@
+ chmod +x csh/*
+
+ install:
+- mkdir -p @prefix@/Tests/environ
+- cp -rf ${BIN} csh @prefix@/Tests/environ
+- cd @prefix@/Tests/environ ; chmod u+x ${BIN}
+- cp -f ${top_builddir}/bin/runTestMedCorba @prefix@/bin
+- chmod +x @prefix@/bin/runTestMedCorba
++ mkdir -p ${prefix}/Tests/environ
++ cp -rf ${BIN} csh ${prefix}/Tests/environ
++ cd ${prefix}/Tests/environ ; chmod u+x ${BIN}
++ cp -f ${top_builddir}/bin/runTestMedCorba ${prefix}/bin
++ chmod +x ${prefix}/bin/runTestMedCorba
+
+ ./%: @srcdir@/%.in
+ cd $(top_builddir) ; \
diff --git a/sci-misc/salome-med/files/salome-med-3.2.6_gcc4.patch b/sci-misc/salome-med/files/salome-med-3.2.6_gcc4.patch
new file mode 100644
index 000000000..7ec5dac34
--- /dev/null
+++ b/sci-misc/salome-med/files/salome-med-3.2.6_gcc4.patch
@@ -0,0 +1,26 @@
+--- src3.2.6/MED_SRC_3.2.6/src/MEDMEM/MEDMEM_MEDMEMchampLire.cxx 2007-11-26 23:27:29.000000000 +0100
++++ src3.2.6/MED_SRC_3.2.6/src/MEDMEM/MEDMEM_MEDMEMchampLire.cxx 2007-11-26 23:28:23.000000000 +0100
+@@ -222,7 +222,7 @@
+ case MED_FLOAT64 :
+ if ( _MEDdatasetNumLire(datagroup3,MED_NOM_CO,MED_FLOAT64,
+ interlace,ncomp,numco,
+- psize,pflmod,pfltab,ngauss,val)< 0)
++ psize,pflmod,(med_size*)pfltab,ngauss,val)< 0)
+ goto ERROR;
+ break;
+
+@@ -230,12 +230,12 @@
+ #if defined(F77INT64)
+ if ( _MEDdatasetNumLire(datagroup3,MED_NOM_CO,MED_INT64,
+ interlace,ncomp,numco,
+- psize,pflmod,pfltab,ngauss,val)< 0)
++ psize,pflmod,(med_size*)pfltab,ngauss,val)< 0)
+ goto ERROR;
+ #else
+ if ( _MEDdatasetNumLire(datagroup3,MED_NOM_CO,MED_INT32,
+ interlace,ncomp,numco,
+- psize,pflmod,pfltab,ngauss,val)< 0)
++ psize,pflmod,(med_size*)pfltab,ngauss,val)< 0)
+ goto ERROR;
+ #endif
+ break;