system/qstardict: Updated for version 0.13.1

4 files changed, 42 insertions, 19 deletions

diff --git a/system/qstardict/README b/system/qstardict/README
index a3b8f36b2c..aab7401115 100644
--- a/system/qstardict/README
+++ b/system/qstardict/README
@@ -2,6 +2,3 @@ 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 1f9e8fc009..3883e62600 100644
--- a/system/qstardict/qstardict.SlackBuild
+++ b/system/qstardict/qstardict.SlackBuild
@@ -5,9 +5,9 @@
 # Written by grissiom chaos.proton@gmail.com
 
 PRGNAM=qstardict
-VERSION=${VERSION:-0.12.9}
+VERSION=${VERSION:-0.13.1}
 ARCH=${ARCH:-i486}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 CWD=$(pwd)
@@ -15,12 +15,17 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
+BUILD_PLASMOID=${BUILD_PLASMOID:-"yes"}
+
 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"
 fi
 
 set -e
@@ -38,11 +43,35 @@ 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 QMAKE_CXXFLAGS="$SLKCFLAGS"
+# qstardict only have "stardict" and "web" plugins enabled by default.
+# Actually there are swac and multitran plugins in addition.
+# Uncomment the following line to get full plugins.
+# enabled_plugins="stardict web swac multitran"
+qmake QMAKE_CXXFLAGS="$SLKCFLAGS" \
+      PLUGINS_DIR=/usr/lib${LIBDIRSUFFIX}/qstardict/plugins \
+      DOCS_DIR=/usr/doc/$PRGNAM-$VERSION \
+      ENABLED_PLUGINS=$enabled_plugins
 
 make
 make install INSTALL_ROOT=$PKG
 
+if [ "$BUILD_PLASMOID" = "yes" ]; then
+  mkdir kdeplasma/build
+  cd kdeplasma/build
+    # Fix the plugin path or LIB_INSTALL_DIR will have no effect...
+    (cd ../dataengine
+      sed -i -e '4d' -e 's.//..' config.h.cmake
+    )
+
+    cmake -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+          -DLIB_INSTALL_DIR=/usr/lib${LIBDIRSUFFIX} \
+          -DCMAKE_INSTALL_PREFIX=/usr \
+          ..
+    make
+    make install DESTDIR=$PKG
+  cd -
+fi
+
 ( cd $PKG
   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \
     xargs strip --strip-unneeded 2> /dev/null || true
@@ -50,16 +79,11 @@ make install INSTALL_ROOT=$PKG
     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 README $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
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/qstardict/qstardict.info b/system/qstardict/qstardict.info
index c4f63c2066..de484bd9cf 100644
--- a/system/qstardict/qstardict.info
+++ b/system/qstardict/qstardict.info
@@ -1,8 +1,10 @@
 PRGNAM="qstardict"
-VERSION="0.12.9"
+VERSION="0.13.1"
 HOMEPAGE="http://qstardict.ylsoftware.com/index.php"
-DOWNLOAD="http://qstardict.ylsoftware.com/files/qstardict-0.12.9.tar.bz2"
-MD5SUM="229f29065fd3831b7b678e85cf3ef2c9"
+DOWNLOAD="http://qstardict.ylsoftware.com/files/qstardict-0.13.1.tar.bz2"
+MD5SUM="0828c3fa01c5237db8a67d356a9d1a8c"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 MAINTAINER="grissiom"
 EMAIL="chaos.proton@gmail.com"
-APPROVED="rworkman"
+APPROVED="dsomero"
diff --git a/system/qstardict/slack-desc b/system/qstardict/slack-desc
index 7f909290dd..d0a216f1dc 100644
--- a/system/qstardict/slack-desc
+++ b/system/qstardict/slack-desc
@@ -12,8 +12,8 @@ qstardict: The user interface is similar to StarDict.
 qstardict: Main features:
 qstardict: * Full support of StarDict dictionaries
 qstardict: * Working in system tray
-qstardict: * Scanning mouse selection and showing popup window with translation
-qstardict: of selected word
+qstardict: * Scanning mouse selection and showing
+qstardict:   popup window with translation of selected word
 qstardict: * Translations reformatting
 qstardict: * Pronouncing translated word
 qstardict: * Support for plugins