diff --git a/package/x11/qt/qt.conf b/package/x11/qt/qt.conf index 89b08f3dd..8b8768313 100644 --- a/package/x11/qt/qt.conf +++ b/package/x11/qt/qt.conf @@ -64,8 +64,12 @@ qt_pass() { -I$pkg_postgresql_prefix/include -L$pkg_postgresql_prefix/lib" fi - # an optimization crashes g++ during the Makefile generator build :-( - echo "yes" | ( CXX_WRAPPER_BYPASS=1 ; ./configure $confopt ) + if [ $xpkg == qt3 ] ; then + # an optimization crashes g++ during the Makefile generator build :-( + echo "yes" | ( CXX_WRAPPER_BYPASS=1 ; ./configure $confopt ) + elif [ $xpkg == qt4 ] ; then + echo -e 'o\nyes' | ./configure $confopt + fi eval $MAKE ; eval $MAKE install @@ -93,7 +97,7 @@ qt_pass() { QT${xpkg:2:1}DIR=/$prefix export QT${xpkg:2:1}DIR EOT - # until kde 4 which will be based on qt4 the standard is qt3 here + # until kde4 which will be based on qt4 the standard is qt3 here if [ $xpkg == "$ROCKCFG_PKG_QT_DEFAULT" ]; then cat >> $root/etc/profile.d/$xpkg <<-EOT QTDIR=\$QT${xpkg:2:1}DIR diff --git a/package/x11/qt/qt.desc b/package/x11/qt/qt.desc index 0b6a0541e..9c7d83b00 100644 --- a/package/x11/qt/qt.desc +++ b/package/x11/qt/qt.desc @@ -46,8 +46,8 @@ #endif #if xpkg == qt4.* -[V] 4.5.0 -[D] 3269396251 qt-x11-opensource-src-4.5.0.tar.bz2 ftp://ftp.trolltech.com/qt/source/ +[V] 4.5.1 +[D] 2447172668 qt-x11-opensource-src-4.5.1.tar.bz2 ftp://ftp.trolltech.com/qt/source/ #endif [CD] cp $cachedir/qt3.cache $confdir/$pkg.cache