Updated to version 7.8.0

3 files changed, 82 insertions, 50 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 49ac2be28390..821f791d7557 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Fri Jun  3 17:08:54 UTC 2016
+# Tue Nov 22 22:14:47 UTC 2016
 pkgbase = salome-gui
 	pkgdesc = Generic platform for Pre and Post-Processing for numerical simulation - GUI Module
-	pkgver = 7.6.0
-	pkgrel = 3
+	pkgver = 7.8.0
+	pkgrel = 1
 	url = http://www.salome-platform.org
 	arch = i686
 	arch = x86_64
@@ -14,18 +14,20 @@ pkgbase = salome-gui
 	makedepends = optipng
 	makedepends = python2-sphinx
 	makedepends = git
-	depends = salome-kernel>=7.6.0
-	depends = salome-kernel<7.7.0
+	depends = salome-kernel>=7.8.0
+	depends = salome-kernel<7.9.0
 	depends = qt4
 	depends = python2-pyqt4
 	depends = opencascade>=6.9.0
 	depends = qwt
-	depends = paraview-salome=4.2.0
+	depends = paraview-salome=5.0.1p1
 	depends = sip
 	source = salome-gui.profile
 	source = salome.desktop
-	md5sums = 0e0fe54828a8a191a8424355ac138946
+	source = http://files.salome-platform.org/Salome/Salome7.8.0/src7.8.0.tar.gz
+	md5sums = 73cd7110827ebb24ae6d2fac087fc4e0
 	md5sums = a102063b779e332914ef0b73843e928a
+	md5sums = 0f6de10ad9d9c646fce3ca21a7dab46a
 
 pkgname = salome-gui
 
diff --git a/PKGBUILD b/PKGBUILD
index 4e694192b782..746be37016b4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,40 +1,40 @@
 # Maintainer: Michele Mocciola <mickele>
 
 pkgname=salome-gui
-pkgver=7.6.0
-pkgrel=3
+pkgver=7.8.0
+pkgrel=1
 pkgdesc="Generic platform for Pre and Post-Processing for numerical simulation - GUI Module"
 url="http://www.salome-platform.org"
-depends=('salome-kernel>=7.6.0' 'salome-kernel<7.7.0' 'qt4' 'python2-pyqt4' 'opencascade>=6.9.0' 'qwt' 'paraview-salome=4.2.0' 'sip')
+depends=("salome-kernel>=${pkgver}" 'salome-kernel<7.9.0' 'qt4' 'python2-pyqt4' 'opencascade>=6.9.0' 'qwt' 'paraview-salome=5.0.1p1' 'sip')
 makedepends=('doxygen' 'swig2' 'boost' 'optipng' 'python2-sphinx' 'git')
 arch=('i686' 'x86_64')
 conflicts=()
 provides=()
 license=('LGPL')
-source=("${pkgname}.profile" "salome.desktop")
+source=("${pkgname}.profile" "salome.desktop" "http://files.salome-platform.org/Salome/Salome${pkgver}/src${pkgver}.tar.gz")
 
-_source=gui
+_source=GUI_SRC
+#_source=gui
 _basedir=/opt/salome
 _installdir=${_basedir}
 _profiledir=${_basedir}/env.d
 _paraviewrootdir=/usr
