Browse Source

Clifford Wolf:


			
			
				rocklinux
			
			
		
Clifford Wolf 18 years ago
parent
commit
9377f880e6
4 changed files with 13 additions and 13 deletions
  1. +1
    -1
      package/x11/qt/pkgmapper.in
  2. +1
    -1
      package/x11/qt/preconfig.in
  3. +7
    -7
      package/x11/qt/qt.conf
  4. +4
    -4
      package/x11/qt/qt.desc

+ 1
- 1
package/x11/qt/pkgmapper.in

@ -1,3 +1,3 @@
case "$pkg" in case "$pkg" in
qt33|qt40) pkg=qt ;;
qt33|qt42) pkg=qt ;;
esac esac

+ 1
- 1
package/x11/qt/preconfig.in

@ -1,5 +1,5 @@
if pkgcheck qt X; then if pkgcheck qt X; then
pkgfork qt qt33 pkgfork qt qt33
pkgfork qt qt40 unflag CORE
pkgfork qt qt42 unflag CORE
pkgremove qt pkgremove qt
fi fi

+ 7
- 7
package/x11/qt/qt.conf

@ -24,7 +24,7 @@ if [ $prefix_auto = 1 ] ; then
prefix="opt/$xpkg" prefix="opt/$xpkg"
set_confopt set_confopt
fi fi
if [ $xpkg == 'qt40' ] ; then
if [ $xpkg == 'qt42' ] ; then
splitdesc_debug() { desc_I="Qt debug libraries"; } splitdesc_debug() { desc_I="Qt debug libraries"; }
splitreg 10 debug $prefix/lib/.+_debug splitreg 10 debug $prefix/lib/.+_debug
splitreg 41 dev $prefix/examples/ splitreg 41 dev $prefix/examples/
@ -57,7 +57,7 @@ qt_pass() {
pkginstalled zlib && var_append confopt " " "-system-zlib" pkginstalled zlib && var_append confopt " " "-system-zlib"
pkginstalled libpng && var_append confopt " " "-system-libpng" pkginstalled libpng && var_append confopt " " "-system-libpng"
pkginstalled libjpeg && var_append confopt " " "-system-libjpeg" pkginstalled libjpeg && var_append confopt " " "-system-libjpeg"
elif [ $xpkg == qt40 ]; then
elif [ $xpkg == qt42 ]; then
pkginstalled postgresql && var_append confopt " " "-plugin-sql-psql \ pkginstalled postgresql && var_append confopt " " "-plugin-sql-psql \
-I$pkg_postgresql_prefix/include -L$pkg_postgresql_prefix/lib" -I$pkg_postgresql_prefix/include -L$pkg_postgresql_prefix/lib"
fi fi
@ -80,7 +80,7 @@ qt_pass() {
echo "Copy some documentation ..." echo "Copy some documentation ..."
if [ $xpkg == qt33 ] ; then if [ $xpkg == qt33 ] ; then
cp -a ch* tutorial $docdir/ cp -a ch* tutorial $docdir/
elif [ $xpkg == qt40 ] ; then
elif [ $xpkg == qt42 ] ; then
cp -a changes-$ver $docdir/ cp -a changes-$ver $docdir/
fi fi
@ -94,10 +94,10 @@ QT33DIR=$root/opt/qt33
QTDIR=\$QT33DIR QTDIR=\$QT33DIR
export QT33DIR QTDIR export QT33DIR QTDIR
EOT EOT
elif [ $xpkg == qt40 ]; then
cat > $root/etc/profile.d/qt40 <<-EOT
QT40DIR=$root/opt/qt40
export QT40DIR
elif [ $xpkg == qt42 ]; then
cat > $root/etc/profile.d/qt42 <<-EOT
QT42DIR=$root/opt/qt42
export QT42DIR
EOT EOT
fi fi
} }

+ 4
- 4
package/x11/qt/qt.desc

@ -41,11 +41,11 @@
[P] X -?---5---9 126.700 [P] X -?---5---9 126.700
#if xpkg == qt33 #if xpkg == qt33
[V] 3.3.7
[V] 3.3.8
[D] 2803424178 qt-x11-free-3.3.7.tar.bz2 ftp://ftp.trolltech.com/qt/source/ [D] 2803424178 qt-x11-free-3.3.7.tar.bz2 ftp://ftp.trolltech.com/qt/source/
#endif #endif
#if xpkg == qt40
[V] 4.2.1
[D] 3920584701 qt-x11-opensource-src-4.2.1.tar.gz ftp://ftp.trolltech.com/qt/source/
#if xpkg == qt42
[V] 4.2.3
[D] 2234929916 qt-x11-opensource-src-4.2.3.tar.gz ftp://ftp.trolltech.com/qt/source/
#endif #endif

Loading…
Cancel
Save