diff options
| -rw-r--r-- | system/qstardict/doinst.sh | 6 | ||||
| -rw-r--r-- | system/qstardict/gcc4.4.patch | 12 | ||||
| -rw-r--r-- | system/qstardict/qstardict-1.0.1-glib_includes.patch | 14 | ||||
| -rw-r--r-- | system/qstardict/qstardict.SlackBuild | 56 | ||||
| -rw-r--r-- | system/qstardict/qstardict.info | 6 |
5 files changed, 23 insertions, 71 deletions
diff --git a/system/qstardict/doinst.sh b/system/qstardict/doinst.sh index 5fb28930db0b9..65c7e2eeb9aa5 100644 --- a/system/qstardict/doinst.sh +++ b/system/qstardict/doinst.sh @@ -1,3 +1,9 @@ if [ -x /usr/bin/update-desktop-database ]; then /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 fi + +if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then + if [ -x /usr/bin/gtk-update-icon-cache ]; then + /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1 + fi +fi diff --git a/system/qstardict/gcc4.4.patch b/system/qstardict/gcc4.4.patch deleted file mode 100644 index db4b3157a744e..0000000000000 --- a/system/qstardict/gcc4.4.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- trunk/plugins/stardict/dictziplib.cpp 2009/07/10 15:01:40 446 -+++ trunk/plugins/stardict/dictziplib.cpp 2009/08/06 07:32:12 447 -@@ -305,7 +305,7 @@ - - #ifdef Q_OS_UNIX - if (stat(fname.c_str(), &sb) || !S_ISREG(sb.st_mode)) --#elif def Q_OS_WIN32 -+#elif defined(Q_OS_WIN32) - if (_stat(fname.c_str(), &sb) || !(sb.stMode & _S_IFREG)) - #endif - { - diff --git a/system/qstardict/qstardict-1.0.1-glib_includes.patch b/system/qstardict/qstardict-1.0.1-glib_includes.patch deleted file mode 100644 index fd6e993b92639..0000000000000 --- a/system/qstardict/qstardict-1.0.1-glib_includes.patch +++ /dev/null @@ -1,14 +0,0 @@ -Index: plugins/stardict/stardict.cpp -=================================================================== ---- plugins/stardict/stardict.cpp.orig -+++ plugins/stardict/stardict.cpp -@@ -28,8 +28,7 @@ - #include <QFile> - #include <QSettings> - #include <QStack> --#include <glib/gmem.h> --#include <glib/gstrfuncs.h> -+#include <glib.h> - #include "lib.h" - #include "file.hpp" - #include "settingsdialog.h" diff --git a/system/qstardict/qstardict.SlackBuild b/system/qstardict/qstardict.SlackBuild index 063d72760f2f7..d29cf70a83347 100644 --- a/system/qstardict/qstardict.SlackBuild +++ b/system/qstardict/qstardict.SlackBuild @@ -6,13 +6,13 @@ # Modified by Branko Grubic <branko.grubic@gmail.com> PRGNAM=qstardict -VERSION=${VERSION:-1.0.1} -BUILD=${BUILD:-2} +VERSION=${VERSION:-1.3} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -23,10 +23,8 @@ 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" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -41,50 +39,24 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 -cd $PRGNAM-$VERSION +rm -rf $PRGNAM-$PRGNAM-$VERSION +tar xvf $CWD/$PRGNAM-$VERSION.tar.?z* +cd $PRGNAM-$PRGNAM-$VERSION chown -R root:root . find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; - -# Patch for glib > 2.30.x -# http://sourceforge.net/tracker/?func=detail&aid=3471473&group_id=200786&atid=974933 -patch -p0 < $CWD/qstardict-1.0.1-glib_includes.patch - -# 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 + \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ + -o -perm 511 \) -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +qmake-qt5 ENABLED_PLUGINS="stardict swac web" \ + LIB_DIR=/usr/lib$LIBDIRSUFFIX DOCS_DIR=/usr/doc/$PRGNAM-$VERSION 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 - find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true -cp -a README $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/system/qstardict/qstardict.info b/system/qstardict/qstardict.info index 35317dadb09c0..44559f1367e6a 100644 --- a/system/qstardict/qstardict.info +++ b/system/qstardict/qstardict.info @@ -1,8 +1,8 @@ PRGNAM="qstardict" -VERSION="1.0.1" +VERSION="1.3" HOMEPAGE="http://qstardict.ylsoftware.com/index.php" -DOWNLOAD="http://qstardict.ylsoftware.com/files/qstardict-1.0.1.tar.bz2" -MD5SUM="4e058439edad45103a9f5c74d2a381e5" +DOWNLOAD="https://github.com/a-rodin/qstardict/archive/qstardict-1.3/qstardict-1.3.tar.gz" +MD5SUM="761600b1c0dbb33b1025a073c72851da" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" |