Update some important files after binary installation

[tools/install.git] / config_files / PyQt.sh

diff --git a/config_files/PyQt.sh b/config_files/PyQt.sh
index 3499af69a017432e4e526b24abf8d6e56cc3c27e..0f52d4b61db9693bb5bb87c97a08c1c2178f78d0 100755 (executable)
--- a/config_files/PyQt.sh
+++ b/config_files/PyQt.sh
@@ -6,7 +6,7 @@
 #  Author    : Vadim SANDLER, Open CASCADE SAS (vadim.sandler@opencascade.com)
 #  Project   : SALOME
 #  Module    : Installation Wizard
-#  Copyright : 2002-2012 CEA
+#  Copyright : 2002-2013 CEA
 #
 #  This script is the part of the SALOME installation procedure.
 #
@@ -15,7 +15,7 @@
 #
 # PyQt version
 #
-PYQT_VERSION=4.7.3
+PYQT_VERSION=4.9.6
 PYQT_XVERSION=`echo ${PYQT_VERSION} | awk -F. '{printf("%d",$1*10000+$2*100+$3)}'`
 
 check_version()
@@ -40,6 +40,7 @@ print_env_bin()
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export PYQTDIR=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
+export PYQT_ROOT_DIR=\${PYQTDIR}
 export PYQT_SIPS=\${PYQTDIR}/sip
 export PATH=\${PYQTDIR}/bin:\$PATH
 export PYTHONPATH=\${PYQTDIR}:\${PYQTDIR}/PyQt4:\${PYTHONPATH}
@@ -74,12 +75,18 @@ source ${INSTALL_WORK}/$SHRC
 
 check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${INST_ROOT}
 
-# apply patch for phonon package
-apply_patch_for_phonon=1
-if [ "$apply_patch_for_phonon" == "1" ] ; then
+# apply patch for phonon includes
+local patch_phonon_includes=1
+if [ "$patch_phonon_includes" == "1" ] ; then
     ( cd ${PRODUCT_SRC_DIR}/sip/phonon && for f in `find . -name "*.sip"` ; do sed -i "s%^#include <%#include <phonon/%g" $f ; done )
 fi
 
+# apply patch for phonon module
+local patch_phonon_module=1
+if [ "${patch_phonon_module}" = "1" ] ; then
+    ( cd ${PRODUCT_SRC_DIR} && sed -i "s%new Phonon::VideoWidget()%(new Phonon::VideoWidget())->shapshot()%g" configure.py )
+fi
+
 # apply additional patch (if there's any)
 ( test -f patches/${PRODUCT}.patch && cp patches/${PRODUCT}.patch ${PRODUCT_SRC_DIR} && cd ${PRODUCT_SRC_DIR} && patch -p1 < ${PRODUCT}.patch )