-_paraviewver=4.2
+_paraviewver=5.0
 
 prepare(){
-  msg "Connecting to git server..."
+#  msg "Connecting to git server..."
+#  if [[ -d ${_source} ]] ; then
+#    rm -rf ${_source}
+#  fi
+#  git clone git://git.salome-platform.org/modules/${_source}.git
+#  cd ${_source}
+#  git checkout V${pkgver:0:1}_${pkgver:2:1}_${pkgver:4:1}
+#  msg "GIT checkout done or server timeout"
 
-  if [[ -d ${_source} ]] ; then
-    rm -rf ${_source}
-  fi
-
-  git clone git://git.salome-platform.org/modules/${_source}.git
-  cd ${_source}
-  git checkout V${pkgver:0:1}_${pkgver:2:1}_${pkgver:4:1}
-
-  msg "GIT checkout done or server timeout"
+  cd "${srcdir}/${_source}"
 
   # error "/usr/lib/libQtNetwork.so.4: error adding symbols: DSO missing from command line"
-  sed -e "s|QtXml|QtXml QtNetwork|" -i CMakeLists.txt
+  #sed -e "s|QtXml|QtXml QtNetwork|" -i CMakeLists.txt
 
   # error "sip: Q_PID is undefined"
   sed -e 's|from PyQt4 import pyqtconfig;|from PyQt4 import QtCore;|' \
@@ -42,6 +42,10 @@ prepare(){
   sed -e "s|pyqtconfig.Configuration().pyqt_sip_flags|QtCore.PYQT_CONFIGURATION['sip_flags']|" \
       -i adm_local/cmake_files/FindPyQt4.cmake
 
+  # pyuic4 -> python2-pyuic4
+  sed -e 's|pyuic4|python2-pyuic4|' \
+      -i adm_local/cmake_files/FindPyQt4.cmake
+
   # DESTDIR
   sed -e 's|\\"\${CMAKE_INSTALL_PREFIX}/\\\${INSTALL_TS_DIR}\\"|\\"\\\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/\\\${INSTALL_TS_DIR}\\"|' -i adm_local/cmake_files/UseQt4Ext.cmake
 
@@ -54,39 +58,64 @@ prepare(){
   do
 	sed -e "s|python -c|python2 -c|" -i ${_FILE}
   done
-
-  # pyuic4 -> python2-pyuic4
-  sed -e 's|pyuic4|python2-pyuic4|' \
-      -i adm_local/cmake_files/FindPyQt4.cmake
 }
 
 build() {
   source "${_profiledir}/salome-kernel.sh"
+  
+  rm -rf "${srcdir}/${_source}/build"
+  mkdir -p "${srcdir}/${_source}/build"
+  cd "${srcdir}/${_source}/build"
 
-  cd "$srcdir/$_source"
-
-  #   -DCMAKE_BUILD_TYPE=Debug \
-
-  cmake . \
-     -DCMAKE_INSTALL_PREFIX=${_installdir} \
-     -DCMAKE_CXX_STANDARD=98 \
-     -DHDF5_ROOT_DIR=/opt/hdf5-1.8 \
-     -DPYTHON_EXECUTABLE=/usr/bin/python2 \
-     -DOPENGL_ROOT_DIR=/usr \
-     -DQWT_ROOT_DIR=/usr \
-     -DCAS_ROOT_DIR=/opt/opencascade \
-     -DSIP_ROOT_DIR=/usr \
-     -DVTK_DIR="${_paraviewrootdir}/lib/cmake/paraview-${_paraviewver}" \
-     -DPARAVIEW_ROOT_DIR="${_paraviewrootdir}" \
-     -DSWIG_EXECUTABLE=/usr/bin/swig-2 \
-     -DSPHINX_EXECUTABLE=/usr/bin/sphinx-build2 \
-     -DSPHINX_APIDOC_EXECUTABLE=/usr/bin/sphinx-apidoc2
+  local cmake_options=""
+
+  # generic options
+  cmake_options+=" -DCMAKE_BUILD_TYPE=Release"
+  cmake_options+=" -DCMAKE_INSTALL_PREFIX=${_installdir}"
+  cmake_options+=" -DCMAKE_CXX_STANDARD=98"
+
+  # debug options
+  cmake_options+=" -DCMAKE_VERBOSE_MAKEFILE:BOOL=OFF"
+  cmake_options+=" -DSALOME_CMAKE_DEBUG:BOOL=OFF"
+
+  # python2
+  cmake_options+=" -DPYTHON_EXECUTABLE=/usr/bin/python2"
+
+  # qwt
+  cmake_options+=" -DQWT_ROOT_DIR=/usr"
+
+  # opencascade
+  cmake_options+=" -DCAS_ROOT_DIR=/opt/opencascade"
+
+  # sip
+  cmake_options+=" -DSIP_ROOT_DIR=/usr"
+
+  # VTK
+  cmake_options+=" -DVTK_DIR=${_paraviewrootdir}/lib/cmake/paraview-${_paraviewver}"
+
+  # paraview
+  cmake_options+=" -DPARAVIEW_ROOT_DIR=${_paraviewrootdir}"
+
+  # swig
+  cmake_options+=" -DSWIG_EXECUTABLE=/usr/bin/swig-2"
+  
+  # sphinx-2
+  cmake_options+=" -DSPHINX_EXECUTABLE=/usr/bin/sphinx-build2"
+  cmake_options+=" -DSPHINX_APIDOC_EXECUTABLE=/usr/bin/sphinx-apidoc2"
+
+  # hdf5-1.8
+  cmake_options+=" -DHDF5_INCLUDE_DIRS:PATH=/usr/include/hdf5_18/"
+  cmake_options+=" -DHDF5_C_COMPILER_EXECUTABLE:FILEPATH=/usr/bin/h5cc_18"
+  cmake_options+=" -DHDF5_C_LIBRARY_hdf5:FILEPATH=/usr/lib/hdf5_18/libhdf5.so"
+  cmake_options+=" -DHDF5_DIFF_EXECUTABLE:FILEPATH=/usr/bin/h5diff_18"
+  
+  cmake ${cmake_options} ..
 
   make
 }
 
 package() {
-  cd "${srcdir}/${_source}"
+  cd "${srcdir}/${_source}/build"
 
   make DESTDIR="$pkgdir" install
 
@@ -115,5 +144,6 @@ package() {
   ln -s ${_installdir}/share/salome/resources/gui/SalomeApp.xml ${pkgdir}${_installdir}
   ln -s ${_installdir}/share/salome/resources/gui/LightApp.xml ${pkgdir}${_installdir}
 }
-md5sums=('0e0fe54828a8a191a8424355ac138946'
-         'a102063b779e332914ef0b73843e928a')
+md5sums=('73cd7110827ebb24ae6d2fac087fc4e0'
+         'a102063b779e332914ef0b73843e928a'
+         '0f6de10ad9d9c646fce3ca21a7dab46a')
diff --git a/salome-gui.profile b/salome-gui.profile
index 13912e6981e7..0f2694798010 100644
--- a/salome-gui.profile
+++ b/salome-gui.profile
@@ -3,7 +3,7 @@ export GUI_ROOT_DIR=/opt/salome
 
 # local vars
 _pythonver=2.7
-_paraviewver=4.2
+_paraviewver=5.0
 _gui_path=$GUI_ROOT_DIR/bin/salome
 _gui_librarypath=$GUI_ROOT_DIR/lib/salome
 _gui_pythonpath=$GUI_ROOT_DIR/lib/python${_pythonver}/site-packages/salome