3 files changed, 20 insertions, 10 deletions
diff --git a/development/qt-doc/README b/development/qt-doc/README
index d4610cc58cc0c..f8f906cd2598d 100644
--- a/development/qt-doc/README
+++ b/development/qt-doc/README
@@ -1,3 +1,6 @@
 This package provide the documentations of Qt4. As the official qt-copy
 package doesn't have documents, this package only contain the Documents for
 development help.
+
+If you upgrade this package from old version, you may need to clean up the
+index cache by `assistant -remove-search-index` before you launch assistant.
diff --git a/development/qt-doc/qt-doc.SlackBuild b/development/qt-doc/qt-doc.SlackBuild
index 5c7db2c5858e7..b08ed4fb44114 100644
--- a/development/qt-doc/qt-doc.SlackBuild
+++ b/development/qt-doc/qt-doc.SlackBuild
@@ -5,7 +5,7 @@
 # Written by Grissiom <chaos.proton@gmail.com>
 
 PKGNAM=qt-doc
-VERSION=4.5.1
+VERSION=4.6.2
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -24,33 +24,40 @@ TMP=${TMP:-/tmp/SBo}
 OUTPUT=${OUTPUT:-/tmp}
 PKG=$TMP/package-${PKGNAM}
 
-TARBALLNAME=qt-x11-opensource-src-${VERSION}
+TARBALLNAME=qt-everywhere-opensource-src-${VERSION}
 
-if [ "$ARCH" = "i486" ] || [ "$ARCH" = "i686" ]; then
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
 else
   SLKCFLAGS="-O2"
   LIBDIRSUFFIX=""
 fi
+
 set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf ${TARBALLNAME}
-tar xvf $CWD/${TARBALLNAME}.tar.bz2
+tar xvf $CWD/${TARBALLNAME}.tar.gz
 cd ${TARBALLNAME}
 
 QTDIR=/usr/lib${LIBDIRSUFFIX}/qt
 
 mkdir -p ${PKG}/${QTDIR}/doc/
-cp -r doc/html ${PKG}/${QTDIR}/doc/
-cp -r doc/qch ${PKG}/${QTDIR}/doc/
+mv doc/html ${PKG}/${QTDIR}/doc/
+mv doc/qch ${PKG}/${QTDIR}/doc/
 
 mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
-(cd $CWD && cp -a $PKGNAM.SlackBuild README $PKG/usr/doc/$PKGNAM-$VERSION/)
+cat $CWD/$PKGNAM.SlackBuild > $PKG/usr/doc/$PKGNAM-$VERSION/$PRGNAM.SlackBuild
+cat $CWD/README > $PKG/usr/doc/$PKGNAM-$VERSION/README
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/development/qt-doc/qt-doc.info b/development/qt-doc/qt-doc.info
index eee0542eb6dc2..b4300472f8881 100644
--- a/development/qt-doc/qt-doc.info
+++ b/development/qt-doc/qt-doc.info
@@ -1,8 +1,8 @@
 PRGNAM="qt-doc"
-VERSION="4.5.1"
+VERSION="4.6.2"
 HOMEPAGE="http://qt.nokia.com"
-DOWNLOAD="ftp://ftp.qt.nokia.com/qt/source/qt-x11-opensource-src-4.5.1.tar.bz2"
-MD5SUM="afc43e566341cf3e5ed0bcb974f0c3b2"
+DOWNLOAD="ftp://ftp.qt.nokia.com/qt/source/qt-everywhere-opensource-src-4.6.2.tar.gz"
+MD5SUM="eb651ee4b157c01696aa56777fc6e0e5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Grissiom"