From 09b32f294d59308c093ddee91859ecb0cd8bb876 Mon Sep 17 00:00:00 2001
From: grissiom <chaos.proton@gmail.com>
Date: Wed, 12 May 2010 17:45:55 +0200
Subject: [PATCH] system/qstardict: Updated for version 0.12.9

---
 system/qstardict/README               | 20 ++++++--------------
 system/qstardict/qstardict.SlackBuild | 23 +++++++++++++----------
 system/qstardict/qstardict.info       |  2 +-
 3 files changed, 20 insertions(+), 25 deletions(-)

diff --git a/system/qstardict/README b/system/qstardict/README
index 518e6b4d57..a3b8f36b2c 100644
--- a/system/qstardict/README
+++ b/system/qstardict/README
@@ -1,15 +1,7 @@
-QStarDict is a StarDict clone written with using Qt4. The user interface
-is similar to StarDict.
-
-Main features
-* Full support of StarDict dictionaries
-* Working in system tray
-* Scanning mouse selection and showing popup window with translation of
-selected word
-* Translations reformatting
-* Pronouncing translated word
-* Support for plugins
-
-You need Qt >= 4.2 and glib >= 2.0. If you have QtDBus module QStarDict
-will be compiled with D-Bus support.
+QStarDict is a StarDict clone written using Qt4.
+The user interface is similar to StarDict.
+It features full support of StarDict dictionaries, system tray
+functionality, and many others.
 
+This requires qt4; the build script should work with both qt4 packages 
+from SlackBuilds.org or testing/ in official releases.
diff --git a/system/qstardict/qstardict.SlackBuild b/system/qstardict/qstardict.SlackBuild
index 886bb949de..1f9e8fc009 100644
--- a/system/qstardict/qstardict.SlackBuild
+++ b/system/qstardict/qstardict.SlackBuild
@@ -7,7 +7,7 @@
 PRGNAM=qstardict
 VERSION=${VERSION:-0.12.9}
 ARCH=${ARCH:-i486}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 CWD=$(pwd)
@@ -15,8 +15,6 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-MAKEOPT="-s"
-
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
 elif [ "$ARCH" = "i686" ]; then
@@ -31,7 +29,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar jxvf $CWD/$PRGNAM-$VERSION.tar.bz2
+tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find . \
@@ -40,20 +38,25 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-qmake-qt4 \
-QMAKE_CXXFLAGS="$SLKCFLAGS"
+qmake-qt4 QMAKE_CXXFLAGS="$SLKCFLAGS" || qmake QMAKE_CXXFLAGS="$SLKCFLAGS"
 
-make $MAKEOPT
+make
 make install INSTALL_ROOT=$PKG
 
 ( cd $PKG
-  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \
+    xargs strip --strip-unneeded 2> /dev/null || true
+  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | \
+    xargs strip --strip-unneeded 2> /dev/null
 )
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS ChangeLog COPYING INSTALL README THANKS $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  AUTHORS ChangeLog COPYING INSTALL README THANKS \
+    $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+rm -rf $PKG/usr/share/doc
+( cd $PKG/usr/doc ; ln -s $PRGNAM-$VERSION $PRGNAM )
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/system/qstardict/qstardict.info b/system/qstardict/qstardict.info
index f60a2f12bf..c4f63c2066 100644
--- a/system/qstardict/qstardict.info
+++ b/system/qstardict/qstardict.info
@@ -5,4 +5,4 @@ DOWNLOAD="http://qstardict.ylsoftware.com/files/qstardict-0.12.9.tar.bz2"
 MD5SUM="229f29065fd3831b7b678e85cf3ef2c9"
 MAINTAINER="grissiom"
 EMAIL="chaos.proton@gmail.com"
-APPROVED="David Somero"
+APPROVED="rworkman"