diff options
| -rw-r--r-- | office/vym/README | 2 | ||||
| -rw-r--r-- | office/vym/vym.SlackBuild | 15 | ||||
| -rw-r--r-- | office/vym/vym.info | 12 |
3 files changed, 16 insertions, 13 deletions
diff --git a/office/vym/README b/office/vym/README index 135a07cb33a7..ccf4fa9ca53b 100644 --- a/office/vym/README +++ b/office/vym/README @@ -4,5 +4,3 @@ creativity and effectivity. You can use them for time management, to organize tasks, to get an overview over complex contexts, to sort your ideas etc. Some people even think it is fun to work with such maps... - -vym requires qt4, which is also available from SlackBuilds.org. diff --git a/office/vym/vym.SlackBuild b/office/vym/vym.SlackBuild index cdc0f76dd96b..fe2fe3b0545e 100644 --- a/office/vym/vym.SlackBuild +++ b/office/vym/vym.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for vym -# Copyright 2008 Heinz Wiesinger <pprkut@liwjatan.at> +# Copyright 2008-2010 Heinz Wiesinger, Amsterdam, The Netherlands # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=vym -VERSION=1.12.2 +VERSION=1.12.6 ARCH=${ARCH:-i486} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -35,10 +35,13 @@ OUTPUT=${OUTPUT:-/tmp} 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 @@ -56,12 +59,12 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -qmake-qt4 \ +qmake \ + QMAKE_CFLAGS+="$SLKCFLAGS" \ + QMAKE_CXXFLAGS+="$SLKCFLAGS" \ PREFIX=/usr \ DOCDIR=/usr/doc/$PRGNAM-$VERSION -sed -i "s|-pipe -g -Wall|$SLKCFLAGS -pipe -g -Wall|g" Makefile - make make install INSTALL_ROOT=$PKG @@ -83,4 +86,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc cat $CWD/doinst.sh > $PKG/install/doinst.sh 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/office/vym/vym.info b/office/vym/vym.info index 5d51f443152d..9019fe22e1a7 100644 --- a/office/vym/vym.info +++ b/office/vym/vym.info @@ -1,8 +1,10 @@ PRGNAM="vym" -VERSION="1.12.2" +VERSION="1.12.6" HOMEPAGE="http://www.insilmaril.de/vym/" -DOWNLOAD="http://downloads.sourceforge.net/vym/vym-1.12.2.tar.bz2" -MD5SUM="ff2dc8f2dad9bda128753ed94aed302d" -MAINTAINER="ppr:kut" +DOWNLOAD="http://downloads.sourceforge.net/vym/vym-1.12.6.tar.bz2" +MD5SUM="12bfdf82c679f14354f9577df62de7e9" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +MAINTAINER="Heinz Wiesinger" EMAIL="pprkut@liwjatan.at" -APPROVED="dsomero"
\ No newline at end of file +APPROVED="Erik Hanson" |