From 9377f880e6e293027e920cbe06f1f0fe76f11d4f Mon Sep 17 00:00:00 2001
From: Clifford Wolf <clifford@clifford.at>
Date: Wed, 23 May 2007 20:23:06 +0000
Subject: [PATCH] Clifford Wolf: 	Updated qt (3.3.8 and 4.2.3)

[2007051523185328066] (https://www.rocklinux.net/submaster)



git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@8377 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc
---
 package/x11/qt/pkgmapper.in |  2 +-
 package/x11/qt/preconfig.in |  2 +-
 package/x11/qt/qt.conf      | 14 +++++++-------
 package/x11/qt/qt.desc      |  8 ++++----
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/package/x11/qt/pkgmapper.in b/package/x11/qt/pkgmapper.in
index 769ec9fbe..07ea1941e 100644
--- a/package/x11/qt/pkgmapper.in
+++ b/package/x11/qt/pkgmapper.in
@@ -1,3 +1,3 @@
 case "$pkg" in
-	qt33|qt40) pkg=qt ;;
+	qt33|qt42) pkg=qt ;;
 esac
diff --git a/package/x11/qt/preconfig.in b/package/x11/qt/preconfig.in
index 1cca1ace2..62ae8a2a5 100644
--- a/package/x11/qt/preconfig.in
+++ b/package/x11/qt/preconfig.in
@@ -1,5 +1,5 @@
 if pkgcheck qt X; then
 	 pkgfork qt qt33
-	 pkgfork qt qt40 unflag CORE
+	 pkgfork qt qt42 unflag CORE
 	 pkgremove qt
 fi
diff --git a/package/x11/qt/qt.conf b/package/x11/qt/qt.conf
index 77730cb9c..d9d4768c9 100644
--- a/package/x11/qt/qt.conf
+++ b/package/x11/qt/qt.conf
@@ -24,7 +24,7 @@ if [ $prefix_auto = 1 ] ; then
 	prefix="opt/$xpkg"
 	set_confopt
 fi
-if [ $xpkg == 'qt40' ] ; then
+if [ $xpkg == 'qt42' ] ; then
 	 splitdesc_debug() { desc_I="Qt debug libraries"; }
 	 splitreg 10 debug $prefix/lib/.+_debug
 	 splitreg 41 dev $prefix/examples/
@@ -57,7 +57,7 @@ qt_pass() {
 		 pkginstalled zlib && var_append confopt " " "-system-zlib"
 		 pkginstalled libpng && var_append confopt " " "-system-libpng"
 		 pkginstalled libjpeg && var_append confopt " " "-system-libjpeg"
-	elif [ $xpkg == qt40 ]; then
+	elif [ $xpkg == qt42 ]; then
 		 pkginstalled postgresql && var_append confopt " " "-plugin-sql-psql \
 		  -I$pkg_postgresql_prefix/include -L$pkg_postgresql_prefix/lib"
  	fi
@@ -80,7 +80,7 @@ qt_pass() {
     echo "Copy some documentation ..."
 	if [ $xpkg == qt33 ] ; then
 		 cp -a ch* tutorial $docdir/
- 	elif [ $xpkg == qt40 ] ; then
+ 	elif [ $xpkg == qt42 ] ; then
 			cp -a changes-$ver $docdir/
 	fi
 	
@@ -94,10 +94,10 @@ QT33DIR=$root/opt/qt33
 QTDIR=\$QT33DIR
 export QT33DIR QTDIR
 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
 	 fi
 }
diff --git a/package/x11/qt/qt.desc b/package/x11/qt/qt.desc
index 0299b6370..9995c61dc 100644
--- a/package/x11/qt/qt.desc
+++ b/package/x11/qt/qt.desc
@@ -41,11 +41,11 @@
 [P] X -?---5---9 126.700
 
 #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/
 #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