diff options
| -rw-r--r-- | libraries/qwt/qwt-5.1.1-qwtconfig.pri.patch | 20 | ||||
| -rw-r--r-- | libraries/qwt/qwt-6.0.2-qwtconfig.pri.patch | 37 | ||||
| -rw-r--r-- | libraries/qwt/qwt.SlackBuild | 18 | ||||
| -rw-r--r-- | libraries/qwt/qwt.info | 10 |
4 files changed, 52 insertions, 33 deletions
diff --git a/libraries/qwt/qwt-5.1.1-qwtconfig.pri.patch b/libraries/qwt/qwt-5.1.1-qwtconfig.pri.patch deleted file mode 100644 index 54cbb2ec2f..0000000000 --- a/libraries/qwt/qwt-5.1.1-qwtconfig.pri.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -Nur qwt-5.1.1.orig/qwtconfig.pri qwt-5.1.1/qwtconfig.pri ---- qwt-5.1.1.orig/qwtconfig.pri 2008-05-24 11:47:36.000000000 -0500 -+++ qwt-5.1.1/qwtconfig.pri 2009-06-25 02:06:19.375460237 -0500 -@@ -8,14 +8,14 @@ - VERSION = $$VER_MAJ.$$VER_MIN.$$VER_PAT - - unix { -- INSTALLBASE = /usr/local/qwt-5.1.1 -+ INSTALLBASE = /usr - } - - win32 { - INSTALLBASE = C:/Qwt-5.1.1 - } - --target.path = $$INSTALLBASE/lib -+target.path = $$INSTALLBASE/@BASELIBDIR@ - headers.path = $$INSTALLBASE/include - doc.path = $$INSTALLBASE/doc - diff --git a/libraries/qwt/qwt-6.0.2-qwtconfig.pri.patch b/libraries/qwt/qwt-6.0.2-qwtconfig.pri.patch new file mode 100644 index 0000000000..0218af0fc6 --- /dev/null +++ b/libraries/qwt/qwt-6.0.2-qwtconfig.pri.patch @@ -0,0 +1,37 @@ +diff -Naur qwt-6.0.2.orig/qwtconfig.pri qwt-6.0.2/qwtconfig.pri +--- qwt-6.0.2.orig/qwtconfig.pri 2012-11-30 14:22:47.397127932 +0100 ++++ qwt-6.0.2/qwtconfig.pri 2013-01-07 13:16:08.747317951 +0100 +@@ -19,7 +19,7 @@ + QWT_INSTALL_PREFIX = $$[QT_INSTALL_PREFIX] + + unix { +- QWT_INSTALL_PREFIX = /usr/local/qwt-$$QWT_VERSION ++ QWT_INSTALL_PREFIX = /usr + } + + win32 { +@@ -28,13 +28,13 @@ + + QWT_INSTALL_DOCS = $${QWT_INSTALL_PREFIX}/doc + QWT_INSTALL_HEADERS = $${QWT_INSTALL_PREFIX}/include +-QWT_INSTALL_LIBS = $${QWT_INSTALL_PREFIX}/lib ++QWT_INSTALL_LIBS = $${QWT_INSTALL_PREFIX}/lib@LIBDIRSUFFIX@ + + ###################################################################### + # Designer plugin + ###################################################################### + +-QWT_INSTALL_PLUGINS = $${QWT_INSTALL_PREFIX}/plugins/designer ++QWT_INSTALL_PLUGINS = @QT4DIR@/plugins/designer + # QWT_INSTALL_PLUGINS = $${QT_INSTALL_PREFIX}/plugins/designer + + ###################################################################### +@@ -49,7 +49,7 @@ + # with every Qt upgrade. + ###################################################################### + +-QWT_INSTALL_FEATURES = $${QWT_INSTALL_PREFIX}/features ++QWT_INSTALL_FEATURES = @QT4DIR@/features + # QWT_INSTALL_FEATURES = $${QT_INSTALL_PREFIX}/features + + ###################################################################### diff --git a/libraries/qwt/qwt.SlackBuild b/libraries/qwt/qwt.SlackBuild index d8572b5ac9..2dae61d879 100644 --- a/libraries/qwt/qwt.SlackBuild +++ b/libraries/qwt/qwt.SlackBuild @@ -5,11 +5,12 @@ # Written by Zordrak # Nobbled from Slacky and sanitised for sanity :) +# Modified by dunkyp <dunkyp@gmail.com> # Modified by the Slackbuilds.org project PRGNAM=qwt -VERSION=${VERSION:-5.1.1} -BUILD=${BUILD:-3} +VERSION=${VERSION:-6.0.2} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -28,15 +29,15 @@ OUTPUT=${OUTPUT:-/tmp} if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" LIBDIRSUFFIX="" - BASELIBDIR="lib${LIBDIRSUFFIX}" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" LIBDIRSUFFIX="" - BASELIBDIR="lib${LIBDIRSUFFIX}" elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" - BASELIBDIR="lib${LIBDIRSUFFIX}" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" fi set -e # Exit on most errors @@ -54,8 +55,8 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -patch -p1 < $CWD/qwt-5.1.1-qwtconfig.pri.patch -sed -i "s%@BASELIBDIR@%$BASELIBDIR%" qwtconfig.pri +patch -p1 < $CWD/qwt-6.0.2-qwtconfig.pri.patch +sed -i -e "s%@LIBDIRSUFFIX@%$LIBDIRSUFFIX%" -e "s%@QT4DIR@%$QT4DIR%" qwtconfig.pri qmake INSTALLBASE=/usr CONFIG+=QwtExamples make \ @@ -67,6 +68,7 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true mv $PKG/usr/doc/man $PKG/usr +rm -f $PKG/usr/man/man3/_tmp* ( cd $PKG/usr/man find . -type f -exec gzip -9 {} \; for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done @@ -74,7 +76,7 @@ mv $PKG/usr/doc/man $PKG/usr mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/examples cp -a CHANGES COPYING INSTALL README $PKG/usr/doc/$PRGNAM-$VERSION -cp -a ./examples/bin/* $PKG/usr/doc/$PRGNAM-$VERSION/examples +cp -a ./examples/* $PKG/usr/doc/$PRGNAM-$VERSION/examples mv $PKG/usr/doc/html $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/libraries/qwt/qwt.info b/libraries/qwt/qwt.info index 9696e3e1cd..e9ffd8a348 100644 --- a/libraries/qwt/qwt.info +++ b/libraries/qwt/qwt.info @@ -1,10 +1,10 @@ PRGNAM="qwt" -VERSION="5.1.1" +VERSION="6.0.2" HOMEPAGE="http://qwt.sourceforge.net" -DOWNLOAD="http://downloads.sourceforge.net/qwt/qwt-5.1.1.tar.bz2" -MD5SUM="218cef1a39ebda6cfa440a0727464275" +DOWNLOAD="http://downloads.sourceforge.net/qwt/qwt-6.0.2.tar.bz2" +MD5SUM="845837320328e3c92d049cc45c7bdbc2" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" -MAINTAINER="Zordrak" -EMAIL="slackbuilds@tpa.me.uk" +MAINTAINER="dunkyp" +EMAIL="dunkyp@gmail.com" |