From 0f031697a0d065da56dc601feac4998ab2d0fd9a Mon Sep 17 00:00:00 2001 From: maintenance team Date: Tue, 21 Apr 2009 11:26:39 +0000 Subject: [PATCH] Update version of products --- config_files/{PyQt-4.4.3.sh => PyQt-4.4.4.sh} | 4 ++-- config_files/{qscintilla-2.3.sh => qscintilla-2.3.2.sh} | 6 +++--- config_files/{qt-4.4.3.sh => qt-4.4.5.sh} | 8 ++++++-- config_files/{qwt-5.1.1.sh => qwt-5.2.0.sh} | 6 +++--- config_files/{sip-4.7.7.sh => sip-4.7.9.sh} | 4 ++-- 5 files changed, 16 insertions(+), 12 deletions(-) rename config_files/{PyQt-4.4.3.sh => PyQt-4.4.4.sh} (98%) rename config_files/{qscintilla-2.3.sh => qscintilla-2.3.2.sh} (97%) rename config_files/{qt-4.4.3.sh => qt-4.4.5.sh} (93%) rename config_files/{qwt-5.1.1.sh => qwt-5.2.0.sh} (97%) rename config_files/{sip-4.7.7.sh => sip-4.7.9.sh} (99%) diff --git a/config_files/PyQt-4.4.3.sh b/config_files/PyQt-4.4.4.sh similarity index 98% rename from config_files/PyQt-4.4.3.sh rename to config_files/PyQt-4.4.4.sh index 6ab5b23..fc9c92e 100755 --- a/config_files/PyQt-4.4.3.sh +++ b/config_files/PyQt-4.4.4.sh @@ -1,7 +1,7 @@ #!/bin/bash -noprofile #################################################################################### -# File : PyQt-4.4.3.sh +# File : PyQt-4.4.4.sh # Created : Thu Dec 18 12:01:00 2002 # Author : Vadim SANDLER, Open CASCADE SAS (vadim.sandler@opencascade.com) # Project : SALOME @@ -154,7 +154,7 @@ export INSTALL_PRODUCTS=$7; shift REMOVE_SRC_TMP=$8; test $# == 10 && shift && SINGLE_DIR=$9 -export PRODUCT="PyQt-4.4.3" +export PRODUCT="PyQt-4.4.4" export PRODUCT_DIR=${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}} export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT} export PRODUCT_SRC_DIR=${INST_ROOT}/${PRODUCT}_SRC diff --git a/config_files/qscintilla-2.3.sh b/config_files/qscintilla-2.3.2.sh similarity index 97% rename from config_files/qscintilla-2.3.sh rename to config_files/qscintilla-2.3.2.sh index 1e3ce30..4d21391 100755 --- a/config_files/qscintilla-2.3.sh +++ b/config_files/qscintilla-2.3.2.sh @@ -1,7 +1,7 @@ #!/bin/bash -noprofile #################################################################################### -# File : qscintilla-2.3.sh +# File : qscintilla-2.3.2.sh # Created : Thu Oct 23 11:50:00 2008 # Author : Vadim SANDLER, Open CASCADE SAS (vadim.sandler@opencascade.com) # Project : SALOME @@ -17,7 +17,7 @@ if [ -z "${QSCINTILLA_DIR}" ]; then return 1 fi ver=`grep "QSCINTILLA_VERSION_STR" ${QSCINTILLA_DIR}/include/Qsci/qsciglobal.h | sed -e 's%^#define QSCINTILLA_VERSION_STR\([[:space:]]*\)%%g' -e 's%\"%%g'` -if [ "$ver" == "2.3" ] ; then +if [ "$ver" == "2.3.2" ] ; then return 0 fi return 1 @@ -132,7 +132,7 @@ export INSTALL_PRODUCTS=$7; shift REMOVE_SRC_TMP=$8; test $# == 10 && shift && SINGLE_DIR=$9 -export PRODUCT="QScintilla-2.3" +export PRODUCT="QScintilla-2.3.2" export PRODUCT_DIR=${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}} export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT} export PRODUCT_SRC_DIR=${INST_ROOT}/${PRODUCT}_SRC diff --git a/config_files/qt-4.4.3.sh b/config_files/qt-4.4.5.sh similarity index 93% rename from config_files/qt-4.4.3.sh rename to config_files/qt-4.4.5.sh index b1ce675..9cdce26 100755 --- a/config_files/qt-4.4.3.sh +++ b/config_files/qt-4.4.5.sh @@ -1,7 +1,7 @@ #!/bin/bash -noprofile #################################################################################### -# File : qt-4.4.3.sh +# File : qt-4.5.0.sh # Created : Thu Dec 18 12:01:00 2002 # Author : Vadim SANDLER, Open CASCADE SAS (vadim.sandler@opencascade.com) # Project : SALOME @@ -12,7 +12,7 @@ # #################################################################################### -QT_REF_VERSION="4.4.3" +QT_REF_VERSION="4.5.0" check_version(){ if [ -z "$QTDIR" ]; then @@ -77,6 +77,10 @@ test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR} cd ${PRODUCT_SRC_DIR} +sed -e "s%\(QLinearGradient gradient(QPoint(\)\(width()/2, 0), QPoint(width()/2, height()));\)%\1this->\2%g" \ + examples/xmlpatterns/trafficinfo/mainwindow.cpp > examples/xmlpatterns/trafficinfo/mainwindow.cpp.1 + mv -f examples/xmlpatterns/trafficinfo/mainwindow.cpp.1 examples/xmlpatterns/trafficinfo/mainwindow.cpp + # configure check_job ${PRODUCT_DIR}/CONFIGURE.LOG ./configure -prefix ${PRODUCT_DIR} -no-separate-debug-info -confirm-license diff --git a/config_files/qwt-5.1.1.sh b/config_files/qwt-5.2.0.sh similarity index 97% rename from config_files/qwt-5.1.1.sh rename to config_files/qwt-5.2.0.sh index a5e83fd..13c07ab 100755 --- a/config_files/qwt-5.1.1.sh +++ b/config_files/qwt-5.2.0.sh @@ -1,7 +1,7 @@ #!/bin/bash -noprofile #################################################################################### -# File : qwt-5.1.1.sh +# File : qwt-5.2.0.sh # Created : Thu Dec 18 12:01:00 2002 # Author : Vadim SANDLER, Open CASCADE SAS (vadim.sandler@opencascade.com) # Project : SALOME @@ -21,7 +21,7 @@ if [ -n "${QWTHOME}" ] ; then fi if [ -f $qwtinc ] ; then ver=`grep -e "^#define[[:space:]]\+QWT_VERSION_STR" $qwtinc | sed -e 's/^#define[[:space:]]\+QWT_VERSION_STR[[:space:]]*"\(.*\)"/\1/'` - if [ "$ver" == "5.1.1" ]; then + if [ "$ver" == "5.2.0" ]; then return 0 fi fi @@ -139,7 +139,7 @@ export INSTALL_PRODUCTS=$7; shift REMOVE_SRC_TMP=$8; test $# == 10 && shift && SINGLE_DIR=$9 -export PRODUCT="qwt-5.1.1" +export PRODUCT="qwt-5.2.0" export PRODUCT_DIR=${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}} export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT} export PRODUCT_SRC_DIR=${INST_ROOT}/${PRODUCT}_SRC diff --git a/config_files/sip-4.7.7.sh b/config_files/sip-4.7.9.sh similarity index 99% rename from config_files/sip-4.7.7.sh rename to config_files/sip-4.7.9.sh index 5625aad..61d978c 100755 --- a/config_files/sip-4.7.7.sh +++ b/config_files/sip-4.7.9.sh @@ -1,7 +1,7 @@ #!/bin/bash -noprofile #################################################################################### -# File : sip-4.7.7.sh +# File : sip-4.7.9.sh # Created : Thu Dec 18 12:01:00 2002 # Author : Vadim SANDLER, Open CASCADE SAS (vadim.sandler@opencascade.com) # Project : SALOME @@ -160,7 +160,7 @@ export INSTALL_PRODUCTS=$7; shift REMOVE_SRC_TMP=$8; test $# == 10 && shift && SINGLE_DIR=$9 -export PRODUCT="sip-4.7.7" +export PRODUCT="sip-4.7.9" export PRODUCT_DIR=${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}} export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT} export PRODUCT_SRC_DIR=${INST_ROOT}/${PRODUCT}_SRC -- 2.39.2