From: vsr <vsr@opencascade.com>
Date: Tue, 16 Apr 2013 14:27:00 +0000 (+0000)
Subject: Minor changes
X-Git-Tag: V7_2_0rc1~20
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=b5a3a5b81b36ead3a6f4929d3677e92b1b0a4449;p=tools%2Finstall.git

Minor changes
---

diff --git a/config_files/PyQt.sh b/config_files/PyQt.sh
index 1561948..0f52d4b 100755
--- a/config_files/PyQt.sh
+++ b/config_files/PyQt.sh
@@ -84,8 +84,7 @@ fi
 # apply patch for phonon module
 local patch_phonon_module=1
 if [ "${patch_phonon_module}" = "1" ] ; then
-    echo -n ".. Patching PyQt sources: fix problem with improper phonon detection..." && \
-	sed -i "s%new Phonon::VideoWidget()%(new Phonon::VideoWidget())->shapshot()%g" ${PRODUCT_SRC_DIR}/configure.py >& /dev/null
+    ( 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)
diff --git a/config_files/qscintilla.sh b/config_files/qscintilla.sh
index bcf7cc6..163c9b1 100755
--- a/config_files/qscintilla.sh
+++ b/config_files/qscintilla.sh
@@ -15,7 +15,7 @@
 #
 # QSCINTILLA  version
 #
-QSCINTILLA_VERSION=2.7.0
+QSCINTILLA_VERSION=2.7
 
 check_version(){
 if [ -z "${QSCINTILLA_DIR}" ]; then
@@ -67,6 +67,20 @@ check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${INST_ROOT}
 # apply 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 )
 
+# patch build procedure
+local patch_build_procedure=1
+if [ "${patch_build_procedure}" = "1" ] ; then
+    # patch installation folder
+    cd ${PRODUCT_SRC_DIR}/Qt4Qt5
+    sed -e "s%\(target.path[[:space:]]*=[[:space:]]*\).*%\1${PRODUCT_DIR}/lib%g" \
+	-e "s%\(header.path[[:space:]]*=[[:space:]]*\).*%\1${PRODUCT_DIR}/include%g" \
+	-e "s%\(trans.path[[:space:]]*=[[:space:]]*\).*%\1${PRODUCT_DIR}/translations%g" \
+	-e "s%\(qsci.path[[:space:]]*=[[:space:]]*\).*%\1${PRODUCT_DIR}%g" \
+	qscintilla.pro > qscintilla.pro.new
+    mv -f qscintilla.pro.new qscintilla.pro
+fi
+
+
 # to generate environment scripts
 try_preinstalled
 }
@@ -87,17 +101,6 @@ unset INSTALL_ROOT
 
 cd ${PRODUCT_SRC_DIR}/Qt4Qt5
 
-local patch_build_procedure=1
-if [ "${patch_build_procedure}" = "1" ] ; then
-    # patch installation folder
-    sed -e "s%\(target.path[[:space:]]*=[[:space:]]*\).*%\1${PRODUCT_DIR}/lib%g" \
-	-e "s%\(header.path[[:space:]]*=[[:space:]]*\).*%\1${PRODUCT_DIR}/include%g" \
-	-e "s%\(trans.path[[:space:]]*=[[:space:]]*\).*%\1${PRODUCT_DIR}/translations%g" \
-	-e "s%\(qsci.path[[:space:]]*=[[:space:]]*\).*%\1${PRODUCT_DIR}%g" \
-	qscintilla.pro > qscintilla.pro.new
-    mv -f qscintilla.pro.new qscintilla.pro
-fi
-
 qmake -o Makefile qscintilla.pro
 check_job ${PRODUCT_DIR}/MAKE.LOG make 
 check_job ${PRODUCT_DIR}/MAKEINSTALL.LOG make install