Updated to compile with archlinux current

3 files changed, 53 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3a54fd9af03b..ea36b373690d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,9 @@
+# Generated by mksrcinfo v8
+# Fri Jun  3 17:16:03 UTC 2016
 pkgbase = salome-med
 	pkgdesc = Generic platform for Pre and Post-Processing for numerical simulation - MED Module
 	pkgver = 7.6.0
-	pkgrel = 2
+	pkgrel = 3
 	url = http://www.salome-platform.org
 	arch = i686
 	arch = x86_64
@@ -18,7 +20,7 @@ pkgbase = salome-med
 	source = scotch-bz2.diff
 	source = salome-med.profile
 	md5sums = b7887dda20d38ae64a33547b3d5a1d16
-	md5sums = 653ad82b33fada22a22a6c96474d5e02
+	md5sums = a261aca89bcad856b3e341d0b58d1398
 
 pkgname = salome-med
 
diff --git a/PKGBUILD b/PKGBUILD
index b5caa84ac310..0cc77ce006eb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=salome-med
 pkgver=7.6.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Generic platform for Pre and Post-Processing for numerical simulation - MED Module"
 url="http://www.salome-platform.org"
 depends=('scotch>=6.0.3' 'metis4' 'salome-gui>=7.6.0' 'salome-gui<7.7.0')
@@ -17,7 +17,7 @@ license=('LGPL')
 source=(scotch-bz2.diff salome-med.profile)
 
 _source=med
-_installdir=/opt/salome/med
+_installdir=/opt/salome
 _paraviewrootdir=/usr
 _paraviewver=4.2
 
@@ -45,26 +45,30 @@ prepare() {
 }
 
 build() {
-  source /etc/salome/profile.d/salome-kernel.sh
-  source /etc/salome/profile.d/salome-gui.sh
+  source /opt/salome/env.d/salome-kernel.sh
+  source /opt/salome/env.d/salome-gui.sh
 
   rm -rf "${srcdir}/${_source}/build"
   mkdir "${srcdir}/${_source}/build"
   cd "${srcdir}/${_source}/build"
 
+  #   -DSALOME_CMAKE_DEBUG=ON
+  #   -DSCOTCH_INCLUDE_DIRS=/usr/include/scotch \
+  #   -DSCOTCH_LIBRARIES=/usr/lib/libscotch.so \
+  #   -DSCOTCH_ERR_LIBRARIES=/usr/lib/libscotcherr.so \
+  #   -DBZ2_LIBRARIES=/usr/lib/libbz2.so \
+
   cmake .. \
      -DCMAKE_INSTALL_PREFIX=$_installdir \
+     -DCMAKE_CXX_STANDARD=98 \
      -DPYTHON_EXECUTABLE=/usr/bin/python2 \
-     -DSALOME_MED_PARTITIONER_METIS=BOOL:ON \
+     -DSALOME_MED_PARTITIONER_METIS=On \
      -DMETIS_INCLUDE_DIRS=/usr/include/metis-4 \
      -DMETIS_LIBRARIES=/usr/lib/libmetis-4.so \
-     -DSALOME_MED_PARTITIONER_SCOTCH=BOOL:ON \
+     -DSALOME_MED_PARTITIONER_PARMETIS=Off \
+     -DSALOME_MED_PARTITIONER_SCOTCH=On \
      -DSPHINX_APIDOC_EXECUTABLE=/usr/bin/sphinx-apidoc2 \
      -DSPHINX_EXECUTABLE=/usr/bin/sphinx-build2 \
-     -DSCOTCH_INCLUDE_DIRS=/usr/include/scotch \
-     -DSCOTCH_LIBRARIES=/usr/lib/libscotch.so \
-     -DSCOTCH_ERR_LIBRARIES=/usr/lib/libscotcherr.so \
-     -DBZ2_LIBRARIES=/usr/lib/libbz2.so \
      -DVTK_DIR="${_paraviewrootdir}/lib/cmake/paraview-${_paraviewver}" \
      -DLIBXML2_ROOT_DIR=/usr \
      -DLibXml2_DIR=/usr/lib/cmake/libxml2 \
@@ -78,10 +82,19 @@ package() {
   cd "${srcdir}/${_source}/build"
 
   make DESTDIR="$pkgdir/" install
-
+  
+  for _FILE in `find -L ${pkgdir}${_installdir} -iname *.py`
+  do
+    sed -i -e "s|${srcdir}||" ${_FILE}
+    sed -i -e "s|${pkgdir}||" ${_FILE}
+  done
+  
   install -D -m755 "${srcdir}/${pkgname}.profile" \
-                   "${pkgdir}/etc/salome/profile.d/${pkgname}.sh"
+                   "${pkgdir}${_installdir}/env.d/${pkgname}.sh"
 
+  rm -f "${pkgdir}${_installdir}/bin/salome/VERSION"
+  rm -f "${pkgdir}${_installdir}/bin/salome/test/CTestTestfile.cmake"
+  rm -f "${pkgdir}${_installdir}/adm_local/unix/config_files/check_GUI.m4"
 }
 md5sums=('b7887dda20d38ae64a33547b3d5a1d16'
-         '653ad82b33fada22a22a6c96474d5e02')
+         'a261aca89bcad856b3e341d0b58d1398')
diff --git a/salome-med.profile b/salome-med.profile
index ebf7063e20fd..2e4363dc5e68 100644
--- a/salome-med.profile
+++ b/salome-med.profile
@@ -1,15 +1,32 @@
-export MED_ROOT_DIR=/opt/salome/med
+# module var
+export MED_ROOT_DIR=/opt/salome
 
-_paraview_pythonpath="/usr/lib/paraview-4.2/site-packages/:/usr/lib/paraview-4.2/site-packages/vtk"
+# local vars
+_pythonver=2.7
+_paraviewver=4.2
+_med_path=$MED_ROOT_DIR/bin/salome
+_med_librarypath=$MED_ROOT_DIR/lib/salome
+_med_pythonpath=$MED_ROOT_DIR/lib/python${_pythonver}/site-packages/salome
+_paraview_pythonpath="/usr/lib/paraview-${_paraviewver}/site-packages/:/usr/lib/paraview-${_paraviewver}/site-packages/vtk"
+_paraview_librarypath="/usr/lib/paraview-${_paraviewver}"
+
+# PYTHONPATH
+if [[ $PYTHONPATH != *${_med_pythonpath}* ]]; then
+  export PYTHONPATH=${_med_pythonpath}:$PYTHONPATH
+fi
 if [[ $PYTHONPATH != *${_paraview_pythonpath}* ]]; then
   export PYTHONPATH=${_paraview_pythonpath}:$PYTHONPATH
 fi
-export PYTHONPATH=$MED_ROOT_DIR/lib/python2.7/site-packages/salome:$PYTHONPATH
 
-_paraview_librarypath="/usr/lib/paraview-4.2"
+# LD_LIBRARY_PATH
+if [[ $LD_LIBRARY_PATH != *${_med_librarypath}* ]]; then
+  export LD_LIBRARY_PATH=${_med_librarypath}:$LD_LIBRARY_PATH
+fi
 if [[ $LD_LIBRARY_PATH != *${_paraview_librarypath}* ]]; then
   export LD_LIBRARY_PATH=${_paraview_librarypath}:$LD_LIBRARY_PATH
 fi
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$MED_ROOT_DIR/lib/salome
 
-export PATH=$PATH:$MED_ROOT_DIR/bin/salome
\ No newline at end of file
+# PATH
+if [[ $PATH != *${_med_path}* ]]; then
+  export PATH=${_med_path}:$PATH
+fi