From 419beb19b94957320d9ebbbf66a40b96ec57ea49 Mon Sep 17 00:00:00 2001 From: inv Date: Mon, 9 Apr 2012 12:40:54 +0000 Subject: [PATCH] SALOME 6.5.0 preparation: sip 4.10.2 -> 4.13.2, PyQt 4.7.3 -> 4.9.1, QScintilla 2.4.3 -> 2.6.1 --- config_CentOS_5.5_64bit.xml | 6 +++--- config_Debian_4.0.xml | 6 +++--- config_Debian_4.0_64bit.xml | 6 +++--- config_Debian_5.0_64bit.xml | 6 +++--- config_Debian_6.0_64bit.xml | 6 +++--- config_Mandriva_2008.0.xml | 6 +++--- config_Mandriva_2008.0_64bit.xml | 6 +++--- config_Mandriva_2010.0.xml | 6 +++--- config_Mandriva_2010.0_64bit.xml | 6 +++--- config_Red_Hat_Enterprise_WS_4_64bit.xml | 6 +++--- config_Scientific_SL_5.1_64bit.xml | 6 +++--- config_files/PyQt.sh | 2 +- config_files/qscintilla.sh | 2 +- config_files/sip.sh | 2 +- 14 files changed, 36 insertions(+), 36 deletions(-) diff --git a/config_CentOS_5.5_64bit.xml b/config_CentOS_5.5_64bit.xml index 7d06613..470f1ca 100755 --- a/config_CentOS_5.5_64bit.xml +++ b/config_CentOS_5.5_64bit.xml @@ -396,7 +396,7 @@ type="prerequisite" description="C++ to Python bindings generation tool"> @@ -405,7 +405,7 @@ type="prerequisite" description="Python bindings for Qt library"> @@ -414,7 +414,7 @@ type="prerequisite" description="Auxiliary tool for source code editing and debugging"> diff --git a/config_Debian_4.0.xml b/config_Debian_4.0.xml index 02f5795..993af9e 100755 --- a/config_Debian_4.0.xml +++ b/config_Debian_4.0.xml @@ -396,7 +396,7 @@ type="prerequisite" description="C++ to Python bindings generation tool"> @@ -405,7 +405,7 @@ type="prerequisite" description="Python bindings for Qt library"> @@ -414,7 +414,7 @@ type="prerequisite" description="Auxiliary tool for source code editing and debugging"> diff --git a/config_Debian_4.0_64bit.xml b/config_Debian_4.0_64bit.xml index 5aa0a86..4ba52ef 100755 --- a/config_Debian_4.0_64bit.xml +++ b/config_Debian_4.0_64bit.xml @@ -396,7 +396,7 @@ type="prerequisite" description="C++ to Python bindings generation tool"> @@ -405,7 +405,7 @@ type="prerequisite" description="Python bindings for Qt library"> @@ -414,7 +414,7 @@ type="prerequisite" description="Auxiliary tool for source code editing and debugging"> diff --git a/config_Debian_5.0_64bit.xml b/config_Debian_5.0_64bit.xml index 87dbdb4..f7fdff0 100755 --- a/config_Debian_5.0_64bit.xml +++ b/config_Debian_5.0_64bit.xml @@ -396,7 +396,7 @@ type="prerequisite" description="C++ to Python bindings generation tool"> @@ -405,7 +405,7 @@ type="prerequisite" description="Python bindings for Qt library"> @@ -414,7 +414,7 @@ type="prerequisite" description="Auxiliary tool for source code editing and debugging"> diff --git a/config_Debian_6.0_64bit.xml b/config_Debian_6.0_64bit.xml index 42569cd..22bef65 100755 --- a/config_Debian_6.0_64bit.xml +++ b/config_Debian_6.0_64bit.xml @@ -396,7 +396,7 @@ type="prerequisite" description="C++ to Python bindings generation tool"> @@ -405,7 +405,7 @@ type="prerequisite" description="Python bindings for Qt library"> @@ -414,7 +414,7 @@ type="prerequisite" description="Auxiliary tool for source code editing and debugging"> diff --git a/config_Mandriva_2008.0.xml b/config_Mandriva_2008.0.xml index d01061f..0c65420 100755 --- a/config_Mandriva_2008.0.xml +++ b/config_Mandriva_2008.0.xml @@ -396,7 +396,7 @@ type="prerequisite" description="C++ to Python bindings generation tool"> @@ -405,7 +405,7 @@ type="prerequisite" description="Python bindings for Qt library"> @@ -414,7 +414,7 @@ type="prerequisite" description="Auxiliary tool for source code editing and debugging"> diff --git a/config_Mandriva_2008.0_64bit.xml b/config_Mandriva_2008.0_64bit.xml index a93aec2..ac0242d 100755 --- a/config_Mandriva_2008.0_64bit.xml +++ b/config_Mandriva_2008.0_64bit.xml @@ -396,7 +396,7 @@ type="prerequisite" description="C++ to Python bindings generation tool"> @@ -405,7 +405,7 @@ type="prerequisite" description="Python bindings for Qt library"> @@ -414,7 +414,7 @@ type="prerequisite" description="Auxiliary tool for source code editing and debugging"> diff --git a/config_Mandriva_2010.0.xml b/config_Mandriva_2010.0.xml index d17c84f..bd37110 100755 --- a/config_Mandriva_2010.0.xml +++ b/config_Mandriva_2010.0.xml @@ -396,7 +396,7 @@ type="prerequisite" description="C++ to Python bindings generation tool"> @@ -405,7 +405,7 @@ type="prerequisite" description="Python bindings for Qt library"> @@ -414,7 +414,7 @@ type="prerequisite" description="Auxiliary tool for source code editing and debugging"> diff --git a/config_Mandriva_2010.0_64bit.xml b/config_Mandriva_2010.0_64bit.xml index 91fd832..28a0ce4 100755 --- a/config_Mandriva_2010.0_64bit.xml +++ b/config_Mandriva_2010.0_64bit.xml @@ -396,7 +396,7 @@ type="prerequisite" description="C++ to Python bindings generation tool"> @@ -405,7 +405,7 @@ type="prerequisite" description="Python bindings for Qt library"> @@ -414,7 +414,7 @@ type="prerequisite" description="Auxiliary tool for source code editing and debugging"> diff --git a/config_Red_Hat_Enterprise_WS_4_64bit.xml b/config_Red_Hat_Enterprise_WS_4_64bit.xml index cc00021..670b095 100755 --- a/config_Red_Hat_Enterprise_WS_4_64bit.xml +++ b/config_Red_Hat_Enterprise_WS_4_64bit.xml @@ -396,7 +396,7 @@ type="prerequisite" description="C++ to Python bindings generation tool"> @@ -405,7 +405,7 @@ type="prerequisite" description="Python bindings for Qt library"> @@ -414,7 +414,7 @@ type="prerequisite" description="Auxiliary tool for source code editing and debugging"> diff --git a/config_Scientific_SL_5.1_64bit.xml b/config_Scientific_SL_5.1_64bit.xml index edebcbd..ee45dfc 100755 --- a/config_Scientific_SL_5.1_64bit.xml +++ b/config_Scientific_SL_5.1_64bit.xml @@ -396,7 +396,7 @@ type="prerequisite" description="C++ to Python bindings generation tool"> @@ -405,7 +405,7 @@ type="prerequisite" description="Python bindings for Qt library"> @@ -414,7 +414,7 @@ type="prerequisite" description="Auxiliary tool for source code editing and debugging"> diff --git a/config_files/PyQt.sh b/config_files/PyQt.sh index 3499af6..8954bf2 100755 --- a/config_files/PyQt.sh +++ b/config_files/PyQt.sh @@ -15,7 +15,7 @@ # # PyQt version # -PYQT_VERSION=4.7.3 +PYQT_VERSION=4.9.1 PYQT_XVERSION=`echo ${PYQT_VERSION} | awk -F. '{printf("%d",$1*10000+$2*100+$3)}'` check_version() diff --git a/config_files/qscintilla.sh b/config_files/qscintilla.sh index b118e5f..e4241d9 100755 --- a/config_files/qscintilla.sh +++ b/config_files/qscintilla.sh @@ -15,7 +15,7 @@ # # QSCINTILLA version # -QSCINTILLA_VERSION=2.4.3 +QSCINTILLA_VERSION=2.6.1 check_version(){ if [ -z "${QSCINTILLA_DIR}" ]; then diff --git a/config_files/sip.sh b/config_files/sip.sh index 1b8ba04..9e79651 100755 --- a/config_files/sip.sh +++ b/config_files/sip.sh @@ -15,7 +15,7 @@ # # sip version # -SIP_VERSION=4.10.2 +SIP_VERSION=4.13.2 SIP_XVERSION=`echo ${SIP_VERSION} | awk -F. '{printf("%d",$1*10000+$2*100+$3)}'` check_version() -- 2.39.2